盘点新增消息推送

jyzb-biz/src/main/java/com/junmp/jyzb/listener/GlobalEndListener.java

@@ -132,7 +132,7 @@ import static com.junmp.junmpProcess.common.CommonConstants.*;
                 // 获取流程定义ID
                 String processDefinitionId = event.getProcessDefinitionId();
                 List<HistoricVariableInstance> typeOrder = historyService.createHistoricVariableInstanceQuery().processInstanceId(processInstanceId).variableName("typeOrder").list();
-
+                String OrderName="";
                 if(typeOrder.size()>0) {
 
 
@@ -226,7 +226,7 @@ import static com.junmp.junmpProcess.common.CommonConstants.*;
                         BI.setApi("BussinessInventory");
                         bussinessInventoryService.updateById(BI);
                         MQ.SendMsg(exchangeName,BI.getOrgId().toString(),BI);
-
+                        OrderName= BI.getOrderNum();
                     } else
                     if (Type.equals("normalOrder")){
                         OrderMain existOrder= orderMainService.getOne(new LambdaQueryWrapper<OrderMain>()
@@ -293,7 +293,7 @@ import static com.junmp.junmpProcess.common.CommonConstants.*;
                     if (Type.equals("stocktakeOrder"))//整理需要下发的消息
                     {
                         sendReq.setMsgTitle("盘点提醒");
-                        sendReq.setMsgContent("盘库单:【"+mainProcess.getName()+"】已下发");
+                        sendReq.setMsgContent("盘库单:【"+OrderName+"】已下发");
                     }
                     else
                     {

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/InventoryMapper.java

@@ -86,7 +86,7 @@ public interface InventoryMapper extends BaseMapper<Inventory> {
     List<InventoryDto> GetInvInfoByEpc(@Param("list") List<String> epcList);
 
     //通过组织机构id获取组织机构下的userIdlist
-    List<InvExpireReq> selectUserListByOrgs(@Param("list") List<Long> uniqueOrgIDsList);
+    List<InvExpireReq> selectUserListByOrgs(@Param("list") List<Long> uniqueOrgIDsList,@Param("roleId")String roleId);
 
     List<Inventory> searchExpireEqs(@Param("list") List<Object[]> searchItem);
 

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/BussinessInventoryServiceImpl.java

@@ -2,6 +2,8 @@ package com.junmp.jyzb.service.impl;
 
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -9,11 +11,13 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.junmp.junmpProcess.dto.StartProcessInstanceDTO;
+import com.junmp.junmpProcess.dto.json.UserInfo;
 import com.junmp.junmpProcess.service.IFlowInstanceService;
 import com.junmp.jyzb.api.bean.dto.*;
 import com.junmp.jyzb.api.bean.query.BussinessInventoryReq;
 import com.junmp.jyzb.api.bean.query.InventorySumReq;
 import com.junmp.jyzb.api.bean.query.QueryEquipmentTypeReq;
+import com.junmp.jyzb.api.bean.req.InvExpireReq;
 import com.junmp.jyzb.api.bean.req.UpdateDetailReq;
 import com.junmp.jyzb.api.bean.req.UpdateInventoryReq;
 import com.junmp.jyzb.api.bean.req.UploadInventoryReq;
@@ -35,6 +39,7 @@ import com.junmp.v2.dict.entity.SysDictItem;
 import com.junmp.v2.dict.service.SysDictItemService;
 import com.junmp.v2.dict.service.SysDictService;
 import com.junmp.v2.message.api.MessageApi;
+import com.junmp.v2.message.api.bean.req.MessageReq;
 import com.junmp.v2.message.api.bean.req.MessageSendReq;
 import org.flowable.engine.TaskService;
 import org.flowable.task.api.Task;
@@ -49,6 +54,9 @@ import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.junmp.junmpProcess.common.CommonConstants.START_USER_INFO;
+import static com.junmp.junmpProcess.common.CommonConstants.TYPE_ORDER;
+
 @Service
 public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventoryMapper, BussinessInventory>
         implements BussinessInventoryService {
@@ -459,39 +467,6 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
         {
             throw new ServiceException(InventoryExceptionEnum.ORDER_CLOSED);
         }
-//       String type= BI.getInventoryType().toString();
-//        InventorySumReq sumreq=new InventorySumReq();
-//        String epcList="";
-//        List<WarehouseInventory> details=new ArrayList<>();
-//        if (type.equals("0"))
-//        {
-//
-//             details = warehouseInventoryService.list(
-//                    new LambdaQueryWrapper<WarehouseInventory>().eq(WarehouseInventory::getLocationId, BI.getWarehouseId())
-//            );
-//
-//
-//        } else if (type.equals("1"))//按装备类型盘点
-//        {
-//            List<String> typeIds = Arrays.asList(BI.getRules().split(","));
-//            details = warehouseInventoryService.list(
-//                    new LambdaQueryWrapper<WarehouseInventory>().eq(WarehouseInventory::getLocationId, BI.getWarehouseId())
-//                    .and(qw -> typeIds.forEach(typeId -> qw.or().eq(WarehouseInventory::getTypeId, typeId)))
-//            );
-//        }
-//        else if (type.equals("2"))//按号型盘点
-//        {
-//            List<String> sizeIds = Arrays.asList(BI.getRules().split(","));
-//            details = warehouseInventoryService.list(
-//                    new LambdaQueryWrapper<WarehouseInventory>().eq(WarehouseInventory::getLocationId, BI.getWarehouseId())
-//                            .and(qw -> sizeIds.forEach(size -> qw.or().eq(WarehouseInventory::getSizeId, size)))
-//            );
-//        }
-
-
-
-
-
         List<BussinessDetail> ChildrenList = bussinessInventoryDetailService.list(
                 new LambdaQueryWrapper<BussinessDetail>().eq(BussinessDetail::getInventoryId, req.getOrderId())
         );
@@ -504,8 +479,6 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
                 bussinessInventoryChildrenDetailService.removeBatchByIds(ChildrenDetail);
             }
         }
-
-
         if (ChildrenList.size()>0)
         {
             bussinessInventoryDetailService.removeBatchByIds(ChildrenList);
@@ -537,6 +510,32 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
         this.updateById(BI);
         bussinessInventoryDetailService.saveBatch(Bussinessdetails);
 
+        List<Long> uniqueOrgIDsList = new ArrayList<>();
+        uniqueOrgIDsList.add(BI.getOrgId());
+        //查询组织机构下面的所有仓管员的useId
+        List<InvExpireReq> userIdsList=inventoryMapper.selectUserListByOrgs(uniqueOrgIDsList,"1663372320355389441");
+        //盘点进行中，需要为所有人员推送信息
+        MessageSendReq sendReq = new MessageSendReq();
+
+//        for (InvExpireReq userIds:userIdsList) {
+//            sendReq.setReceiveUserIds(userIds.getUserId());
+//            sendReq.setMsgTitle("盘点提醒");
+//            sendReq.setMsgContent("盘库单:【"+BI.getOrderNum()+"】正在进行盘点，仓库:"+BI.getWarehouseName()+"已锁定");
+//            sendReq.setPriority("0");
+//            sendReq.setSendTime(DateTime.now());
+//            messageApi.sendMessage(sendReq);
+//
+//        }
+//
+//        /*推送发送未读数量*/
+//        for(InvExpireReq userIds:userIdsList){
+//            MessageReq req1 = new MessageReq();
+//            req1.setReadFlag(0);
+//            req1.setReceiveUserId(Long.parseLong(userIds.getUserId()));
+//            Integer count1 = messageApi.queryCount(req1);
+//            messageApi.pushMsgToUser(userIds.getUserId(),count1);
+//        }
+
         return true;
     }
 

jyzb-biz/src/main/java/com/junmp/jyzb/task/InvExpireMsg.java

@@ -102,7 +102,7 @@ public class InvExpireMsg implements JobAction {
         Set<Long> uniqueOrgIDs = new HashSet<>(orgIdsList);
         List<Long> uniqueOrgIDsList = new ArrayList<>(uniqueOrgIDs);
         //查询组织机构下面的所有仓管员的useId
-        List<InvExpireReq> userIdsList=inventoryMapper.selectUserListByOrgs(uniqueOrgIDsList);
+        List<InvExpireReq> userIdsList=inventoryMapper.selectUserListByOrgs(uniqueOrgIDsList,"");
 
         //获取到之后，将该条信息进行消息推送
         for (InvExpireReq invExpireReq:invExpireReqList ) {

jyzb-biz/src/main/resources/mapper/InventoryMapper.xml

@@ -579,9 +579,14 @@
         </foreach>
     </select>
     <select id="selectUserListByOrgs" resultType="com.junmp.jyzb.api.bean.req.InvExpireReq">
-        select suo.user_id,suo.org_id FROM sys_user_org suo
-           JOIN sys_user_role sur ON suo.user_id=sur.user_id
-           JOIN sys_role sr ON sur.role_id=sr.role_id and sr.role_id="1528003832557232130"
+        SELECT DISTINCT su.real_name, suo.user_id, suo.org_id
+        FROM sys_user_org suo
+        JOIN sys_user_role sur ON suo.user_id = sur.user_id
+        JOIN sys_user su ON su.user_id = suo.user_id
+        JOIN sys_role sr ON sur.role_id=sr.role_id and sr.role_id="1528003832557232130"
+        <if test="roleId != ''">
+            or sr.role_id=#{roleId}
+        </if>
         where suo.org_id in
         <foreach collection="list" item="item" open="(" separator="," close=")">
             #{item}