lin
2024-05-09 6ad4777ee637bb0f97a5342f9b5f6574eb774570
无诈方式二调整
4 files modified
45 ■■■■ changed files
src/main/java/org/springblade/common/param/GridSet.java 25 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/task/entity/TaskNoFraudReportingEntity.java 5 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/task/entity/TaskPlaceRecordEntity.java 5 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/task/service/impl/TaskNoFraudReportingServiceImpl.java 10 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/common/param/GridSet.java
@@ -35,8 +35,15 @@
        //获取传入对象信息
        U u = clazz.cast(t);
        try {
            Field lngField = u.getClass().getDeclaredField(lngKey);
            Field latField = u.getClass().getDeclaredField(latKey);
            Field lngField = null;
            Field latField = null;
            try {
                lngField = u.getClass().getDeclaredField(lngKey);
                latField = u.getClass().getDeclaredField(latKey);
            } catch (NoSuchFieldException e) {
                lngField = u.getClass().getSuperclass().getDeclaredField(lngKey);
                latField = u.getClass().getSuperclass().getDeclaredField(latKey);
            }
            // 获取点信息
            lngField.setAccessible(true);
            latField.setAccessible(true);
@@ -49,7 +56,12 @@
                if (!Strings.isBlank(gridCodeKey)) {
                    // 根据位置设置网格,警格编号
                    IGridService gridService = SpringUtils.getBean(IGridService.class);
                    Field gridCodeField = u.getClass().getDeclaredField(gridCodeKey);
                    Field gridCodeField = null;
                    try {
                        gridCodeField = u.getClass().getDeclaredField(gridCodeKey);
                    } catch (NoSuchFieldException e) {
                        gridCodeField = u.getClass().getSuperclass().getDeclaredField(gridCodeKey);
                    }
                    //点坐标解析网格
                    List<GridEntity> gridEntityList = gridService.spatialAnalysis(point);
                    if (gridEntityList.size() > 0) {
@@ -61,7 +73,12 @@
                // 判断是否分析警格
                if (!Strings.isBlank(jwGirdCodeKey)) {
                    IPoliceAffairsGridService policeAffairsGridService = SpringUtils.getBean(IPoliceAffairsGridService.class);
                    Field jwGridCodeField = u.getClass().getDeclaredField(jwGirdCodeKey);
                    Field jwGridCodeField = null;
                    try {
                        jwGridCodeField = u.getClass().getDeclaredField(jwGirdCodeKey);
                    } catch (NoSuchFieldException e) {
                        jwGridCodeField = u.getClass().getSuperclass().getDeclaredField(jwGirdCodeKey);
                    }
                    //点坐标解析警格
                    List<PoliceAffairsGridEntity> policeAffairsGridEntityList = policeAffairsGridService.spatialAnalysis(point);
                    if (policeAffairsGridEntityList.size() > 0) {
src/main/java/org/springblade/modules/task/entity/TaskNoFraudReportingEntity.java
@@ -176,4 +176,9 @@
    @ApiModelProperty(value = "pdf文件地址", example = "")
    @TableField("pdf_urls")
    private String pdfUrls;
    /** 无诈类型 */
    @ApiModelProperty(value = "无诈类型", example = "")
    @TableField("no_fraud_type")
    private String noFraudType;
}
src/main/java/org/springblade/modules/task/entity/TaskPlaceRecordEntity.java
@@ -106,4 +106,9 @@
    @ApiModelProperty(value = "1 自查 2.无诈 3:校园安全检查", example = "")
    @TableField("type")
    private String type;
    /** 1:图片  2:ppt  3:其他 */
    @ApiModelProperty(value = "1:图片  2:ppt  3:其他", example = "")
    @TableField("file_type")
    private String fileType;
}
src/main/java/org/springblade/modules/task/service/impl/TaskNoFraudReportingServiceImpl.java
@@ -23,6 +23,7 @@
import org.springblade.common.constant.DictConstant;
import org.springblade.common.exception.CustomException;
import org.springblade.common.param.CommonParamSet;
import org.springblade.common.param.GridSet;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.BeanUtil;
@@ -78,6 +79,12 @@
            return false;
        }
        taskNoFraudReporting.setTaskId(aLong);
        // 计算网格
        if (StringUtils.isNotBlank(taskNoFraudReporting.getLng()) && StringUtils.isNotBlank(taskNoFraudReporting.getLat())) {
            // 点落面计算警格,网格,警格
            GridSet invoke = new GridSet().invoke(TaskNoFraudReportingVO.class, taskNoFraudReporting,
                "lng", "lat", "gridCode", "jwGridCode");
        }
        // 2.保存任务详情
        boolean save = save(taskNoFraudReporting);
        if (save) {
@@ -112,12 +119,13 @@
    /**
     * 更新
     *
     * @param taskNoFraudReporting
     * @return
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public Boolean updateTaskNoFraudReporting(TaskNoFraudReportingVO taskNoFraudReporting){
    public Boolean updateTaskNoFraudReporting(TaskNoFraudReportingVO taskNoFraudReporting) {
        // 1.更新任务表
        ITaskService taskService = SpringUtils.getBean(ITaskService.class);
        Long aLong = taskService.updateTask(null, null, null, taskNoFraudReporting.getReasonFailure(), AuthUtil.getUserId(), taskNoFraudReporting.getTaskId(), taskNoFraudReporting.getStatus());