From 44c9a9a4f3543fd2d0ec6bc66f952e5f82942544 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 06 三月 2023 12:07:33 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/entity/bs/SexplorationpointEntity.java | 12
src/main/java/com/lf/server/mapper/sys/AttachMapper.java | 8
src/main/java/com/lf/server/service/sys/AttachService.java | 5
src/main/java/com/lf/server/mapper/bs/SexplorationpointstratumMapper.java | 15
src/main/resources/mapper/sys/AttachMapper.xml | 7
src/main/java/com/lf/server/entity/bs/SsurveyworksiteEntity.java | 632 ++++++++---------------------
data/db_cx.sql | 3
src/main/java/com/lf/server/controller/sys/ResController.java | 30 +
src/main/java/com/lf/server/entity/bs/SexplorationpointstratumEntity.java | 205 +++++++++
src/main/java/com/lf/server/entity/bs/SsurveyinformationEntity.java | 328 +++++----------
10 files changed, 561 insertions(+), 684 deletions(-)
diff --git a/data/db_cx.sql b/data/db_cx.sql
index 38fd7e6..5588d16 100644
--- a/data/db_cx.sql
+++ b/data/db_cx.sql
@@ -344,7 +344,8 @@
update lf.sys_token set type=1,create_user=61,duration=5256000,create_time='2023-03-03 19:00:00',expire='2033-03-03 19:00:00'
where token='c36e4f94-dfde-401e-9967-2c4a449f1300';
-
+select * from bd.b_pac_geologic_hazard where gid=2;
+select * from bd.b_pac_regional_geology where gid=2;
diff --git a/src/main/java/com/lf/server/controller/sys/ResController.java b/src/main/java/com/lf/server/controller/sys/ResController.java
index dddef33..46e4226 100644
--- a/src/main/java/com/lf/server/controller/sys/ResController.java
+++ b/src/main/java/com/lf/server/controller/sys/ResController.java
@@ -7,6 +7,7 @@
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.service.all.PermsService;
import com.lf.server.service.all.UploadAttachService;
+import com.lf.server.service.data.DownloadService;
import com.lf.server.service.sys.ResService;
import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.Api;
@@ -37,10 +38,13 @@
TokenService tokenService;
@Autowired
- UploadAttachService uploadAttachService;
+ PermsService permsService;
@Autowired
- PermsService permsService;
+ DownloadService downloadService;
+
+ @Autowired
+ UploadAttachService uploadAttachService;
private final static String TAB_NAME = "lf.sys_res";
@@ -309,4 +313,26 @@
public void downloadForView(String guid, HttpServletResponse res) {
uploadAttachService.download(guid, true, res);
}
+
+ @SysLog()
+ @ApiOperation(value = "璇锋眰涓嬭浇")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "guids", value = "闄勪欢Guid鏁扮粍", dataType = "String", paramType = "body", allowMultiple = true, example = "e5b6ae0889b88111f13a4b6e048348db,fa4f299e901a0c46e634f8fcc8185c0c")
+ })
+ @ResponseBody
+ @PostMapping(value = "/downloadReq")
+ public ResponseMsg<Object> downloadReq(String[] guids, HttpServletRequest req, HttpServletResponse res) {
+ try {
+ if (null == guids || guids.length == 0) {
+ return fail("闄勪欢Guid鏁扮粍涓虹┖");
+ }
+
+ UserEntity ue = tokenService.getCurrentUser(req);
+ //String guid = downloadService.zipFiles(ue, list, reqEntity.getPwd());
+
+ return success("");
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
}
diff --git a/src/main/java/com/lf/server/entity/bs/SexplorationpointEntity.java b/src/main/java/com/lf/server/entity/bs/SexplorationpointEntity.java
index 710520f..fffa491 100644
--- a/src/main/java/com/lf/server/entity/bs/SexplorationpointEntity.java
+++ b/src/main/java/com/lf/server/entity/bs/SexplorationpointEntity.java
@@ -18,7 +18,7 @@
@TableName("bs.s_explorationpoint")
@EqualsAndHashCode(callSuper = false)
public class SexplorationpointEntity extends BaseGeoEntity {
- private static final long serialVersionUID = 721547603943174528L;
+ private static final long serialVersionUID = 703652980133729536L;
private String exppointid;
@@ -53,6 +53,8 @@
private String version;
private String datastage;
+
+ private String dataname;
public SexplorationpointEntity() {
}
@@ -192,4 +194,12 @@
public void setDatastage(String datastage) {
this.datastage = datastage;
}
+
+ public String getDataname() {
+ return dataname;
+ }
+
+ public void setDataname(String dataname) {
+ this.dataname = dataname;
+ }
}
diff --git a/src/main/java/com/lf/server/entity/bs/SexplorationpointstratumEntity.java b/src/main/java/com/lf/server/entity/bs/SexplorationpointstratumEntity.java
new file mode 100644
index 0000000..9b9deb1
--- /dev/null
+++ b/src/main/java/com/lf/server/entity/bs/SexplorationpointstratumEntity.java
@@ -0,0 +1,205 @@
+package com.lf.server.entity.bs;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.lf.server.entity.all.BaseEntity;
+import lombok.*;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.time.LocalDate;
+
+/**
+ * Sexplorationpointstratum
+ * @author WWW
+ */
+@Data
+@AllArgsConstructor
+@TableName("bs.s_explorationpointstratum")
+@EqualsAndHashCode(callSuper = false)
+public class SexplorationpointstratumEntity extends BaseEntity {
+ private static final long serialVersionUID = 703652980133729536L;
+
+ private String pipename;
+
+ private String projname;
+
+ private String exppointid;
+
+ private String mainno;
+
+ private String subno;
+
+ private String geoage;
+
+ private String geoorigin;
+
+ private Double botdepth;
+
+ private Double elev;
+
+ private String geoname;
+
+ private String geotype;
+
+ private String describe;
+
+ private String belongs;
+
+ private String belongsid;
+
+ private String datastatus;
+
+ private String remarks;
+
+ private String version;
+
+ private String datastage;
+
+ public SexplorationpointstratumEntity() {
+ }
+
+ public String getPipename() {
+ return pipename;
+ }
+
+ public void setPipename(String pipename) {
+ this.pipename = pipename;
+ }
+
+ public String getProjname() {
+ return projname;
+ }
+
+ public void setProjname(String projname) {
+ this.projname = projname;
+ }
+
+ public String getExppointid() {
+ return exppointid;
+ }
+
+ public void setExppointid(String exppointid) {
+ this.exppointid = exppointid;
+ }
+
+ public String getMainno() {
+ return mainno;
+ }
+
+ public void setMainno(String mainno) {
+ this.mainno = mainno;
+ }
+
+ public String getSubno() {
+ return subno;
+ }
+
+ public void setSubno(String subno) {
+ this.subno = subno;
+ }
+
+ public String getGeoage() {
+ return geoage;
+ }
+
+ public void setGeoage(String geoage) {
+ this.geoage = geoage;
+ }
+
+ public String getGeoorigin() {
+ return geoorigin;
+ }
+
+ public void setGeoorigin(String geoorigin) {
+ this.geoorigin = geoorigin;
+ }
+
+ public Double getBotdepth() {
+ return botdepth;
+ }
+
+ public void setBotdepth(Double botdepth) {
+ this.botdepth = botdepth;
+ }
+
+ public Double getElev() {
+ return elev;
+ }
+
+ public void setElev(Double elev) {
+ this.elev = elev;
+ }
+
+ public String getGeoname() {
+ return geoname;
+ }
+
+ public void setGeoname(String geoname) {
+ this.geoname = geoname;
+ }
+
+ public String getGeotype() {
+ return geotype;
+ }
+
+ public void setGeotype(String geotype) {
+ this.geotype = geotype;
+ }
+
+ public String getDescribe() {
+ return describe;
+ }
+
+ public void setDescribe(String describe) {
+ this.describe = describe;
+ }
+
+ public String getBelongs() {
+ return belongs;
+ }
+
+ public void setBelongs(String belongs) {
+ this.belongs = belongs;
+ }
+
+ public String getBelongsid() {
+ return belongsid;
+ }
+
+ public void setBelongsid(String belongsid) {
+ this.belongsid = belongsid;
+ }
+
+ public String getDatastatus() {
+ return datastatus;
+ }
+
+ public void setDatastatus(String datastatus) {
+ this.datastatus = datastatus;
+ }
+
+ public String getRemarks() {
+ return remarks;
+ }
+
+ public void setRemarks(String remarks) {
+ this.remarks = remarks;
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
+ public String getDatastage() {
+ return datastage;
+ }
+
+ public void setDatastage(String datastage) {
+ this.datastage = datastage;
+ }
+}
diff --git a/src/main/java/com/lf/server/entity/bs/SsurveyinformationEntity.java b/src/main/java/com/lf/server/entity/bs/SsurveyinformationEntity.java
index be73a59..1b7174d 100644
--- a/src/main/java/com/lf/server/entity/bs/SsurveyinformationEntity.java
+++ b/src/main/java/com/lf/server/entity/bs/SsurveyinformationEntity.java
@@ -18,23 +18,13 @@
@TableName("bs.s_survey_information")
@EqualsAndHashCode(callSuper = false)
public class SsurveyinformationEntity extends BaseEntity {
- private static final long serialVersionUID = 885167891106180736L;
-
- private String workname;
+ private static final long serialVersionUID = 703652980133729536L;
private String segname;
private String projname;
private String pipename;
-
- private String belongs;
-
- private String belongsid;
-
- private String datastatus;
-
- private String remarks;
private String location;
@@ -48,11 +38,9 @@
private String minmtempe;
- private String frosoildep;
-
private String sintensity;
- private BigDecimal seismic;
+ private String seismic;
private String dsgrouping;
@@ -60,57 +48,31 @@
private String seisection;
- private String groughness;
-
private String lipindex;
private String lipgrade;
private String ssossoil;
- private BigDecimal gwatdepth;
+ private String gwattype;
+
+ private String gwatdepth;
private String amplitude;
- private BigDecimal waterelev;
+ private String waterelev;
private String gradeosw;
- private String mediumosw;
-
private String gradeoswsb;
-
- private String mediuoswsb;
private String gradeosws;
- private String mediumosws;
-
- private String gradeogw;
-
- private String mediumogw;
-
- private String gradeogwsb;
-
- private String mediuogwsb;
-
- private String gradeogws;
-
- private String mediumogws;
-
private String gradeos;
-
- private String mediumos;
private String gradeossb;
- private String mediumossb;
-
private String gradeoss;
-
- private String mediumoss;
-
- private String valuation;
private String thawgrade;
@@ -118,7 +80,11 @@
private String fsoiltype;
- private BigDecimal upperlimit;
+ private String upperlimit;
+
+ private String fsoilgroup;
+
+ private String frosoildep;
private String frostheave;
@@ -148,9 +114,13 @@
private String saltexp;
+ private String othersoil;
+
private String abnburying;
private String profile;
+
+ private String agdesc;
private String uniformity;
@@ -158,9 +128,9 @@
private String strdepth;
- private BigDecimal bearingcap;
+ private String bearingcap;
- private BigDecimal commodulus;
+ private String commodulus;
private String schemesugg;
@@ -172,15 +142,15 @@
private String datastage;
+ private String belongs;
+
+ private String belongsid;
+
+ private String datastatus;
+
+ private String remarks;
+
public SsurveyinformationEntity() {
- }
-
- public String getWorkname() {
- return workname;
- }
-
- public void setWorkname(String workname) {
- this.workname = workname;
}
public String getSegname() {
@@ -205,38 +175,6 @@
public void setPipename(String pipename) {
this.pipename = pipename;
- }
-
- public String getBelongs() {
- return belongs;
- }
-
- public void setBelongs(String belongs) {
- this.belongs = belongs;
- }
-
- public String getBelongsid() {
- return belongsid;
- }
-
- public void setBelongsid(String belongsid) {
- this.belongsid = belongsid;
- }
-
- public String getDatastatus() {
- return datastatus;
- }
-
- public void setDatastatus(String datastatus) {
- this.datastatus = datastatus;
- }
-
- public String getRemarks() {
- return remarks;
- }
-
- public void setRemarks(String remarks) {
- this.remarks = remarks;
}
public String getLocation() {
@@ -287,14 +225,6 @@
this.minmtempe = minmtempe;
}
- public String getFrosoildep() {
- return frosoildep;
- }
-
- public void setFrosoildep(String frosoildep) {
- this.frosoildep = frosoildep;
- }
-
public String getSintensity() {
return sintensity;
}
@@ -303,11 +233,11 @@
this.sintensity = sintensity;
}
- public BigDecimal getSeismic() {
+ public String getSeismic() {
return seismic;
}
- public void setSeismic(BigDecimal seismic) {
+ public void setSeismic(String seismic) {
this.seismic = seismic;
}
@@ -335,14 +265,6 @@
this.seisection = seisection;
}
- public String getGroughness() {
- return groughness;
- }
-
- public void setGroughness(String groughness) {
- this.groughness = groughness;
- }
-
public String getLipindex() {
return lipindex;
}
@@ -367,11 +289,19 @@
this.ssossoil = ssossoil;
}
- public BigDecimal getGwatdepth() {
+ public String getGwattype() {
+ return gwattype;
+ }
+
+ public void setGwattype(String gwattype) {
+ this.gwattype = gwattype;
+ }
+
+ public String getGwatdepth() {
return gwatdepth;
}
- public void setGwatdepth(BigDecimal gwatdepth) {
+ public void setGwatdepth(String gwatdepth) {
this.gwatdepth = gwatdepth;
}
@@ -383,11 +313,11 @@
this.amplitude = amplitude;
}
- public BigDecimal getWaterelev() {
+ public String getWaterelev() {
return waterelev;
}
- public void setWaterelev(BigDecimal waterelev) {
+ public void setWaterelev(String waterelev) {
this.waterelev = waterelev;
}
@@ -399,28 +329,12 @@
this.gradeosw = gradeosw;
}
- public String getMediumosw() {
- return mediumosw;
- }
-
- public void setMediumosw(String mediumosw) {
- this.mediumosw = mediumosw;
- }
-
public String getGradeoswsb() {
return gradeoswsb;
}
public void setGradeoswsb(String gradeoswsb) {
this.gradeoswsb = gradeoswsb;
- }
-
- public String getMediuoswsb() {
- return mediuoswsb;
- }
-
- public void setMediuoswsb(String mediuoswsb) {
- this.mediuoswsb = mediuoswsb;
}
public String getGradeosws() {
@@ -431,76 +345,12 @@
this.gradeosws = gradeosws;
}
- public String getMediumosws() {
- return mediumosws;
- }
-
- public void setMediumosws(String mediumosws) {
- this.mediumosws = mediumosws;
- }
-
- public String getGradeogw() {
- return gradeogw;
- }
-
- public void setGradeogw(String gradeogw) {
- this.gradeogw = gradeogw;
- }
-
- public String getMediumogw() {
- return mediumogw;
- }
-
- public void setMediumogw(String mediumogw) {
- this.mediumogw = mediumogw;
- }
-
- public String getGradeogwsb() {
- return gradeogwsb;
- }
-
- public void setGradeogwsb(String gradeogwsb) {
- this.gradeogwsb = gradeogwsb;
- }
-
- public String getMediuogwsb() {
- return mediuogwsb;
- }
-
- public void setMediuogwsb(String mediuogwsb) {
- this.mediuogwsb = mediuogwsb;
- }
-
- public String getGradeogws() {
- return gradeogws;
- }
-
- public void setGradeogws(String gradeogws) {
- this.gradeogws = gradeogws;
- }
-
- public String getMediumogws() {
- return mediumogws;
- }
-
- public void setMediumogws(String mediumogws) {
- this.mediumogws = mediumogws;
- }
-
public String getGradeos() {
return gradeos;
}
public void setGradeos(String gradeos) {
this.gradeos = gradeos;
- }
-
- public String getMediumos() {
- return mediumos;
- }
-
- public void setMediumos(String mediumos) {
- this.mediumos = mediumos;
}
public String getGradeossb() {
@@ -511,36 +361,12 @@
this.gradeossb = gradeossb;
}
- public String getMediumossb() {
- return mediumossb;
- }
-
- public void setMediumossb(String mediumossb) {
- this.mediumossb = mediumossb;
- }
-
public String getGradeoss() {
return gradeoss;
}
public void setGradeoss(String gradeoss) {
this.gradeoss = gradeoss;
- }
-
- public String getMediumoss() {
- return mediumoss;
- }
-
- public void setMediumoss(String mediumoss) {
- this.mediumoss = mediumoss;
- }
-
- public String getValuation() {
- return valuation;
- }
-
- public void setValuation(String valuation) {
- this.valuation = valuation;
}
public String getThawgrade() {
@@ -567,12 +393,28 @@
this.fsoiltype = fsoiltype;
}
- public BigDecimal getUpperlimit() {
+ public String getUpperlimit() {
return upperlimit;
}
- public void setUpperlimit(BigDecimal upperlimit) {
+ public void setUpperlimit(String upperlimit) {
this.upperlimit = upperlimit;
+ }
+
+ public String getFsoilgroup() {
+ return fsoilgroup;
+ }
+
+ public void setFsoilgroup(String fsoilgroup) {
+ this.fsoilgroup = fsoilgroup;
+ }
+
+ public String getFrosoildep() {
+ return frosoildep;
+ }
+
+ public void setFrosoildep(String frosoildep) {
+ this.frosoildep = frosoildep;
}
public String getFrostheave() {
@@ -687,6 +529,14 @@
this.saltexp = saltexp;
}
+ public String getOthersoil() {
+ return othersoil;
+ }
+
+ public void setOthersoil(String othersoil) {
+ this.othersoil = othersoil;
+ }
+
public String getAbnburying() {
return abnburying;
}
@@ -701,6 +551,14 @@
public void setProfile(String profile) {
this.profile = profile;
+ }
+
+ public String getAgdesc() {
+ return agdesc;
+ }
+
+ public void setAgdesc(String agdesc) {
+ this.agdesc = agdesc;
}
public String getUniformity() {
@@ -727,19 +585,19 @@
this.strdepth = strdepth;
}
- public BigDecimal getBearingcap() {
+ public String getBearingcap() {
return bearingcap;
}
- public void setBearingcap(BigDecimal bearingcap) {
+ public void setBearingcap(String bearingcap) {
this.bearingcap = bearingcap;
}
- public BigDecimal getCommodulus() {
+ public String getCommodulus() {
return commodulus;
}
- public void setCommodulus(BigDecimal commodulus) {
+ public void setCommodulus(String commodulus) {
this.commodulus = commodulus;
}
@@ -782,4 +640,36 @@
public void setDatastage(String datastage) {
this.datastage = datastage;
}
+
+ public String getBelongs() {
+ return belongs;
+ }
+
+ public void setBelongs(String belongs) {
+ this.belongs = belongs;
+ }
+
+ public String getBelongsid() {
+ return belongsid;
+ }
+
+ public void setBelongsid(String belongsid) {
+ this.belongsid = belongsid;
+ }
+
+ public String getDatastatus() {
+ return datastatus;
+ }
+
+ public void setDatastatus(String datastatus) {
+ this.datastatus = datastatus;
+ }
+
+ public String getRemarks() {
+ return remarks;
+ }
+
+ public void setRemarks(String remarks) {
+ this.remarks = remarks;
+ }
}
diff --git a/src/main/java/com/lf/server/entity/bs/SsurveyworksiteEntity.java b/src/main/java/com/lf/server/entity/bs/SsurveyworksiteEntity.java
index 76b6ee0..0d7e087 100644
--- a/src/main/java/com/lf/server/entity/bs/SsurveyworksiteEntity.java
+++ b/src/main/java/com/lf/server/entity/bs/SsurveyworksiteEntity.java
@@ -18,7 +18,7 @@
@TableName("bs.s_surveyworksite")
@EqualsAndHashCode(callSuper = false)
public class SsurveyworksiteEntity extends BaseGeoEntity {
- private static final long serialVersionUID = 885167891106180736L;
+ private static final long serialVersionUID = 703652980133729536L;
private String workno;
@@ -26,103 +26,49 @@
private String worktype;
- private String begmnumber;
-
- private String begsnumber;
-
- private BigDecimal inicpvalue;
-
- private String endmnumber;
-
- private String endsnumber;
-
- private String geocondesc;
-
- private Integer bearingcap;
-
- private BigDecimal conmodulus;
-
- private BigDecimal inangle;
-
- private BigDecimal cohesion;
-
- private BigDecimal scstrength;
-
- private BigDecimal ncstrength;
-
- private String compact;
-
- private String wstate;
-
- private String humidity;
-
- private String coosmotic;
-
- private BigDecimal sndensity;
-
- private BigDecimal moicontent;
-
- private BigDecimal voidratio;
-
- private Integer ulaterres;
-
- private Integer uendres;
-
- private String gradeosw;
-
- private String mediumosw;
-
- private String gradeoswsb;
-
- private String mediuoswsb;
-
- private String gradeosws;
-
- private String mediumosws;
-
- private String gradeogw;
-
- private String mediumogw;
-
- private String gradeogwsb;
-
- private String mediuogwsb;
-
- private String gradeogws;
-
- private String mediumogws;
-
- private String gradeos;
-
- private String mediumos;
-
- private String gradeossb;
-
- private String mediumossb;
-
- private String gradeoss;
-
- private String mediumoss;
-
- private String dsgrouping;
-
- private String sintensity;
-
private String areatype;
- private String dcperiod;
+ private String lipindex;
- private String agatype;
+ private String lipgrade;
+
+ private String gwatdepth;
+
+ private String waterelev;
+
+ private String thawgrade;
+
+ private String thawtype;
+
+ private String fsoiltype;
+
+ private String froelev;
+
+ private String frostheave;
+
+ private String frograde;
+
+ private String coltype;
+
+ private String colgrade;
+
+ private String coldepth;
+
+ private String zoomgrade;
+
+ private String atmdepth;
+
+ private String salchename;
private String agdesc;
-
- private String ssoiltype;
-
- private String ssoildesc;
private String pacname;
private String infsegname;
+
+ private String pipename;
+
+ private String projname;
private String belongs;
@@ -135,10 +81,6 @@
private String version;
private String datastage;
-
- private String projname;
-
- private BigDecimal recpvaule;
public SsurveyworksiteEntity() {
}
@@ -167,334 +109,6 @@
this.worktype = worktype;
}
- public String getBegmnumber() {
- return begmnumber;
- }
-
- public void setBegmnumber(String begmnumber) {
- this.begmnumber = begmnumber;
- }
-
- public String getBegsnumber() {
- return begsnumber;
- }
-
- public void setBegsnumber(String begsnumber) {
- this.begsnumber = begsnumber;
- }
-
- public BigDecimal getInicpvalue() {
- return inicpvalue;
- }
-
- public void setInicpvalue(BigDecimal inicpvalue) {
- this.inicpvalue = inicpvalue;
- }
-
- public String getEndmnumber() {
- return endmnumber;
- }
-
- public void setEndmnumber(String endmnumber) {
- this.endmnumber = endmnumber;
- }
-
- public String getEndsnumber() {
- return endsnumber;
- }
-
- public void setEndsnumber(String endsnumber) {
- this.endsnumber = endsnumber;
- }
-
- public String getGeocondesc() {
- return geocondesc;
- }
-
- public void setGeocondesc(String geocondesc) {
- this.geocondesc = geocondesc;
- }
-
- public Integer getBearingcap() {
- return bearingcap;
- }
-
- public void setBearingcap(Integer bearingcap) {
- this.bearingcap = bearingcap;
- }
-
- public BigDecimal getConmodulus() {
- return conmodulus;
- }
-
- public void setConmodulus(BigDecimal conmodulus) {
- this.conmodulus = conmodulus;
- }
-
- public BigDecimal getInangle() {
- return inangle;
- }
-
- public void setInangle(BigDecimal inangle) {
- this.inangle = inangle;
- }
-
- public BigDecimal getCohesion() {
- return cohesion;
- }
-
- public void setCohesion(BigDecimal cohesion) {
- this.cohesion = cohesion;
- }
-
- public BigDecimal getScstrength() {
- return scstrength;
- }
-
- public void setScstrength(BigDecimal scstrength) {
- this.scstrength = scstrength;
- }
-
- public BigDecimal getNcstrength() {
- return ncstrength;
- }
-
- public void setNcstrength(BigDecimal ncstrength) {
- this.ncstrength = ncstrength;
- }
-
- public String getCompact() {
- return compact;
- }
-
- public void setCompact(String compact) {
- this.compact = compact;
- }
-
- public String getWstate() {
- return wstate;
- }
-
- public void setWstate(String wstate) {
- this.wstate = wstate;
- }
-
- public String getHumidity() {
- return humidity;
- }
-
- public void setHumidity(String humidity) {
- this.humidity = humidity;
- }
-
- public String getCoosmotic() {
- return coosmotic;
- }
-
- public void setCoosmotic(String coosmotic) {
- this.coosmotic = coosmotic;
- }
-
- public BigDecimal getSndensity() {
- return sndensity;
- }
-
- public void setSndensity(BigDecimal sndensity) {
- this.sndensity = sndensity;
- }
-
- public BigDecimal getMoicontent() {
- return moicontent;
- }
-
- public void setMoicontent(BigDecimal moicontent) {
- this.moicontent = moicontent;
- }
-
- public BigDecimal getVoidratio() {
- return voidratio;
- }
-
- public void setVoidratio(BigDecimal voidratio) {
- this.voidratio = voidratio;
- }
-
- public Integer getUlaterres() {
- return ulaterres;
- }
-
- public void setUlaterres(Integer ulaterres) {
- this.ulaterres = ulaterres;
- }
-
- public Integer getUendres() {
- return uendres;
- }
-
- public void setUendres(Integer uendres) {
- this.uendres = uendres;
- }
-
- public String getGradeosw() {
- return gradeosw;
- }
-
- public void setGradeosw(String gradeosw) {
- this.gradeosw = gradeosw;
- }
-
- public String getMediumosw() {
- return mediumosw;
- }
-
- public void setMediumosw(String mediumosw) {
- this.mediumosw = mediumosw;
- }
-
- public String getGradeoswsb() {
- return gradeoswsb;
- }
-
- public void setGradeoswsb(String gradeoswsb) {
- this.gradeoswsb = gradeoswsb;
- }
-
- public String getMediuoswsb() {
- return mediuoswsb;
- }
-
- public void setMediuoswsb(String mediuoswsb) {
- this.mediuoswsb = mediuoswsb;
- }
-
- public String getGradeosws() {
- return gradeosws;
- }
-
- public void setGradeosws(String gradeosws) {
- this.gradeosws = gradeosws;
- }
-
- public String getMediumosws() {
- return mediumosws;
- }
-
- public void setMediumosws(String mediumosws) {
- this.mediumosws = mediumosws;
- }
-
- public String getGradeogw() {
- return gradeogw;
- }
-
- public void setGradeogw(String gradeogw) {
- this.gradeogw = gradeogw;
- }
-
- public String getMediumogw() {
- return mediumogw;
- }
-
- public void setMediumogw(String mediumogw) {
- this.mediumogw = mediumogw;
- }
-
- public String getGradeogwsb() {
- return gradeogwsb;
- }
-
- public void setGradeogwsb(String gradeogwsb) {
- this.gradeogwsb = gradeogwsb;
- }
-
- public String getMediuogwsb() {
- return mediuogwsb;
- }
-
- public void setMediuogwsb(String mediuogwsb) {
- this.mediuogwsb = mediuogwsb;
- }
-
- public String getGradeogws() {
- return gradeogws;
- }
-
- public void setGradeogws(String gradeogws) {
- this.gradeogws = gradeogws;
- }
-
- public String getMediumogws() {
- return mediumogws;
- }
-
- public void setMediumogws(String mediumogws) {
- this.mediumogws = mediumogws;
- }
-
- public String getGradeos() {
- return gradeos;
- }
-
- public void setGradeos(String gradeos) {
- this.gradeos = gradeos;
- }
-
- public String getMediumos() {
- return mediumos;
- }
-
- public void setMediumos(String mediumos) {
- this.mediumos = mediumos;
- }
-
- public String getGradeossb() {
- return gradeossb;
- }
-
- public void setGradeossb(String gradeossb) {
- this.gradeossb = gradeossb;
- }
-
- public String getMediumossb() {
- return mediumossb;
- }
-
- public void setMediumossb(String mediumossb) {
- this.mediumossb = mediumossb;
- }
-
- public String getGradeoss() {
- return gradeoss;
- }
-
- public void setGradeoss(String gradeoss) {
- this.gradeoss = gradeoss;
- }
-
- public String getMediumoss() {
- return mediumoss;
- }
-
- public void setMediumoss(String mediumoss) {
- this.mediumoss = mediumoss;
- }
-
- public String getDsgrouping() {
- return dsgrouping;
- }
-
- public void setDsgrouping(String dsgrouping) {
- this.dsgrouping = dsgrouping;
- }
-
- public String getSintensity() {
- return sintensity;
- }
-
- public void setSintensity(String sintensity) {
- this.sintensity = sintensity;
- }
-
public String getAreatype() {
return areatype;
}
@@ -503,20 +117,132 @@
this.areatype = areatype;
}
- public String getDcperiod() {
- return dcperiod;
+ public String getLipindex() {
+ return lipindex;
}
- public void setDcperiod(String dcperiod) {
- this.dcperiod = dcperiod;
+ public void setLipindex(String lipindex) {
+ this.lipindex = lipindex;
}
- public String getAgatype() {
- return agatype;
+ public String getLipgrade() {
+ return lipgrade;
}
- public void setAgatype(String agatype) {
- this.agatype = agatype;
+ public void setLipgrade(String lipgrade) {
+ this.lipgrade = lipgrade;
+ }
+
+ public String getGwatdepth() {
+ return gwatdepth;
+ }
+
+ public void setGwatdepth(String gwatdepth) {
+ this.gwatdepth = gwatdepth;
+ }
+
+ public String getWaterelev() {
+ return waterelev;
+ }
+
+ public void setWaterelev(String waterelev) {
+ this.waterelev = waterelev;
+ }
+
+ public String getThawgrade() {
+ return thawgrade;
+ }
+
+ public void setThawgrade(String thawgrade) {
+ this.thawgrade = thawgrade;
+ }
+
+ public String getThawtype() {
+ return thawtype;
+ }
+
+ public void setThawtype(String thawtype) {
+ this.thawtype = thawtype;
+ }
+
+ public String getFsoiltype() {
+ return fsoiltype;
+ }
+
+ public void setFsoiltype(String fsoiltype) {
+ this.fsoiltype = fsoiltype;
+ }
+
+ public String getFroelev() {
+ return froelev;
+ }
+
+ public void setFroelev(String froelev) {
+ this.froelev = froelev;
+ }
+
+ public String getFrostheave() {
+ return frostheave;
+ }
+
+ public void setFrostheave(String frostheave) {
+ this.frostheave = frostheave;
+ }
+
+ public String getFrograde() {
+ return frograde;
+ }
+
+ public void setFrograde(String frograde) {
+ this.frograde = frograde;
+ }
+
+ public String getColtype() {
+ return coltype;
+ }
+
+ public void setColtype(String coltype) {
+ this.coltype = coltype;
+ }
+
+ public String getColgrade() {
+ return colgrade;
+ }
+
+ public void setColgrade(String colgrade) {
+ this.colgrade = colgrade;
+ }
+
+ public String getColdepth() {
+ return coldepth;
+ }
+
+ public void setColdepth(String coldepth) {
+ this.coldepth = coldepth;
+ }
+
+ public String getZoomgrade() {
+ return zoomgrade;
+ }
+
+ public void setZoomgrade(String zoomgrade) {
+ this.zoomgrade = zoomgrade;
+ }
+
+ public String getAtmdepth() {
+ return atmdepth;
+ }
+
+ public void setAtmdepth(String atmdepth) {
+ this.atmdepth = atmdepth;
+ }
+
+ public String getSalchename() {
+ return salchename;
+ }
+
+ public void setSalchename(String salchename) {
+ this.salchename = salchename;
}
public String getAgdesc() {
@@ -525,22 +251,6 @@
public void setAgdesc(String agdesc) {
this.agdesc = agdesc;
- }
-
- public String getSsoiltype() {
- return ssoiltype;
- }
-
- public void setSsoiltype(String ssoiltype) {
- this.ssoiltype = ssoiltype;
- }
-
- public String getSsoildesc() {
- return ssoildesc;
- }
-
- public void setSsoildesc(String ssoildesc) {
- this.ssoildesc = ssoildesc;
}
public String getPacname() {
@@ -557,6 +267,22 @@
public void setInfsegname(String infsegname) {
this.infsegname = infsegname;
+ }
+
+ public String getPipename() {
+ return pipename;
+ }
+
+ public void setPipename(String pipename) {
+ this.pipename = pipename;
+ }
+
+ public String getProjname() {
+ return projname;
+ }
+
+ public void setProjname(String projname) {
+ this.projname = projname;
}
public String getBelongs() {
@@ -605,21 +331,5 @@
public void setDatastage(String datastage) {
this.datastage = datastage;
- }
-
- public String getProjname() {
- return projname;
- }
-
- public void setProjname(String projname) {
- this.projname = projname;
- }
-
- public BigDecimal getRecpvaule() {
- return recpvaule;
- }
-
- public void setRecpvaule(BigDecimal recpvaule) {
- this.recpvaule = recpvaule;
}
}
diff --git a/src/main/java/com/lf/server/mapper/bs/SexplorationpointstratumMapper.java b/src/main/java/com/lf/server/mapper/bs/SexplorationpointstratumMapper.java
new file mode 100644
index 0000000..5e33283
--- /dev/null
+++ b/src/main/java/com/lf/server/mapper/bs/SexplorationpointstratumMapper.java
@@ -0,0 +1,15 @@
+package com.lf.server.mapper.bs;
+
+import com.lf.server.entity.bs.SexplorationpointstratumEntity;
+import com.lf.server.mapper.all.BasicMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Sexplorationpointstratum
+ * @author WWW
+ */
+@Mapper
+@Repository
+public interface SexplorationpointstratumMapper extends BasicMapper<SexplorationpointstratumEntity> {
+}
diff --git a/src/main/java/com/lf/server/mapper/sys/AttachMapper.java b/src/main/java/com/lf/server/mapper/sys/AttachMapper.java
index 68abab6..7cc2c9a 100644
--- a/src/main/java/com/lf/server/mapper/sys/AttachMapper.java
+++ b/src/main/java/com/lf/server/mapper/sys/AttachMapper.java
@@ -55,6 +55,14 @@
public AttachEntity selectByGuid(String guid);
/**
+ * 鏍规嵁Guid鏁扮粍鏌ヨ
+ *
+ * @param guids
+ * @return
+ */
+ public AttachEntity selectByGuids(String[] guids);
+
+ /**
* 鏍规嵁琛ㄥ悕鍜孏UID鏌ヨ
*
* @param tab
diff --git a/src/main/java/com/lf/server/service/sys/AttachService.java b/src/main/java/com/lf/server/service/sys/AttachService.java
index 870540b..b6e6f01 100644
--- a/src/main/java/com/lf/server/service/sys/AttachService.java
+++ b/src/main/java/com/lf/server/service/sys/AttachService.java
@@ -47,6 +47,11 @@
}
@Override
+ public AttachEntity selectByGuids(String[] guids) {
+ return attachMapper.selectByGuids(guids);
+ }
+
+ @Override
public AttachEntity selectByTabAndGuid(String tab, String tabGuid, String guid) {
return attachMapper.selectByTabAndGuid(tab, tabGuid, guid);
}
diff --git a/src/main/resources/mapper/sys/AttachMapper.xml b/src/main/resources/mapper/sys/AttachMapper.xml
index 41a0e3d..0039d80 100644
--- a/src/main/resources/mapper/sys/AttachMapper.xml
+++ b/src/main/resources/mapper/sys/AttachMapper.xml
@@ -33,6 +33,13 @@
select * from lf.sys_attach where guid = #{guid} limit 1
</select>
+ <select id="selectByGuids" resultType="com.lf.server.entity.sys.AttachEntity">
+ select * from lf.sys_attach where guid in
+ <foreach item="guid" collection="guids" index="index" open="(" separator="," close=")">
+ #{guid}
+ </foreach>
+ </select>
+
<select id="selectByTabAndGuid" resultType="com.lf.server.entity.sys.AttachEntity">
select * from lf.sys_attach where tab = #{tab} and tab_guid = #{tabGuid} and guid = #{guid} limit 1
</select>
--
Gitblit v1.9.3