09-10-netty优化,序号修复,新增移除审核

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/constant.java

@@ -19,6 +19,7 @@ public class constant {
     public static final String PURCHASE_DOC_FILE_URL = "docs/purchase/doc/"; // 采购联系单文件路径
     public static final String PURCHASE_DOC_TEMPLATE_PATH = "template/物资采购联系单模版.docx"; // 采购联系单文件路径
     public static final String SUPPLIER_INPUT = "supplierInput";//供应商入库
+    public static final String BusFormalitiesAreConsolidatedMoveOut = "ConsolidatedMoveOut";
 
     /**
      * 获取物资采购联系单文件名

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/formalities/service/impl/BusFormalitiesAreConsolidatedServiceImpl.java

@@ -5,9 +5,14 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.cailiaoshebei.controller.constant;
+import org.dromara.common.core.domain.event.ProcessEvent;
+import org.dromara.common.core.enums.BusinessStatusEnum;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.log.enums.BusinessStatus;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.formalities.domain.BusFormalitiesAnnex;
@@ -24,6 +29,7 @@ import org.dromara.formalities.service.IBusFormalitiesAnnexService;
 import org.dromara.formalities.service.IBusFormalitiesAreConsolidatedService;
 import org.dromara.formalities.service.IBusListOfFormalitiesService;
 import org.dromara.formalities.utils.TreeUtil;
+import org.dromara.tender.domain.TenderSupplierInput;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -36,6 +42,7 @@ import java.util.*;
  * @author Lion Li
  * @date 2025-08-14
  */
+@Slf4j
 @RequiredArgsConstructor
 @Service
 public class BusFormalitiesAreConsolidatedServiceImpl extends ServiceImpl<BusFormalitiesAreConsolidatedMapper, BusFormalitiesAreConsolidated> implements IBusFormalitiesAreConsolidatedService {
@@ -303,4 +310,28 @@ public class BusFormalitiesAreConsolidatedServiceImpl extends ServiceImpl<BusFor
         Long count = baseMapper.selectCount(new LambdaQueryWrapper<BusFormalitiesAreConsolidated>().eq(BusFormalitiesAreConsolidated::getProjectId, bo.getProjectId()));
         return count > 0;
     }
+
+    /**
+     * 移除审核
+     */
+    /**
+     * 总体流程监听(例如: 草稿，撤销，退回，作废，终止，已完成，单任务完成等)
+     * 正常使用只需#processEvent.flowCode=='leave1'
+     * 示例为了方便则使用startsWith匹配了全部示例key
+     *
+     * @param processEvent 参数
+     */
+    @org.springframework.context.event.EventListener(condition = "#processEvent.flowCode.endsWith('"+ constant.BusFormalitiesAreConsolidatedMoveOut+"')")
+    public void processPlansHandler(ProcessEvent processEvent) {
+        log.info("合规性手续移除审核任务执行了{}", processEvent.toString());
+        BusFormalitiesAreConsolidated byId = getById(processEvent.getBusinessId());
+        if (processEvent.getStatus().equals("finish")){
+            //如果等于 则说明通过 执行移除
+            boolean b = removeById(byId.getId());
+            if (!b){
+                log.error("移除合规性手续数据:{}失败",byId.getId());
+            }
+        }
+    }
+
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/BusBillofquantitiesLimitListServiceImpl.java

@@ -271,6 +271,7 @@ public class BusBillofquantitiesLimitListServiceImpl extends ServiceImpl<BusBill
                 limitList.setType(bo.getType());
                 limitList.setUnitPrice(item.getUnitPrice());
                 limitList.setTaxRate(item.getTaxRate());
+                limitList.setNum(item.getNum());
                 if (LimitListTypeEnum.SPECIAL.getCode().equals(bo.getType())){
                     limitList.setSupplier(item.getSupplier());
                     limitList.setContractNumber(item.getContractNumber());

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/ChatServerHandler.java

@@ -248,8 +248,9 @@ public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocket
 
         if ("0".equals(type)) {
             //来自哪个用户
-            jsonObject.put("from", sysUserVo);
+            jsonObject.put("from", sysUserVo.getUserId().toString());
-//            jsonObject.put("name", sysUserVo.getNickName());
+            jsonObject.put("nickName", sysUserVo.getNickName());
+            jsonObject.put("avatar", sysUserVo.getAvatar());
             log.info("收到客户端消息：{}", jsonObject);
             String RoomId = jsonObject.get("roomId").toString();
             //根据ID拿到房间实例
@@ -318,7 +319,7 @@ public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocket
             chatHistoryService.updateBatchById( list);
 
             //将该房间未读消息 清空
-            userRoomCountMap.put(channelUserMap.get(ctx) + "+" + jsonObject.get("roomId"), 0);
+            userRoomCountMap.put(sysUserVo.getUserId() + "+" + jsonObject.get("roomId"), 0);
             //清空过后返回其余房间未读消息
             HashMap<String,Object> temp = new HashMap<>();
             userRoomCountMap.forEachKey(0,key ->{