Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-lxh

jyzb-api/src/main/java/com/junmp/jyzb/api/constant/JYZBConstant.java

@@ -28,7 +28,7 @@ public interface JYZBConstant {
     /**
      * 缓存前缀
      */
-    String JYZB_CACHE_PREFIX = "gold:";
+    String JYZB_CACHE_PREFIX = "jyzb:";
 
     String JYZB_JWT_KEY = "JWT";
 }

jyzb-biz/src/main/java/com/junmp/jyzb/cache/GoldRedisCache.java → jyzb-biz/src/main/java/com/junmp/jyzb/cache/JYZBRedisCache.java

@@ -18,9 +18,9 @@ import org.springframework.stereotype.Component;
  * </pre>
  */
 @Component
-public class GoldRedisCache extends AbstractRedisCache<String> {
+public class JYZBRedisCache extends AbstractRedisCache<String> {
 
-    public GoldRedisCache(RedisTemplate<String, String> redisTemplate) {
+    public JYZBRedisCache(RedisTemplate<String, String> redisTemplate) {
         super(redisTemplate);
     }
 
@@ -28,4 +28,7 @@ public class GoldRedisCache extends AbstractRedisCache<String> {
     public String getCommonKeyPrefix() {
         return JYZBConstant.JYZB_CACHE_PREFIX;
     }
+
+
+
 }

jyzb-biz/src/main/java/com/junmp/jyzb/controller/LoginController.java

@@ -3,7 +3,7 @@ package com.junmp.jyzb.controller;
 
 import cn.hutool.core.util.StrUtil;
 import com.junmp.jyzb.api.constant.JYZBConstant;
-import com.junmp.jyzb.cache.GoldRedisCache;
+import com.junmp.jyzb.cache.JYZBRedisCache;
 import com.junmp.jyzb.doc.LoginDoc;
 import com.junmp.v2.auth.api.bean.auth.LoginReq;
 import com.junmp.v2.auth.api.bean.auth.LoginRes;
@@ -39,7 +39,7 @@ public class LoginController implements LoginDoc {
 
 
     @Resource
-    private GoldRedisCache goldRedisCache ;
+    private JYZBRedisCache goldRedisCache ;
 
 
     @PostMapping(name = "用户登录", path = "/auth/login")

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

@@ -13,6 +13,7 @@ import com.junmp.junmpProcess.exception.WorkFlowException;
 import com.junmp.junmpProcess.mapper.OrgUserMapper;
 import com.junmp.junmpProcess.service.Repository.ProcessTemplateService;
 import com.junmp.jyzb.api.exception.enums.OrderExceptionEnum;
+import com.junmp.jyzb.cache.JYZBRedisCache;
 import com.junmp.jyzb.entity.*;
 import com.junmp.jyzb.service.BusFormService;
 import com.junmp.jyzb.service.OrderMainService;
@@ -78,7 +79,8 @@ public class CounterSignListener implements ExecutionListener {
     private SysUserOrgService sysUserOrgService;
 
     @Resource
-    private TaskService taskService;
+    private JYZBRedisCache redisCache;
+
 
     @Resource
     private RuntimeService runtimeService;
@@ -311,6 +313,8 @@ public class CounterSignListener implements ExecutionListener {
                 }
                  Object skip=execution.getVariable("skip");
                 if (ObjectUtil.isNull(skip)){
+
+                    List<MessageSendReq> msgList=new ArrayList<>();
                     assigneeList.forEach(userId->//为相应的用户推送消息
                     {
                         if (userId!=LoginContext.getContext().getLoginUser().getUserId().toString())//非本人审核单据
@@ -325,17 +329,14 @@ public class CounterSignListener implements ExecutionListener {
                             sendReq.setMsgContent(user.getRealName()+" 提交的【"+mainProcess.getName()+"】需要您审批，请及时处理");
                             sendReq.setPriority("0");
                             sendReq.setSendTime(DateTime.now());
-                            messageApi.sendMessage(sendReq);
-                            messageApi.queryCount(new MessageReq());
-                            /*推送发送未读数量*/
-//                            MessageReq req1 = new MessageReq();
-//                            req1.setReadFlag(0);
-//                            req1.setReceiveUserId(Long.valueOf(userId));
-//                            Integer count1 = messageApi.queryCount(req1);
-//                            messageApi.pushMsgToUser(userId,count1);
+                            msgList.add(sendReq);
+//                            messageApi.sendMessage(sendReq);
+//                            messageApi.queryCount(new MessageReq());
                         }
 
                     });
+
+                    redisCache.put(execution.getProcessInstanceId(),JSONObject.toJSONString(msgList));
                 } else {//跳过
 
                 }

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

@@ -20,6 +20,7 @@ import com.junmp.jyzb.api.exception.JYZBAppException;
 import com.junmp.jyzb.api.exception.enums.InventoryExceptionEnum;
 import com.junmp.jyzb.api.exception.enums.OrderExceptionEnum;
 import com.junmp.jyzb.api.exception.enums.OrgExceptionEnum;
+import com.junmp.jyzb.cache.JYZBRedisCache;
 import com.junmp.jyzb.entity.*;
 import com.junmp.jyzb.mapper.InventorySummaryMapper;
 import com.junmp.jyzb.service.*;
@@ -33,6 +34,8 @@ import com.junmp.v2.common.util.BeanPlusUtil;
 import com.junmp.v2.db.api.factory.PageFactory;
 import com.junmp.v2.db.api.factory.PageResultFactory;
 import com.junmp.v2.db.api.page.PageResult;
+import com.junmp.v2.message.api.MessageApi;
+import com.junmp.v2.message.api.bean.req.MessageSendReq;
 import com.junmp.v2.sys.user.service.SysUserOrgService;
 import org.flowable.engine.TaskService;
 import org.flowable.task.api.Task;
@@ -53,10 +56,12 @@ import java.util.stream.Collectors;
 public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> implements BusFormService{
     @Resource
     public StocktakeService stocktakeService;
-
+    @Resource
+    private JYZBRedisCache redisCache;
     @Resource
     private IFlowInstanceService FlowInstanceService;
-
+    @Resource
+    private MessageApi messageApi;
     @Resource
     private SysUserOrgService sysUserOrgService;
 
@@ -223,6 +228,15 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
             }
         }
         busFormRepository.save(busForm);
+        String objJson= redisCache.get(busForm.getProcessId());
+        redisCache.remove(busForm.getProcessId());
+        List<MessageSendReq> msgs= JSONObject.parseArray(objJson,MessageSendReq.class);
+        msgs.forEach(msg->
+                {
+                    messageApi.sendMessage(msg);
+                }
+
+        );
         return busForm.getId();
     }
 

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

@@ -17,6 +17,7 @@ import com.junmp.jyzb.api.bean.req.UpdateOrderReq;
 import com.junmp.jyzb.api.bean.vo.InOrderInfo;
 import com.junmp.jyzb.api.exception.enums.CabinetExceptionEnum;
 import com.junmp.jyzb.api.exception.enums.OrderExceptionEnum;
+import com.junmp.jyzb.cache.JYZBRedisCache;
 import com.junmp.jyzb.entity.*;
 import com.junmp.jyzb.mapper.InventorySummaryMapper;
 import com.junmp.jyzb.mapper.OrderMainMapper;
@@ -41,6 +42,7 @@ 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 com.junmp.v2.message.api.bean.res.MessageRes;
 import com.junmp.v2.message.api.enums.MsgReadStateEnum;
 import com.junmp.v2.office.api.OfficeExcelApi;
@@ -82,8 +84,10 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
     @Resource
     private OrderNumService orderNumService;
 
-
-
+    @Resource
+    private MessageApi messageApi;
+    @Resource
+    private JYZBRedisCache redisCache;
     @Resource
     private OrderMainMapper orderMainMapper;
 
@@ -103,8 +107,6 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
     @Resource
     private InventoryService inventoryService;
     @Resource
-    private MessageApi messageApi;
-    @Resource
     private WarehouseService warehouseService;
     @Resource
     private BusFormService busFormService;
@@ -302,6 +304,15 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         if (order.getProcessId()!=null){
             boolean b = addOrderLog(req,order.getId(),order.getOrderCode(),s);
         }
+        String objJson= redisCache.get(order.getProcessId());
+        redisCache.remove(order.getProcessId());
+        List<MessageSendReq> msgs= JSONObject.parseArray(objJson,MessageSendReq.class);
+        msgs.forEach(msg->
+                {
+                    messageApi.sendMessage(msg);
+                }
+
+        );
         return list;
     }
 

jyzb-process/src/main/java/com/junmp/junmpProcess/redis/FlowRedisCache.java

+package com.junmp.junmpProcess.redis;
+
+import com.junmp.jyzb.api.constant.JYZBConstant;
+import com.junmp.v2.cache.AbstractRedisCache;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;
+
+
+@Component
+public class FlowRedisCache extends AbstractRedisCache<String> {
+
+    public FlowRedisCache(RedisTemplate<String, String> redisTemplate) {
+        super(redisTemplate);
+    }
+
+    @Override
+    public String getCommonKeyPrefix() {
+        return JYZBConstant.JYZB_CACHE_PREFIX;
+    }
+
+
+
+}

jyzb-process/src/main/java/com/junmp/junmpProcess/service/impl/FlowTaskServiceImpl.java

@@ -24,6 +24,7 @@ import com.junmp.junmpProcess.entity.ProcessTemplates;
 import com.junmp.junmpProcess.factory.FlowServiceFactory;
 import com.junmp.junmpProcess.mapper.OrgUserMapper;
 import com.junmp.junmpProcess.mapper.QuickSuggestionsMapper;
+import com.junmp.junmpProcess.redis.FlowRedisCache;
 import com.junmp.junmpProcess.service.IFlowInstanceService;
 import com.junmp.junmpProcess.service.IFlowTaskService;
 import com.junmp.junmpProcess.service.Repository.ProcessTemplateService;
@@ -95,7 +96,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
     @Resource
     private SysUserService sysUserService;
     @Resource
-    private OrgUserMapper orgUserMapper;
+    private FlowRedisCache redisCache;
     @Resource
     private MessageApi messageApi;
     @Autowired
@@ -198,6 +199,15 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                     .collect(Collectors.joining(","));
             messageApi.batchReadFlagByMessageIds(ids, MsgReadStateEnum.READ);
         }
+            String objJson= redisCache.get(processInstanceId);
+            redisCache.remove(processInstanceId);
+            List<MessageSendReq> msgs= JSONObject.parseArray(objJson,MessageSendReq.class);
+            msgs.forEach(msg->
+                    {
+                        messageApi.sendMessage(msg);
+                    }
+
+            );
             return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS,ReturnMsg.PASS);
 
         }