代码优化

linwe

2024-07-17 36fe71cc6f93197aec868fd57e39e7dc63aef367

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

@@ -20,6 +20,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -30,6 +31,8 @@
import org.springblade.common.constant.DictConstant;
import org.springblade.common.param.CommonParamSet;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.category.entity.CategoryEntity;
import org.springblade.modules.category.service.ICategoryService;
@@ -42,16 +45,17 @@
import org.springblade.modules.house.vo.HouseRentalTenantVO;
import org.springblade.modules.house.vo.HouseholdVO;
import org.springblade.modules.place.service.IPlaceExtService;
import org.springblade.modules.place.service.IPlacePractitionerService;
import org.springblade.modules.place.service.IPlaceService;
import org.springblade.modules.place.vo.PlacePractitionerVO;
import org.springblade.modules.place.vo.PlaceVO;
import org.springblade.modules.sms.service.ISmsSendService;
import org.springblade.modules.task.entity.*;
import org.springblade.modules.task.mapper.TaskMapper;
import org.springblade.modules.task.service.*;
import org.springblade.modules.task.vo.TaskNoFraudReportingVO;
import org.springblade.modules.task.vo.TaskSchoolEvenVO;
import org.springblade.modules.task.vo.TaskVO;
import org.springblade.modules.task.service.ITaskPlaceRectificationService;
import org.springblade.modules.task.entity.TaskPlaceSelfCheckEntity;
import org.springblade.modules.task.service.ITaskPlaceSelfCheckService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -109,31 +113,6 @@

   @Override
   public IPage<TaskVO> selectTaskPage(IPage<TaskVO> page, TaskVO task) {
//      String roleName = SpringUtils.getRequestParam("roleName");
//      String communityCode = SpringUtils.getRequestParam("communityCode");
//      if (!Strings.isBlank(communityCode)) {
//         // 校验社区编号是否合规
//         if (null != SpringUtils.getBean(IRegionService.class).getById(communityCode)) {
//            task.setCommunityCode(communityCode);
//         }
//      }
//      List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
//      Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
      // 网格编号集合
//      List<String> gridCodeList = new ArrayList<>();
      // 民警角色
//      if (!Strings.isBlank(roleName)) {
//         task.setRoleName(roleName);
//         if (roleName.equals("mj")) {
//            regionChildCodesList = SpringUtil.getBean(IPoliceAffairsGridService.class).getCommunityCodeListByUserId(AuthUtil.getUserId());
//         }
//         if (roleName.equals("wgy")) {
//            gridCodeList = SpringUtil.getBean(IGridService.class).getGridListByUserId(AuthUtil.getUserId());
//         }
//      }
//      if (AuthUtil.getUserAccount().equals("18879306957")) {
//         task.setCommunityCode("361102003027");
//      }
      CommonParamSet commonParamSet = new CommonParamSet().invoke(TaskVO.class, task);
      if (null != task.getReportType() && task.getReportType() == 1) {
         // 查询取保候审任务列表(人房相关)
@@ -251,7 +230,7 @@
         commonParamSet.getIsAdministrator(), commonParamSet.getGridCodeList());
      taskVO.setReportType(CommonConstant.NUMBER_ONE);
      // 取保候审
      Integer qbhs = baseMapper.selectTaskCount(taskVO, commonParamSet.getRegionChildCodesList(),
      Integer qbhs = baseMapper.selectTaskPageByPersonCount(taskVO, commonParamSet.getRegionChildCodesList(),
         commonParamSet.getIsAdministrator(), commonParamSet.getGridCodeList());
      // 报事报修
      Integer bsbx = SpringUtils.getBean(ITaskReportForRepairsService.class).getStatistics(roleType > 0 ? AuthUtil.getUserId() : null, neiCode, commonParamSet.getRegionChildCodesList(),
@@ -271,16 +250,38 @@
      Integer zfrw = SpringUtils.getBean(IGridWorkLogService.class).getGridWorkCountHandleCount(gridCode, CommonConstant.NUMBER_ONE);
      // 消防自查
      Integer xfzc = SpringUtils.getBean(ITaskPlaceSelfCheckService.class).getCount(neiCode, CommonConstant.NUMBER_ONE, CommonConstant.NUMBER_ONE);
      // 校园检查
      Integer xyjc = SpringUtils.getBean(ITaskPlaceSelfCheckService.class).getCount(neiCode, CommonConstant.NUMBER_ONE, CommonConstant.NUMBER_TWO);
      // 校园安全隐患排除
      // Integer xyaqyhpc = SpringUtils.getBean(ITaskPlaceSelfCheckService.class).getCount(neiCode, CommonConstant.NUMBER_ONE, CommonConstant.NUMBER_TWO);
      // 消防隐患整改
      Integer xfyhzg = SpringUtils.getBean(ITaskPlaceRectificationService.class).getCount(neiCode, CommonConstant.NUMBER_ONE);
      // 居住证申请
      Integer jzzsq = residencePermitApplyService.getCount(neiCode, CommonConstant.NUMBER_ONE);
      // 无诈统计
      taskVO.setReportType(6);
      Integer wztj = baseMapper.selectTaskCount(taskVO, commonParamSet.getRegionChildCodesList(),
      ITaskNoFraudReportingService noFraudReportingService = SpringUtils.getBean(ITaskNoFraudReportingService.class);
      TaskNoFraudReportingVO taskNoFraudReportingVO = new TaskNoFraudReportingVO();
      taskNoFraudReportingVO.setStatus(1);
      Integer wztj = noFraudReportingService.selectTaskNoFraudReportingCount(taskNoFraudReportingVO);

      ITaskSchoolEvenService taskSchoolEvenService = SpringUtils.getBean(ITaskSchoolEvenService.class);
      TaskSchoolEvenVO taskSchoolEvenVO = new TaskSchoolEvenVO();
      taskSchoolEvenVO.setConfirmFlag(CommonConstant.NUMBER_ONE.toString());
      taskSchoolEvenVO.setType(CommonConstant.NUMBER_ONE.toString());
      // 校园隐患
      long xyyh = taskSchoolEvenService.schoolEvenCount(taskSchoolEvenVO);
      // 校园纠纷矛盾
      taskSchoolEvenVO.setType(CommonConstant.NUMBER_TWO.toString());
      long xyjfmd = taskSchoolEvenService.schoolEvenCount(taskSchoolEvenVO);
      ;

      taskVO.setReportType(CommonConstant.NUMBER_FOUR);
      // 校园安全检查
      Integer xyaqjc = baseMapper.selectTaskCount(taskVO, commonParamSet.getRegionChildCodesList(),
         commonParamSet.getIsAdministrator(), commonParamSet.getGridCodeList());
      PlacePractitionerVO placePractitionerVO = new PlacePractitionerVO();
      placePractitionerVO.setConfirmFlag(CommonConstant.NUMBER_ONE);
      // 从业人员审核
      Integer cyrysh = SpringUtils.getBean(IPlacePractitionerService.class).selectPlacePractitionerCount(placePractitionerVO);

      // 设置
      objectObjectHashMap.put("qbhs", qbhs);// 取保候审
      objectObjectHashMap.put("bqsj", bqsj);// 标签报事-二手交易
@@ -293,7 +294,11 @@
      objectObjectHashMap.put("xfyhzg", xfyhzg);// 消防隐患整改
      objectObjectHashMap.put("jzzsq", jzzsq);// 居住证申请
      objectObjectHashMap.put("wztj", wztj);// 无诈
      objectObjectHashMap.put("xyjc", xyjc);// 校园检查
      // objectObjectHashMap.put("xyaqyhpc", xyaqyhpc);// 校园安全隐患排除
      objectObjectHashMap.put("xyyh", xyyh);// 校园隐患
      objectObjectHashMap.put("xyjfmd", xyjfmd);// 校园纠纷矛盾
      objectObjectHashMap.put("xyaqjc", xyaqjc);// 校园安全检查
      objectObjectHashMap.put("cyrysh", cyrysh);// 从业人员审核
      return objectObjectHashMap;
   }

@@ -388,11 +393,11 @@
//      String params = jsonParam.getString("params");
      boolean flag = false;
      // 校园安全自查任务生成
      createCampusReportingTask();
//      createCampusReportingTask();
      // 打金店/二手车/二手手机任务生成
      createLabelReportingTask();
//      createLabelReportingTask();
      // 旅馆安全自查任务生成
      createHotelReportingTask();
//      createHotelReportingTask();
      // 人员类-肇事肇祸精神障碍患者走访任务生成
      createGridWordTask();
      // 返回
@@ -665,10 +670,15 @@

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