代码优化

linwe

2024-07-17 36fe71cc6f93197aec868fd57e39e7dc63aef367

代码优化

 src/main/java/org/springblade/common/param/CommonParamSet.java

@@ -1,5 +1,6 @@
package org.springblade.common.param;

import lombok.Data;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
import org.springblade.common.cache.SysCache;
@@ -12,7 +13,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;

@Data
public class CommonParamSet<T> {
    /**
     * 区域编号集合

 src/main/java/org/springblade/modules/eCallEventTwo/controller/ECallEventTwoController.java

@@ -17,17 +17,18 @@
package org.springblade.modules.eCallEventTwo.controller;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.eCallEventTwo.dto.EcOrderDTO;
import org.springblade.modules.eCallEventTwo.dto.EcOrderParamDTO;
@@ -36,12 +37,12 @@
import org.springblade.modules.eCallEventTwo.service.IECallEventTwoService;
import org.springblade.modules.eCallEventTwo.vo.ECallEventTwoVO;
import org.springblade.modules.eCallEventTwo.wrapper.ECallEventTwoWrapper;
import org.springblade.modules.task.entity.ECallEventEntity;
import org.springblade.modules.task.service.IECallEventService;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.temporal.ChronoUnit;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;

@@ -180,5 +181,27 @@
        return R.data(count);
    }

    @GetMapping("/synchronousData")
    @ApiOperationSupport(order = 8)
    @ApiOperation(value = "信息同步")
    public void synchronousData() {
        IECallEventService bean = SpringUtils.getBean(IECallEventService.class);
        List<ECallEventEntity> list = bean.list(Wrappers.<ECallEventEntity>lambdaQuery().eq(ECallEventEntity::getIsDeleted, 0));
        for (ECallEventEntity eCallEventEntity : list) {
            ECallEventTwoEntity eCallEventTwoEntity = new ECallEventTwoEntity();
            eCallEventTwoEntity.setLocation(eCallEventEntity.getLocation());
            eCallEventTwoEntity.setSceneGeoLat(new BigDecimal(eCallEventEntity.getLat()));
            eCallEventTwoEntity.setSceneGeoLng(new BigDecimal(eCallEventEntity.getLng()));
            eCallEventTwoEntity.setIssueContent(eCallEventEntity.getRemark());
            eCallEventTwoEntity.setIssueTitle(eCallEventEntity.getName());
            eCallEventTwoEntity.setApplicantPhone(eCallEventEntity.getPhone());
            eCallEventTwoEntity.setApplicantName(eCallEventEntity.getRealName());
            eCallEventTwoEntity.setCreateTime(eCallEventEntity.getCreateTime());
            eCallEventTwoEntity.setStatus("3");
            eCallEventTwoEntity.setIssueOrigin("0");
            eCallEventTwoEntity.setOrderId(eCallEventEntity.getId());
            eCallEventTwoService.save(eCallEventTwoEntity);
        }
    }

}

 src/main/java/org/springblade/modules/eCallEventTwo/service/impl/EcCallEventTwoServiceImpl.java

@@ -53,8 +53,10 @@

        // 公共参数设置
        CommonParamSet commonParamSet = new CommonParamSet().invoke(ECallEventTwoVO.class, eCallEventTwo);


        // 如果是委办局，直接设置成管理角色
        if(AuthUtil.getUserRole().equals("wbj")){
            commonParamSet.setIsAdministrator(1);
        }
        // 返回
        List<ECallEventTwoVO> eCallEventTwoVOS = baseMapper.selectECallEventTwoPage(page,
            eCallEventTwo,

 src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java

@@ -670,7 +670,7 @@

        } else if (task.getReportType().equals(CommonConstant.REPORT_TYPE_NO_FRAUD)) {
            // 如果报告类型为无诈，尝试更新无诈报告状态
            ITaskNoFraudReportingService bean = SpringUtils.getBean(ITaskNoFraudReportingService.class);
            ITaskNoFraudReportingService noFraudReportingService = SpringUtils.getBean(ITaskNoFraudReportingService.class);
            LambdaUpdateWrapper<TaskNoFraudReportingEntity> objectLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
            if (StringUtils.isNotBlank(task.getHouseCode())) {
                objectLambdaUpdateWrapper.set(TaskNoFraudReportingEntity::getHouseCode, task.getHouseCode());
@@ -678,7 +678,7 @@
            objectLambdaUpdateWrapper.set(TaskNoFraudReportingEntity::getStatus, task.getStatus());
            objectLambdaUpdateWrapper.set(TaskNoFraudReportingEntity::getRemark, task.getRemark());
            objectLambdaUpdateWrapper.eq(TaskNoFraudReportingEntity::getTaskId, task.getId());
            return bean.update(objectLambdaUpdateWrapper);
            return noFraudReportingService.update(objectLambdaUpdateWrapper);
        }
        // 如果没有匹配的报告类型，返回false
        return false;