feat: voip、云盒业务、工单执行bug修改

src/main/java/com/bellmann/controller/CraftOrderController.java

@@ -5,7 +5,7 @@ import com.bellmann.common.result.Result;
 import com.bellmann.model.form.AddBroadbandForm;
 import com.bellmann.plugin.dupsubmit.annotation.PreventDuplicateSubmit;
 import com.bellmann.security.util.SecurityUtils;
-import com.bellmann.service.BroadbandService;
+import com.bellmann.service.CraftOrderService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
@@ -17,10 +17,10 @@ import java.util.Map;
 @Tag(name = "30.宽带上网业务")
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/api/broadband/v1")
+@RequestMapping("/api/craft-order/v1")
-public class BroadbandController {
+public class CraftOrderController {
 
-    private final BroadbandService broadbandService;
+    private final CraftOrderService broadbandService;
     @GetMapping("/basic-info")
     @Operation(summary = "开通宽带业务-基本数据")
     public Result<Map<String, Object>> basicInfo(){
@@ -34,11 +34,11 @@ public class BroadbandController {
                 .build();
         return Result.success(map);
     }
-    @PostMapping("/add-broadband")
+    @PostMapping("/add")
-    @Operation(summary = "开通宽带业务")
+    @Operation(summary = "新增手工工单")
     @PreventDuplicateSubmit
-    public Result<String> addBroadband(@RequestBody AddBroadbandForm form){
+    public Result<String> addCraftOrder(@RequestBody AddBroadbandForm form){
-        return  broadbandService.addBroadband(form);
+        return  broadbandService.addCraftOrder(form);
     }
     @PostMapping("/update-broadband-mode")
     @Operation(summary = "修改上网模式")

src/main/java/com/bellmann/model/bo/DeviceDetailBO.java

@@ -1,11 +1,13 @@
 package com.bellmann.model.bo;
 
 import lombok.Data;
+import lombok.ToString;
 
 import java.time.LocalDateTime;
 import java.util.Date;
 
 @Data
+@ToString
 public class DeviceDetailBO {
 
     //dynamic

src/main/java/com/bellmann/service/CraftOrderService.java

@@ -3,8 +3,8 @@ package com.bellmann.service;
 import com.bellmann.common.result.Result;
 import com.bellmann.model.form.AddBroadbandForm;
 
-public interface BroadbandService {
+public interface CraftOrderService {
-    Result<String> addBroadband(AddBroadbandForm form);
+    Result<String> addCraftOrder(AddBroadbandForm form);
 
     Result<String> updateBroadbandMode(AddBroadbandForm form);
 

src/main/java/com/bellmann/service/impl/CraftOrderServiceImpl.java

@@ -22,7 +22,7 @@ import com.bellmann.model.entity.OrderMerger;
 import com.bellmann.model.entity.OrderMergerService;
 import com.bellmann.model.form.AddBroadbandForm;
 import com.bellmann.runner.UIService;
-import com.bellmann.service.BroadbandService;
+import com.bellmann.service.CraftOrderService;
 import com.zznode.itms.api.Utils;
 import com.zznode.itms.idl.order.*;
 import lombok.RequiredArgsConstructor;
@@ -33,7 +33,7 @@ import java.util.*;
 
 @Service
 @RequiredArgsConstructor
-public class BroadbandServiceImpl implements BroadbandService {
+public class CraftOrderServiceImpl implements CraftOrderService {
     private final OrderInfoMapper orderInfoMapper;
 
     private final DomainMapper domainMapper;
@@ -43,7 +43,7 @@ public class BroadbandServiceImpl implements BroadbandService {
     private final OrderMergerMapper orderMergerMapper;
 
     @Override
-    public Result<String> addBroadband(AddBroadbandForm form) {
+    public Result<String> addCraftOrder(AddBroadbandForm form) {
         OrderInfoStruct orderInfoStruct = new OrderInfoStruct();
         orderInfoStruct.orderId = System.currentTimeMillis();
         orderInfoStruct.receiveOrderId = form.getReceiveOrderId(); //v
@@ -93,7 +93,7 @@ public class BroadbandServiceImpl implements BroadbandService {
         orderInfoStruct.pppoeAcount = Utils.convertStringNull(form.getPppoeAccount());
         orderInfoStruct.userSnKey = "";
         orderInfoStruct.lifeTime = -999;
-        orderInfoStruct.operRemark = form.getOperateRemark();
+        orderInfoStruct.operRemark = form.getServiceName();
 
         orderInfoStruct.remark1 = "";
         orderInfoStruct.remark2 = "";
@@ -184,7 +184,7 @@ public class BroadbandServiceImpl implements BroadbandService {
                 .contactPersonNew(form.getContactPersonNew())
                 .domainDesc(domain.getDescription())
                 .customerNameNew(form.getCustomerNameNew())
-                .operateRemark(form.getOperateRemark())
+                .operateRemark(form.getServiceName())
                 .orderServiceType(form.getOrderServiceType())
                 .receiveOrderId(form.getReceiveOrderId())
                 .remark3(form.getRemark3())
@@ -242,7 +242,7 @@ public class BroadbandServiceImpl implements BroadbandService {
                 .contactPersonNew(form.getContactPersonNew())
                 .domainDesc(domain.getDescription())
                 .customerNameNew(form.getCustomerNameNew())
-                .operateRemark(form.getOperateRemark())
+                .operateRemark(form.getServiceName())//TODO
                 .orderServiceType(form.getOrderServiceType())
                 .receiveOrderId(form.getReceiveOrderId())
                 .remark3(form.getRemark3())

src/main/java/com/bellmann/service/impl/OrderInfoServiceImpl.java

@@ -34,6 +34,7 @@ import com.zznode.itms.api.NBIManager;
 import com.zznode.itms.api.Utils;
 import com.zznode.itms.idl.resourcedefinition.*;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
@@ -51,6 +52,7 @@ import java.util.Map;
  */
 @Service
 @RequiredArgsConstructor
+@Slf4j
 public class OrderInfoServiceImpl implements OrderInfoService {
 
     private final OrderInfoMapper orderInfoMapper;
@@ -227,18 +229,20 @@ public class OrderInfoServiceImpl implements OrderInfoService {
                         !ouiFlag &&
                         !OrderServiceTypeEnum.EQUIPMENT_REPLACEMENT.getValue().equals(orderInfo.getOrderServiceType())
         ) {
-            bo = deviceStaticMapper.orderByDevSnoOui(null, null, uniqueUserId);
+            DeviceDetailBO deviceDetailBO = deviceStaticMapper.orderByDevSnoOui(null, null, uniqueUserId);
-            if (bo != null) {
+            if (deviceDetailBO != null) {
+                bo = deviceDetailBO;
                 uniqueUserIdFlag = true;
             }
         }
         String pppoeAccount = obj.getPppoeAccount();
         if (pppoeAccount != null && !pppoeAccount.isEmpty() && !ouiFlag && uniqueUserIdFlag) {
-            bo = deviceStaticMapper.orderByPppoeAccount(DevStatusEnum.NORMAL.getValue(), pppoeAccount);
+            DeviceDetailBO deviceDetailBO = deviceStaticMapper.orderByPppoeAccount(DevStatusEnum.NORMAL.getValue(), pppoeAccount);
-            if (bo == null) {
+            if (deviceDetailBO != null) {
-                throw new BusinessException(ResultCode.NOT_GET_DEVICE);
+                bo = deviceDetailBO;
+                pppoeFlag = true;
             }
-            pppoeFlag = true;
+
         }
         if (!pppoeFlag && !ouiFlag && !uniqueUserIdFlag) {
             throw new BusinessException(ResultCode.NOT_GET_DEVICE);
@@ -253,15 +257,14 @@ public class OrderInfoServiceImpl implements OrderInfoService {
 
     private RDeviceDetailStruct conversionStruct(DeviceDetailBO bo) {
         RDeviceDetailStruct struct = new RDeviceDetailStruct();
-        RDeviceDynamicStruct devDynamic = struct.devDynamic;
+        RDeviceDynamicStruct devDynamic = new RDeviceDynamicStruct();
-        RDeviceStaticStruct devStatic = struct.devStatic;
+        RDeviceStaticStruct devStatic = new RDeviceStaticStruct();
-        RDeviceStaticDetailStruct devStaticDetail = struct.devStaticDetail;
+        RDeviceStaticDetailStruct devStaticDetail = new RDeviceStaticDetailStruct();
-
         devStatic.devId = bo.getDevId();
         devStatic.typeAndVerId = bo.getTypeAndVerId();
         devStatic.custId = bo.getCustId();
         devStatic.regionAreaId = bo.getRegionAreaId();
-        devStatic.corpAreaId = bo.getCorpAreaId();
+        devStatic.corpAreaId = bo.getCorpAreaId()==null?0L:bo.getCorpAreaId();
         devStatic.devSNo = bo.getDevSno();
         devStatic.devMac = bo.getDevMac();
         devStatic.devPPPoE = bo.getDevPppoe();
@@ -301,6 +304,10 @@ public class OrderInfoServiceImpl implements OrderInfoService {
         devStaticDetail.userSnNo = bo.getUserSnNo();
         devStaticDetail.iptvAccess = bo.getIptvAccess();
         devStaticDetail.bandAccess = bo.getBandAccess();
+
+        struct.devDynamic = devDynamic;
+        struct.devStatic = devStatic;
+        struct.devStaticDetail = devStaticDetail;
         return struct;
     }
 

src/main/resources/mapper/DeviceStaticMapper.xml

@@ -138,10 +138,10 @@
                 AND ITMS_DEVICE_STATIC.DEV_REMARK3  = #{oui}
             </if>
             <if test="sno!=null and sno!=''">
-                AND ITMS_DEVICE_STATIC.DEV_SNO =  = #{sno}
+                AND ITMS_DEVICE_STATIC.DEV_SNO  = #{sno}
             </if>
             <if test="devRemark4!=null and devRemark4!=''">
-                AND ITMS_DEVICE_STATIC.DEV_REMARK4 =  = #{devRemark4}
+                AND ITMS_DEVICE_STATIC.DEV_REMARK4  = #{devRemark4}
             </if>
         </where>
         limit 1
@@ -190,7 +190,7 @@
                 AND ITMS_DEVICE_STATIC.DEV_STATUS  = #{status}
             </if>
             <if test="pppoeAccount!=null and pppoeAccount!=''">
-                AND ITMS_DEVICE_STATIC.DEV_PPPOE =  = #{pppoeAccount}
+                AND ITMS_DEVICE_STATIC.DEV_PPPOE =  #{pppoeAccount}
             </if>
         </where>
         limit 1

src/main/resources/mapper/OrderInfoMapper.xml

@@ -115,14 +115,14 @@
     <select id="orderSnoOuiPppoeUnique" resultType="com.bellmann.model.entity.OrderInfo">
         SELECT
         aa.order_id,
-        aa.unique_user_id
+        aa.unique_user_id,
         aa.pppoe_account,
-        aa.dev_sno_oui,
+        aa.dev_sno_oui
         FROM
         ITMS_ORDER_INFO AA
         LEFT JOIN ITMS_ORDER_INFO_DETAIL BB ON AA.ORDER_ID = BB.ORDER_ID
         where
-        aa.order_id &gt;= #{orderId}
+        aa.order_id = #{orderId}
 
     </select>