ZongYue / lpg

Download as
Browse Code »

Commit fd9f19f4dc9b4067f9a0f508771f2e76e4c35f91

Authored by lst
1 parent d9a50cb4
Exists in dev

场站区域划分

Showing 5 changed files with 48 additions and 25 deletions   Show diff stats
backend/lpg-common/src/main/java/com/hotent/lpg/common/model/WStationRegionalDivision.java
  Diff comments   View file @fd9f19f
... ... @@ -5,9 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
5 5 import com.baomidou.mybatisplus.annotation.TableId;
6 6 import com.fasterxml.jackson.annotation.JsonProperty;
7 7 import com.hotent.base.entity.BaseModel;
8   -import com.hotent.bpm.defxml.entity.Text;
9 8 import com.hotent.lpg.common.dto.JwdDTO;
10   -import groovy.transform.Field;
11 9 import io.swagger.annotations.ApiModel;
12 10 import io.swagger.annotations.ApiModelProperty;
13 11 import lombok.Data;
... ... @@ -27,55 +25,66 @@ import java.util.List;
27 25 public class WStationRegionalDivision extends BaseModel<WStationRegionalDivision> {
28 26  
29 27 private static final long serialVersionUID = 1L;
30   - @TableId(value = "id", type = IdType.ASSIGN_ID)
  28 + @ApiModelProperty(value = "主键")
  29 + @TableId(value = "ID_", type = IdType.ASSIGN_ID)
31 30 @JsonProperty("id")
32 31 private String id;
33 32  
  33 + @ApiModelProperty(value = "外键")
  34 + @TableField("REF_ID_")
  35 + @JsonProperty("refId")
  36 + private String refId;
  37 +
34 38 @ApiModelProperty(value = "名称")
35   - @TableField("f_name")
  39 + @TableField("F_name")
36 40 @JsonProperty("fName")
37 41 private String fName;
38 42  
39 43 @ApiModelProperty(value = "所属企业id")
40   - @TableField("f_ssqyId")
  44 + @TableField("F_ssqyId")
41 45 @JsonProperty("fSsqyid")
42 46 private String fSsqyid;
43 47  
44 48 @ApiModelProperty(value = "所属厂站id")
45   - @TableField("f_ssczId")
  49 + @TableField("F_ssczId")
46 50 @JsonProperty("fSsczid")
47 51 private String fSsczid;
48 52  
49 53 @ApiModelProperty(value = "创建时间")
50   - @TableField("f_cjsj")
  54 + @TableField("F_cjsj")
51 55 @JsonProperty("fCjsj")
52 56 private LocalDateTime fCjsj;
53 57  
54 58 @ApiModelProperty(value = "更新时间")
55   - @TableField("f_gxsj")
  59 + @TableField("F_gxsj")
56 60 @JsonProperty("fGxsj")
57 61 private LocalDateTime fGxsj;
58 62  
59   - @ApiModelProperty(value = "区域类型（电子围栏等）")
60   - @TableField("f_regional_type")
  63 + @ApiModelProperty(value = "区域类型")
  64 + @TableField("F_regional_type")
61 65 @JsonProperty("fRegionalType")
62 66 private String fRegionalType;
63 67  
64   - @ApiModelProperty(value = "形状：矩形、三角形、原型等")
65   - @TableField("f_shape")
  68 + @ApiModelProperty(value = "形状")
  69 + @TableField("F_shape")
66 70 @JsonProperty("fShape")
67 71 private String fShape;
68 72  
69 73 @ApiModelProperty(value = "地址信息")
70   - @TableField("f_boundary")
  74 + @TableField("F_boundary")
71 75 @JsonProperty("fBoundary")
72 76 private String fBoundary;
73 77  
74 78 @ApiModelProperty(value = "备注")
75   - @TableField("f_remark")
  79 + @TableField("F_remark")
76 80 @JsonProperty("fRemark")
77 81 private String fRemark;
78 82  
  83 + @ApiModelProperty(value = "表单数据版本")
  84 + @TableField("F_form_data_rev_")
  85 + @JsonProperty("fFormDataRev")
  86 + private Long fFormDataRev;
  87 +
79 88 /**
80 89 * 经纬度集合
81 90 */
... ...
backend/lpg-manage/src/main/java/com/hotent/lpg/manage/controller/MStationRegionalDivisionController.java
  Diff comments   View file @fd9f19f
... ... @@ -67,7 +67,17 @@ public class MStationRegionalDivisionController extends BaseController&lt;MStationR
67 67 msg = "请传递经纬度信息";
68 68 return CommonResult.<String>error().message(msg);
69 69 }
70   - baseService.createOrUpdate(stationRegionalDivision);
  70 + try {
  71 + baseService.createOrUpdate(stationRegionalDivision);
  72 + } catch (Exception e) {
  73 + if (e.getMessage().contains("name_ssczId")) {
  74 + return CommonResult.<String>error().message("区域名称已存在");
  75 + }
  76 + if (e.getMessage().contains("Invalid GIS data provided to function st_geometryfromtext")) {
  77 + return CommonResult.<String>error().message("坐标信息不规范");
  78 + }
  79 + return CommonResult.<String>error().message("操作失败");
  80 + }
