diff --git a/backend/lpg-common/src/main/java/com/hotent/lpg/common/model/WStationRegionalDivision.java b/backend/lpg-common/src/main/java/com/hotent/lpg/common/model/WStationRegionalDivision.java index 605e633..85bb661 100644 --- a/backend/lpg-common/src/main/java/com/hotent/lpg/common/model/WStationRegionalDivision.java +++ b/backend/lpg-common/src/main/java/com/hotent/lpg/common/model/WStationRegionalDivision.java @@ -5,9 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonProperty; import com.hotent.base.entity.BaseModel; -import com.hotent.bpm.defxml.entity.Text; import com.hotent.lpg.common.dto.JwdDTO; -import groovy.transform.Field; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -27,55 +25,66 @@ import java.util.List; public class WStationRegionalDivision extends BaseModel { private static final long serialVersionUID = 1L; - @TableId(value = "id", type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + @TableId(value = "ID_", type = IdType.ASSIGN_ID) @JsonProperty("id") private String id; + @ApiModelProperty(value = "外键") + @TableField("REF_ID_") + @JsonProperty("refId") + private String refId; + @ApiModelProperty(value = "名称") - @TableField("f_name") + @TableField("F_name") @JsonProperty("fName") private String fName; @ApiModelProperty(value = "所属企业id") - @TableField("f_ssqyId") + @TableField("F_ssqyId") @JsonProperty("fSsqyid") private String fSsqyid; @ApiModelProperty(value = "所属厂站id") - @TableField("f_ssczId") + @TableField("F_ssczId") @JsonProperty("fSsczid") private String fSsczid; @ApiModelProperty(value = "创建时间") - @TableField("f_cjsj") + @TableField("F_cjsj") @JsonProperty("fCjsj") private LocalDateTime fCjsj; @ApiModelProperty(value = "更新时间") - @TableField("f_gxsj") + @TableField("F_gxsj") @JsonProperty("fGxsj") private LocalDateTime fGxsj; - @ApiModelProperty(value = "区域类型（电子围栏等）") - @TableField("f_regional_type") + @ApiModelProperty(value = "区域类型") + @TableField("F_regional_type") @JsonProperty("fRegionalType") private String fRegionalType; - @ApiModelProperty(value = "形状：矩形、三角形、原型等") - @TableField("f_shape") + @ApiModelProperty(value = "形状") + @TableField("F_shape") @JsonProperty("fShape") private String fShape; @ApiModelProperty(value = "地址信息") - @TableField("f_boundary") + @TableField("F_boundary") @JsonProperty("fBoundary") private String fBoundary; @ApiModelProperty(value = "备注") - @TableField("f_remark") + @TableField("F_remark") @JsonProperty("fRemark") private String fRemark; + @ApiModelProperty(value = "表单数据版本") + @TableField("F_form_data_rev_") + @JsonProperty("fFormDataRev") + private Long fFormDataRev; + /** * 经纬度集合 */ diff --git a/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/controller/MStationRegionalDivisionController.java b/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/controller/MStationRegionalDivisionController.java index c0597d9..c028975 100644 --- a/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/controller/MStationRegionalDivisionController.java +++ b/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/controller/MStationRegionalDivisionController.java @@ -67,7 +67,17 @@ public class MStationRegionalDivisionController extends BaseControllererror().message(msg); } - baseService.createOrUpdate(stationRegionalDivision); + try { + baseService.createOrUpdate(stationRegionalDivision); + } catch (Exception e) { + if (e.getMessage().contains("name_ssczId")) { + return CommonResult.error().message("区域名称已存在"); + } + if (e.getMessage().contains("Invalid GIS data provided to function st_geometryfromtext")) { + return CommonResult.error().message("坐标信息不规范"); + } + return CommonResult.error().message("操作失败"); + } return CommonResult.ok().message(msg); } } diff --git a/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MStationRegionalDivisionManagerImpl.java b/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MStationRegionalDivisionManagerImpl.java index bd4e3bc..5b7a5b2 100644 --- a/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MStationRegionalDivisionManagerImpl.java +++ b/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MStationRegionalDivisionManagerImpl.java @@ -1,5 +1,6 @@ package com.hotent.lpg.manage.manager.impl; +import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.hotent.base.manager.impl.BaseManagerImpl; import com.hotent.lpg.common.dto.JwdDTO; @@ -25,6 +26,8 @@ public class MStationRegionalDivisionManagerImpl extends BaseManagerImpl - + @@ -18,7 +18,7 @@ - id, + ID_, f_name, f_ssqyId, f_ssczId, @@ -48,7 +48,7 @@ - INSERT INTO w_station_regional_division ( `id`, `f_name`, `f_ssqyId`, `f_ssczId`, `f_cjsj`, `f_gxsj`, `f_regional_type`, `f_shape`, `f_remark`,`f_boundary`) + INSERT INTO w_station_regional_division ( `ID_`, `f_name`, `f_ssqyId`, `f_ssczId`, `f_cjsj`, `f_gxsj`, `f_regional_type`, `f_shape`, `f_remark`,`f_boundary`) VALUES ( #{id}, #{fName}, #{fSsqyid}, #{fSsczid}, SYSDATE(), SYSDATE(), #{fRegionalType}, #{fShape}, #{fRemark},ST_GeomFromText(#{fBoundary})); @@ -81,6 +81,6 @@ f_remark = #{fRemark} , f_boundary = ST_GeomFromText(#{fBoundary}), f_gxsj = SYSDATE() - where id = #{id} + where ID_ = #{id} diff --git a/backend/lpg-user/src/main/resources/mapper/StationRegionalDivisionMapper.xml b/backend/lpg-user/src/main/resources/mapper/StationRegionalDivisionMapper.xml index 786e0d0..ad8e561 100644 --- a/backend/lpg-user/src/main/resources/mapper/StationRegionalDivisionMapper.xml +++ b/backend/lpg-user/src/main/resources/mapper/StationRegionalDivisionMapper.xml @@ -4,7 +4,7 @@ - + @@ -18,7 +18,7 @@ - id, + ID_, f_name, f_ssqyId, f_ssczId, @@ -51,7 +51,7 @@ from w_station_regional_division - where - id = #{id} + where + ID_ = #{id} -- libgit2 0.21.2