From eeb5c0bdab7e8103fb13e34f2d1ee3bfa1710c7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Sun, 29 Sep 2024 13:44:11 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E8=AF=AD=E9=9F=B3=E6=96=87?=
 =?UTF-8?q?=E5=AD=97=E6=8F=90=E9=86=92=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/jhgk/impl/DmYdjhServiceImpl.java  | 33 ++++++++++++++-----
 .../gj_erp/wsclient/handler/ZxHandler.java    | 17 +++++-----
 2 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java
index a5c86de..d945958 100644
--- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java
+++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java
@@ -3,6 +3,7 @@ package com.dsic.gj_erp.service.jhgk.impl;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -41,6 +42,7 @@ import java.util.stream.Collectors;
  * @author xn
  * @since 2023-11-09
  */
+@SuppressWarnings("ALL")
 @Service
 public class DmYdjhServiceImpl extends ServiceImpl<DmYdjhMapper, DmYdjh> implements DmYdjhService {
 
@@ -246,14 +248,9 @@ public class DmYdjhServiceImpl extends ServiceImpl<DmYdjhMapper, DmYdjh> impleme
         String bzrq= DateUtil.format(DateUtil.date(), "yyyy/MM/dd");
 
         //工单号
-        List<DmYdjh> updateList = ydjhList.stream().filter(item->StrUtil.isNotEmpty(item.getSljhrq())).map(item -> {
-            Long increment = redisTemplate.opsForHash().increment("ZYJH_GDH::", item.getSljhrq(), 1);
-            DmYdjh dmYdjh = new DmYdjh();
-            dmYdjh.setId(item.getId());
-            dmYdjh.setZt("2");
-            dmYdjh.setDjh(StrUtil.format("{}{}",item.getSljhrq().replace("/",""), String.format("%03d",increment)));
-            return dmYdjh;
-        }).collect(Collectors.toList());
+        List<DmYdjh> updateList = ydjhList.stream()
+                .filter(item->StrUtil.isNotEmpty(item.getSljhrq()))
+                .map(this::ofXf).collect(Collectors.toList());
 
         this.updateBatchById(updateList);
 
@@ -309,4 +306,24 @@ public class DmYdjhServiceImpl extends ServiceImpl<DmYdjhMapper, DmYdjh> impleme
         publisher.publishEvent(ydjhList);
     }
 
+    private DmYdjh ofXf(DmYdjh item){
+        Long djh=this.handlerDjh(item);
+        DmYdjh dmYdjh = new DmYdjh();
+        dmYdjh.setId(item.getId());
+        dmYdjh.setZt("2");
+        String perfix=item.getSljhrq().replace("/","");
+        perfix=perfix.substring(2);
+        dmYdjh.setDjh(StrUtil.format("{}{}",perfix, String.format("%03d",djh)));
+        return dmYdjh;
+    }
+
+    private Long handlerDjh(DmYdjh item){
+        String key="ZYJH_GDH::";
+        //从101开始生成工单号,方便工人念出
+        if (ObjUtil.isEmpty(redisTemplate.opsForHash().get(key, item.getSljhrq()))) {
+            redisTemplate.opsForHash().put(key, item.getSljhrq(),100);
+        }
+        return redisTemplate.opsForHash().increment(key, item.getSljhrq(), 1);
+    }
+
 }
diff --git a/src/main/java/com/dsic/gj_erp/wsclient/handler/ZxHandler.java b/src/main/java/com/dsic/gj_erp/wsclient/handler/ZxHandler.java
index f4cd546..925f64f 100644
--- a/src/main/java/com/dsic/gj_erp/wsclient/handler/ZxHandler.java
+++ b/src/main/java/com/dsic/gj_erp/wsclient/handler/ZxHandler.java
@@ -20,14 +20,15 @@ public class ZxHandler implements IHandlerService{
 
     @Override
     public boolean execute(Message message) {
-        String djh=message.getMsg().getOrderNumber();
-        DmYdjh one = ydjhService.getOne(Wrappers.<DmYdjh>lambdaQuery().eq(DmYdjh::getDjh, djh));
-        Optional.ofNullable(one).ifPresent(item->{
-            JSONObject object=new JSONObject();
-            object.put("zyjh",one);
-            object.put("zt",one.getZt());
-            wsHandler.zyjhzx(object);
-        });
+        wsHandler.zyjhzx(message.toJson());
+//        String djh=message.getMsg().getOrderNumber();
+//        DmYdjh one = ydjhService.getOne(Wrappers.<DmYdjh>lambdaQuery().eq(DmYdjh::getDjh, djh));
+//        Optional.ofNullable(one).ifPresent(item->{
+//            JSONObject object=new JSONObject();
+//            object.put("zyjh",one);
+//            object.put("zt",one.getZt());
+//            wsHandler.zyjhzx(object);
+//        });
         return true;
     }
 }