From 1d0ea731a29d8d45acea70b0c3c7c91dacf5c101 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 14 Mar 2024 18:15:21 +0800
Subject: [PATCH] 报警记录
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 2
src/main/java/org/springblade/modules/policeAlarmRecords/mapper/PoliceAlarmRecordsMapper.xml | 10 ++++-
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java | 10 +++--
src/main/java/org/springblade/modules/policeAlarmRecords/entity/PoliceAlarmRecordsEntity.java | 64 ++++++++++++++++++++++++-------
src/main/java/org/springblade/modules/place/entity/PlaceExtEntity.java | 6 +-
5 files changed, 67 insertions(+), 25 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/entity/PlaceExtEntity.java b/src/main/java/org/springblade/modules/place/entity/PlaceExtEntity.java
index 421c460..8b35b59 100644
--- a/src/main/java/org/springblade/modules/place/entity/PlaceExtEntity.java
+++ b/src/main/java/org/springblade/modules/place/entity/PlaceExtEntity.java
@@ -139,9 +139,9 @@
// private Integer legalGender;
//
// /** 法人身份证 */
-// @ApiModelProperty(value = "法人身份证", example = "")
-// @TableField("legal_id_card")
-// private String legalIdCard;
+ @ApiModelProperty(value = "法人身份证", example = "")
+ @TableField("legal_id_card")
+ private String legalIdCard;
//
// /** 法人证件类型，业务字典 cardType */
// @ApiModelProperty(value = "法人证件类型，业务字典 cardType", example = "")
diff --git a/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java b/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
index 9211288..46dbe95 100644
--- a/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
+++ b/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
@@ -734,6 +734,8 @@
placeExtEntity.setUpdateUser(AuthUtil.getUserId());
// 新增场所详情
placeExtService.save(placeExtEntity);
+ } else {
+ placeExtService.updateById(placeVO.getPlaceExtEntity());
}
}
@@ -988,9 +990,9 @@
placeRelEntity.setPlaceId(placeEntity.getId());
placeRelEntity.setStreetName(placeExcel.getStreetName());
QueryWrapper<Region> wrapper = new QueryWrapper<>();
- wrapper.eq("name",placeExcel.getCommunityName());
+ wrapper.eq("name", placeExcel.getCommunityName());
Region region = SpringUtils.getBean(IRegionService.class).getOne(wrapper);
- if (null!=region){
+ if (null != region) {
placeRelEntity.setCommunityCode(region.getCode());
}
placeRelEntity.setCommunityName(placeExcel.getCommunityName());
@@ -1034,10 +1036,10 @@
if (!Strings.isBlank(placeExcel.getLabelCode())) {
// 匹配标签
QueryWrapper<CategoryEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("level",3).eq("category_name",placeExcel.getLabelCode()).eq("is_deleted",0);
+ wrapper.eq("level", 3).eq("category_name", placeExcel.getLabelCode()).eq("is_deleted", 0);
// 查询
List<CategoryEntity> list = SpringUtils.getBean(ICategoryService.class).list(wrapper);
- if (list.size()>0){
+ if (list.size() > 0) {
PlaceVO placeVO = new PlaceVO();
CategoryEntity categoryEntity = list.get(0);
placeVO.setLabel(categoryEntity.getCategoryNo());
diff --git a/src/main/java/org/springblade/modules/policeAlarmRecords/entity/PoliceAlarmRecordsEntity.java b/src/main/java/org/springblade/modules/policeAlarmRecords/entity/PoliceAlarmRecordsEntity.java
index 1a900fd..fe955fe 100644
--- a/src/main/java/org/springblade/modules/policeAlarmRecords/entity/PoliceAlarmRecordsEntity.java
+++ b/src/main/java/org/springblade/modules/policeAlarmRecords/entity/PoliceAlarmRecordsEntity.java
@@ -36,6 +36,9 @@
@TableName("jczz_police_alarm_records")
@ApiModel(value = "PoliceAlarmRecords对象", description = "报警记录")
public class PoliceAlarmRecordsEntity {
+ private static final long serialVersionUID = 1L;
+
+
/** id */
@ApiModelProperty(value = "主键ID", example = "")
@TableId(value = "id", type = IdType.AUTO)
@@ -51,18 +54,18 @@
@TableField("address")
private String address;
- /** 名称 */
- @ApiModelProperty(value = "名称", example = "")
+ /** 报警人名称 */
+ @ApiModelProperty(value = "报警人名称", example = "")
@TableField("name")
private String name;
- /** 联系电话 */
- @ApiModelProperty(value = "联系电话", example = "")
+ /** 报警人电话 */
+ @ApiModelProperty(value = "报警人电话", example = "")
@TableField("phone")
private String phone;
/** (刑事案件、治安案件、纠纷、救助、举报） */
- @ApiModelProperty(value = "(1.刑事案件、2.治安案件、3.纠纷、4.救助、5.举报）", example = "")
+ @ApiModelProperty(value = "(刑事案件、治安案件、纠纷、救助、举报）", example = "")
@TableField("alarm_type")
private String alarmType;
@@ -76,16 +79,6 @@
@TableField("grid_code")
private String gridCode;
- /** 0：否 1：是 */
- @ApiModelProperty(value = "0：否 1：是", example = "")
- @TableField("is_deleted")
- private Integer isDeleted;
-
- /** 民警id */
- @ApiModelProperty(value = "民警id", example = "")
- @TableField("police_id")
- private Long policeId;
-
/** 创建时间 */
@ApiModelProperty(value = "创建时间", example = "")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -98,4 +91,45 @@
@TableField(value = "update_time",fill = FieldFill.UPDATE)
private Date updateTime;
+ /** 接警人id */
+ @ApiModelProperty(value = "接警人id", example = "")
+ @TableField("police_id")
+ private Long policeId;
+
+ /** 接警人名称 */
+ @ApiModelProperty(value = "接警人名称", example = "")
+ @TableField("police_name")
+ private String policeName;
+
+ /** 接警人电话 */
+ @ApiModelProperty(value = "接警人电话", example = "")
+ @TableField("police_phone")
+ private String policePhone;
+
+ /** 0：否 1：是 */
+ @ApiModelProperty(value = "0：否 1：是", example = "")
+ @TableField("is_deleted")
+ private Integer isDeleted;
+
+ /** 性别 */
+ @ApiModelProperty(value = "性别", example = "")
+ @TableField("gender")
+ private Integer gender;
+
+ /** 警务网格编码 */
+ @ApiModelProperty(value = "警务网格编码", example = "")
+ @TableField("jw_grid_code")
+ private String jwGridCode;
+
+ /** 接警时间 */
+ @ApiModelProperty(value = "接警时间", example = "")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("alarm_response_time")
+ private Date alarmResponseTime;
+
+ /** 报警内容 */
+ @ApiModelProperty(value = "报警内容", example = "")
+ @TableField("alarm_describe")
+ private String alarmDescribe;
+
}
diff --git a/src/main/java/org/springblade/modules/policeAlarmRecords/mapper/PoliceAlarmRecordsMapper.xml b/src/main/java/org/springblade/modules/policeAlarmRecords/mapper/PoliceAlarmRecordsMapper.xml
index 7e43930..c321c3f 100644
--- a/src/main/java/org/springblade/modules/policeAlarmRecords/mapper/PoliceAlarmRecordsMapper.xml
+++ b/src/main/java/org/springblade/modules/policeAlarmRecords/mapper/PoliceAlarmRecordsMapper.xml
@@ -20,10 +20,16 @@
<result property="alarmType" column="alarm_type" />
<result property="injuryFlag" column="injury_flag" />
<result property="gridCode" column="grid_code" />
- <result property="isDeleted" column="is_deleted" />
- <result property="policeId" column="police_id" />
<result property="createTime" column="create_time" />
<result property="updateTime" column="update_time" />
+ <result property="policeId" column="police_id" />
+ <result property="policeName" column="police_name" />
+ <result property="policePhone" column="police_phone" />
+ <result property="isDeleted" column="is_deleted" />
+ <result property="gender" column="gender" />
+ <result property="jwGridCode" column="jw_grid_code" />
+ <result property="alarmResponseTime" column="alarm_response_time" />
+ <result property="alarmDescribe" column="alarm_describe" />
</resultMap>
<sql id="selectPoliceAlarmRecords">
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index 3b4b129..28cc63b 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -300,7 +300,7 @@
- (bu.lng * 3.1415) / 180)) * 6370.996
), 2) <= 1
and bu.role_id like concat('%','1727864411451359233','%')
- and bu.is_deleted = 0 and limit 1
+ and bu.is_deleted = 0 limit 1
</select>
--
Gitblit v1.9.3