linwe
2024-08-13 590d573bf646f44f0608adcb89f04c576ec90e39
反诈宣传的优化
7 files modified
32 ■■■■ changed files
src/main/java/org/springblade/modules/backblast/entity/BackblastPubRecordEntity.java 8 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/backblast/mapper/BackblastPubRecordMapper.xml 1 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/backblast/service/impl/BackblastPubRecordServiceImpl.java 12 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/backblast/vo/BackblastPubRecordVO.java 3 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml 3 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/grid/vo/GridWorkLogVO.java 3 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/smsTask/mapper/SmsTaskMapper.xml 2 ●●●●● patch | view | raw | blame | history
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;
}
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,
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);
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;
    /**
     * 反诈宣防对象
     */
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}
src/main/java/org/springblade/modules/grid/vo/GridWorkLogVO.java
@@ -99,4 +99,7 @@
    @ApiModelProperty(value = "标签名称")
    private String labelName;
    @ApiModelProperty(value = "标签颜色")
    private String color;
}
src/main/java/org/springblade/modules/smsTask/mapper/SmsTaskMapper.xml
@@ -94,4 +94,6 @@
    </select>
</mapper>