From 590d573bf646f44f0608adcb89f04c576ec90e39 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 13 Aug 2024 19:49:22 +0800
Subject: [PATCH] 反诈宣传的优化
---
src/main/java/org/springblade/modules/backblast/entity/BackblastPubRecordEntity.java | 8 ++++++++
src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml | 3 +++
src/main/java/org/springblade/modules/backblast/mapper/BackblastPubRecordMapper.xml | 1 +
src/main/java/org/springblade/modules/grid/vo/GridWorkLogVO.java | 3 +++
src/main/java/org/springblade/modules/backblast/service/impl/BackblastPubRecordServiceImpl.java | 12 +++++++-----
src/main/java/org/springblade/modules/smsTask/mapper/SmsTaskMapper.xml | 2 ++
src/main/java/org/springblade/modules/backblast/vo/BackblastPubRecordVO.java | 3 +++
7 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/backblast/entity/BackblastPubRecordEntity.java b/src/main/java/org/springblade/modules/backblast/entity/BackblastPubRecordEntity.java
index 6ae1641..39dbbe8 100644
--- a/src/main/java/org/springblade/modules/backblast/entity/BackblastPubRecordEntity.java
+++ b/src/main/java/org/springblade/modules/backblast/entity/BackblastPubRecordEntity.java
@@ -120,4 +120,12 @@
/** 其他防诈内容 */
@ApiModelProperty(value = "其他防诈内容", example = "")
private String otherId;
+
+ @ApiModelProperty(value = "是否接受过其他反诈宣防内容", example = "")
+ @TableField("backblast_pub_flag")
+ private String backblastPubFlag;
+
+ @ApiModelProperty(value = "备注", example = "")
+ @TableField("remark")
+ private String remark;
}
diff --git a/src/main/java/org/springblade/modules/backblast/mapper/BackblastPubRecordMapper.xml b/src/main/java/org/springblade/modules/backblast/mapper/BackblastPubRecordMapper.xml
index 1973969..00925ba 100644
--- a/src/main/java/org/springblade/modules/backblast/mapper/BackblastPubRecordMapper.xml
+++ b/src/main/java/org/springblade/modules/backblast/mapper/BackblastPubRecordMapper.xml
@@ -10,6 +10,7 @@
<select id="selectBackblastPubRecordPage" resultMap="backblastPubRecordResultMap">
select
jbpr.*,
+ jg.grid_name,
br.town_name AS townName,
br.NAME AS communityName,
jpag.pcs_name pcsName,
diff --git a/src/main/java/org/springblade/modules/backblast/service/impl/BackblastPubRecordServiceImpl.java b/src/main/java/org/springblade/modules/backblast/service/impl/BackblastPubRecordServiceImpl.java
index a0f7d14..4e4a7ed 100644
--- a/src/main/java/org/springblade/modules/backblast/service/impl/BackblastPubRecordServiceImpl.java
+++ b/src/main/java/org/springblade/modules/backblast/service/impl/BackblastPubRecordServiceImpl.java
@@ -175,11 +175,13 @@
IGridService gridService = SpringUtils.getBean(IGridService.class);
IPoliceAffairsGridService policeAffairsGridService = SpringUtils.getBean(IPoliceAffairsGridService.class);
String point = "'POINT(" + backblastPubRecord.getLng() + " " + backblastPubRecord.getLat() + ")'";
- //点坐标解析网格
- List<GridEntity> gridEntityList = gridService.spatialAnalysis(point);
- if (gridEntityList.size()>0){
- GridEntity gridEntity = gridEntityList.get(0);
- backblastPubRecord.setGridCode(gridEntity.getGridCode());
+ if(StringUtils.isBlank(backblastPubRecord.getGridCode())){
+ //点坐标解析网格
+ List<GridEntity> gridEntityList = gridService.spatialAnalysis(point);
+ if (gridEntityList.size()>0){
+ GridEntity gridEntity = gridEntityList.get(0);
+ backblastPubRecord.setGridCode(gridEntity.getGridCode());
+ }
}
//点坐标解析警格
List<PoliceAffairsGridEntity> policeAffairsGridEntityList = policeAffairsGridService.spatialAnalysis(point);
diff --git a/src/main/java/org/springblade/modules/backblast/vo/BackblastPubRecordVO.java b/src/main/java/org/springblade/modules/backblast/vo/BackblastPubRecordVO.java
index dbdf216..a144c75 100644
--- a/src/main/java/org/springblade/modules/backblast/vo/BackblastPubRecordVO.java
+++ b/src/main/java/org/springblade/modules/backblast/vo/BackblastPubRecordVO.java
@@ -90,6 +90,9 @@
@ApiModelProperty(value = "房屋名称", example = "")
private String houseName;
+ @ApiModelProperty(value = "网格名称", example = "")
+ private String gridName;
+
/**
* 反诈宣防对象
*/
diff --git a/src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml b/src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml
index 3a6433e..4ab88d5 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml
@@ -11,6 +11,8 @@
br.town_name AS townName,
br.name AS neiName,
jg.grid_name,
+ juhl.label_name,
+ juhl.color,
bu.real_name as createUserName
from jczz_grid_work_log jgwl
left join jczz_household jh on jgwl.household_id = jh.id and jh.is_deleted = 0
@@ -19,6 +21,7 @@
LEFT JOIN blade_user bu on bu.id = jgwl.create_user and bu.is_deleted = 0
LEFT JOIN jczz_police_affairs_grid jpag on jhs.jw_grid_code= jpag.jw_grid_code and jpag.is_deleted = 0
left join blade_region br on br.code = jpag.community_code
+ LEFT JOIN jczz_user_house_label juhl on juhl.label_id = jgwl.person_type
where jgwl.is_deleted = 0
<if test="gridWorkLog.type !=null">
and jgwl.type = #{gridWorkLog.type}
diff --git a/src/main/java/org/springblade/modules/grid/vo/GridWorkLogVO.java b/src/main/java/org/springblade/modules/grid/vo/GridWorkLogVO.java
index f343fd5..5fef505 100644
--- a/src/main/java/org/springblade/modules/grid/vo/GridWorkLogVO.java
+++ b/src/main/java/org/springblade/modules/grid/vo/GridWorkLogVO.java
@@ -99,4 +99,7 @@
@ApiModelProperty(value = "标签名称")
private String labelName;
+ @ApiModelProperty(value = "标签颜色")
+ private String color;
+
}
diff --git a/src/main/java/org/springblade/modules/smsTask/mapper/SmsTaskMapper.xml b/src/main/java/org/springblade/modules/smsTask/mapper/SmsTaskMapper.xml
index dfbddb2..fdbcf57 100644
--- a/src/main/java/org/springblade/modules/smsTask/mapper/SmsTaskMapper.xml
+++ b/src/main/java/org/springblade/modules/smsTask/mapper/SmsTaskMapper.xml
@@ -94,4 +94,6 @@
</select>
+
+
</mapper>
--
Gitblit v1.9.3