三色任务和自查任务

linwe

2024-08-02 a1eede2f9f7c2590952ab1bdf34210020cdde7c6

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

@@ -26,14 +26,18 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.itextpdf.text.log.Logger;
import com.itextpdf.text.log.LoggerFactory;
import com.xxl.job.core.enums.taskHandlerEnum;
import org.apache.commons.lang3.StringUtils;
import org.springblade.common.constant.CommonConstant;
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;
import org.springblade.modules.customTask.entity.CustomTaskEntity;
import org.springblade.modules.grid.entity.GridEntity;
import org.springblade.modules.grid.entity.GridWorkLogEntity;
import org.springblade.modules.grid.service.IGridService;
@@ -111,31 +115,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) {
         // 查询取保候审任务列表(人房相关)
@@ -253,7 +232,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(),
@@ -412,9 +391,10 @@
   @Transactional(rollbackFor = Exception.class)
   public boolean createTaskJob(String param) {
      // 解析参数
      JSONObject jsonParam = JSON.parseObject(param);
      CustomTaskEntity customTaskEntity = JSON.parseObject(param, CustomTaskEntity.class);
      // CustomTaskEntity customTaskEntity = new CustomTaskEntity();
//      String params = jsonParam.getString("params");
      boolean flag = false;
//       boolean flag = false;
      // 校园安全自查任务生成
//      createCampusReportingTask();
      // 打金店/二手车/二手手机任务生成
@@ -422,9 +402,11 @@
      // 旅馆安全自查任务生成
//      createHotelReportingTask();
      // 人员类-肇事肇祸精神障碍患者走访任务生成
      createGridWordTask();
      // createGridWordTask();
      // 返回
      return flag;
      TaskHandle handler = (TaskHandle) SpringUtils.getBean(Objects.requireNonNull(taskHandlerEnum.getNameByCode(customTaskEntity.getTaskType())));
      handler.taskHandle(customTaskEntity);
      return true;
   }


@@ -693,14 +675,15 @@

      } 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());
         }
         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;