维保代办发送消息

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/MaintenanceCompanyController.java

@@ -5,6 +5,7 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -333,4 +334,12 @@ public class MaintenanceCompanyController extends BaseController {
 		return ResponseHelper.buildResponse(maintenanceCompanyServiceImpl.queryCompanyMsg());
 	}
 
+
+	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/get/amosOrgIdsByIds")
+	@ApiOperation(httpMethod = "GET", value = "根据主键查orgIds", notes = "根据主键查orgIds")
+	public ResponseModel<List<String>> getAmosOrgIdsByIds(@RequestParam(value = "list", required = true) List<String> list) {
+		return ResponseHelper.buildResponse(maintenanceCompanyServiceImpl.getAmosOrgIdsByIds(list));
+	}
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/MaintenanceCompanyServiceImpl.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 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.Sequence;
@@ -838,4 +839,13 @@ public class MaintenanceCompanyServiceImpl
         });
         return resultList;
     }
+
+    public List<String> getAmosOrgIdsByIds(List<String> list) {
+        QueryWrapper<MaintenanceCompany> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().select(MaintenanceCompany::getAmosId)
+                .in(MaintenanceCompany::getSequenceNbr, list)
+                .groupBy(MaintenanceCompany::getAmosId);
+        List<String> collect = maintenanceCompanyMapper.selectList(queryWrapper).stream().map(MaintenanceCompany::getAmosId).collect(Collectors.toList());
+        return collect;
+    }
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/feign/JCSFeignClient.java

@@ -3,10 +3,12 @@ package com.yeejoin.amos.maintenance.business.feign;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @author DELL
  */
@@ -20,4 +22,12 @@ public interface JCSFeignClient {
      */
     @GetMapping(value = "jcs/org-usr/{userId}/userUnit")
     FeignClientResult getUserUnit(@PathVariable String userId);
+
+
+    /**
+     * 根据主键查orgIds
+     * @return
+     */
+    @RequestMapping(value = "/common/maintenance-company/get/amosOrgIdsByIds", method = RequestMethod.GET, consumes = "application/json")
+    ResponseModel<List<String>> getAmosOrgIdsByIds(@RequestParam(value = "list") List<String> list);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/impl/PlanTaskServiceImpl.java

@@ -13,9 +13,12 @@ import com.yeejoin.amos.maintenance.business.dao.mapper.PlanTaskDetailMapper;
 import com.yeejoin.amos.maintenance.business.dao.mapper.PlanTaskMapper;
 import com.yeejoin.amos.maintenance.business.dao.repository.*;
 import com.yeejoin.amos.maintenance.business.entity.mybatis.CheckChkExListBo;
+import com.yeejoin.amos.maintenance.business.feign.JCSFeignClient;
 import com.yeejoin.amos.maintenance.business.param.CheckPtListPageParam;
 import com.yeejoin.amos.maintenance.business.param.PlanTaskPageParam;
 import com.yeejoin.amos.maintenance.business.service.intfc.IPlanTaskService;
+import com.yeejoin.amos.maintenance.business.util.CommonResponse;
+import com.yeejoin.amos.maintenance.business.util.CommonResponseUtil;
 import com.yeejoin.amos.maintenance.business.util.PlanTaskUtil;
 import com.yeejoin.amos.maintenance.business.vo.CalDateVo;
 import com.yeejoin.amos.maintenance.business.vo.PlanTaskVo;
@@ -39,10 +42,12 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.concurrent.CompletionException;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -76,6 +81,9 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
     @Autowired
     RulePlanService rulePlanService;
 
+    @Autowired
+    JCSFeignClient jcsFeignClient;
+
     @Override
     public Page<HashMap<String, Object>> getPlanTaskInfo(PlanTaskPageParam params) {
         long total = planTaskMapper.countPlanTask(params);
@@ -485,8 +493,18 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
             String[] userIdArr = userIdString.split(",");
             List<String>  userIdList =	Arrays.asList(userIdArr);
             // 规则推送消息
-            rulePlanService.addPlanRule(plan, null, RuleTypeEnum.任务型计划生成, userIdList);
-
+            try {
+                if (CollectionUtils.isNotEmpty(userIdList)) {
+                    ResponseModel<List<String>> amosOrgIdsByIds = jcsFeignClient.getAmosOrgIdsByIds(userIdList);
+                    extraUserIds = amosOrgIdsByIds.getResult();
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+                log.error(e.getMessage(), e);
+            }
+            if (CollectionUtils.isNotEmpty(extraUserIds)) {
+                rulePlanService.addPlanRule(plan, null, RuleTypeEnum.任务型计划生成, extraUserIds);
+            }
         }
     }