71 81 return CommonResult.<String>ok().message(msg);
72 82 }
73 83 }
... ...
backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MStationRegionalDivisionManagerImpl.java
  Diff comments   View file @fd9f19f
1 1 package com.hotent.lpg.manage.manager.impl;
2 2  
  3 +import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator;
3 4 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
4 5 import com.hotent.base.manager.impl.BaseManagerImpl;
5 6 import com.hotent.lpg.common.dto.JwdDTO;
... ... @@ -25,6 +26,8 @@ public class MStationRegionalDivisionManagerImpl extends BaseManagerImpl&lt;MStatio
25 26  
26 27 @Autowired
27 28 private MCzxxManager mCzxxManager;
  29 + @Autowired
  30 + private IdentifierGenerator identifierGenerator;
28 31  
29 32 @Override
30 33 public WStationRegionalDivision getDetail(String id) {
... ... @@ -49,6 +52,7 @@ public class MStationRegionalDivisionManagerImpl extends BaseManagerImpl&lt;MStatio
49 52 throw new RuntimeException("厂站信息不存在");
50 53 }
51 54 stationRegionalDivision.setFSsqyid(wCzxx.getFSsqyid());
  55 + stationRegionalDivision.setId(identifierGenerator.nextId(stationRegionalDivision) + "");
52 56 baseMapper.insertWStationRegionalDivision(stationRegionalDivision);
53 57 } else {
54 58 WStationRegionalDivision wStationRegionalDivision = baseMapper.selectById(stationRegionalDivision.getId());
... ...
backend/lpg-manage/src/main/resources/mapper/MStationRegionalDivisionMapper.xml
  Diff comments   View file @fd9f19f
... ... @@ -4,7 +4,7 @@
4 4  
5 5 <!-- 通用查询映射结果 -->
6 6 <resultMap id="BaseResultMap" type="com.hotent.lpg.common.model.WStationRegionalDivision">
7   - <id column="id" property="id" />
  7 + <id column="ID_" property="id" />
8 8 <result column="f_name" property="fName" />
9 9 <result column="f_ssqyId" property="fSsqyid" />
10 10 <result column="f_ssczId" property="fSsczid" />
... ... @@ -18,7 +18,7 @@
18 18  
19 19 <!-- 通用查询结果列 -->
20 20 <sql id="Base_Column_List">
21   - id,
  21 + ID_,
22 22 f_name,
23 23 f_ssqyId,
24 24 f_ssczId,
... ... @@ -48,7 +48,7 @@
48 48  
49 49 <select id="selectById" resultMap="BaseResultMap">
50 50 select
51   - id,
  51 + ID_,
52 52 f_name,
53 53 f_ssqyId,
54 54 f_ssczId,
... ... @@ -61,12 +61,12 @@
61 61 from
62 62 w_station_regional_division
63 63 where
64   - id = #{id}
  64 + ID_ = #{id}
65 65 </select>
66 66  
67 67  
68 68 <insert id="insertWStationRegionalDivision">
69   - 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`)
  69 + 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`)
70 70 VALUES ( #{id}, #{fName}, #{fSsqyid}, #{fSsczid}, SYSDATE(), SYSDATE(), #{fRegionalType}, #{fShape}, #{fRemark},ST_GeomFromText(#{fBoundary}));
71 71 </insert>
72 72  
... ... @@ -81,6 +81,6 @@
81 81 <if test="fRemark != null and fRemark != ''">f_remark = #{fRemark} ,</if>
82 82 <if test="fBoundary != null ">f_boundary = ST_GeomFromText(#{fBoundary}),</if>
83 83 f_gxsj = SYSDATE()
84   - where id = #{id}
  84 + where ID_ = #{id}
85 85 </update>
86 86 </mapper>
... ...
backend/lpg-user/src/main/resources/mapper/StationRegionalDivisionMapper.xml
  Diff comments   View file @fd9f19f
... ... @@ -4,7 +4,7 @@
4 4  
5 5 <!-- 通用查询映射结果 -->
6 6 <resultMap id="BaseResultMap" type="com.hotent.lpg.common.model.WStationRegionalDivision">
7   - <id column="id" property="id" />
  7 + <id column="ID_" property="id" />
8 8 <result column="f_name" property="fName" />
9 9 <result column="f_ssqyId" property="fSsqyid" />
10 10 <result column="f_ssczId" property="fSsczid" />
... ... @@ -18,7 +18,7 @@
18 18  
19 19 <!-- 通用查询结果列 -->
20 20 <sql id="Base_Column_List">
21   - id,
  21 + ID_,
22 22 f_name,
23 23 f_ssqyId,
24 24 f_ssczId,
... ... @@ -51,7 +51,7 @@
51 51 <include refid="Base_Column_List"/>
52 52 from
53 53 w_station_regional_division
54   - where
55   - id = #{id}
  54 + where
  55 + ID_ = #{id}
56 56 </select>
57 57 </mapper>
... ...