优化图形分析单位、服务器流量业务表逻辑

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/EpsBusinessMapper.java

@@ -19,6 +19,13 @@ public interface EpsBusinessMapper
      * @return 业务信息
      */
     public EpsBusiness selectEpsBusinessById(String id);
+    /**
+     * 查询业务代码
+     *
+     * @param businessName 业务名称
+     * @return 业务信息
+     */
+    public EpsBusiness selectEpsBusinessByName(String businessName);
 
     /**
      * 查询业务信息列表

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsNodeBandwidthServiceImpl.java

@@ -72,6 +72,7 @@ public class EpsNodeBandwidthServiceImpl implements IEpsNodeBandwidthService
     public PageInfo<EpsInitialTrafficData> relatedData(EpsNodeBandwidth epsNodeBandwidth, String dailyStartTime, String dailyEndTime) {
         // 设置查询条件
         EpsInitialTrafficData queryParams = new EpsInitialTrafficData();
+        queryParams.setClientId(epsNodeBandwidth.getClientId());
         queryParams.setServiceSn(epsNodeBandwidth.getHardwareSn());
         queryParams.setBusinessId(epsNodeBandwidth.getBusinessId());
         queryParams.setStartTime(dailyStartTime);

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsServerRevenueConfigServiceImpl.java

@@ -4,13 +4,8 @@ import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.domain.AllInterfaceName;
-import com.ruoyi.system.domain.EpsInitialTrafficData;
-import com.ruoyi.system.domain.EpsMethodChangeRecord;
-import com.ruoyi.system.domain.EpsServerRevenueConfig;
-import com.ruoyi.system.mapper.AllInterfaceNameMapper;
-import com.ruoyi.system.mapper.EpsMethodChangeRecordMapper;
-import com.ruoyi.system.mapper.EpsServerRevenueConfigMapper;
+import com.ruoyi.system.domain.*;
+import com.ruoyi.system.mapper.*;
 import com.ruoyi.system.service.EpsInitialTrafficDataService;
 import com.ruoyi.system.service.IEpsServerRevenueConfigService;
 import lombok.extern.slf4j.Slf4j;
@@ -18,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
 import java.util.*;
 
 /**
@@ -39,6 +33,10 @@ public class EpsServerRevenueConfigServiceImpl implements IEpsServerRevenueConfi
     private EpsMethodChangeRecordMapper epsMethodChangeRecordMapper;
     @Autowired
     private AllInterfaceNameMapper allInterfaceNameMapper;
+    @Autowired
+    private RmResourceRegistrationMapper rmResourceRegistrationMapper;
+    @Autowired
+    private EpsBusinessMapper epsBusinessMapper;
 
     /**
      * 查询服务器收益方式配置
@@ -173,21 +171,20 @@ public class EpsServerRevenueConfigServiceImpl implements IEpsServerRevenueConfi
         List<EpsInitialTrafficData> dataList = epsInitialTrafficDataService.getAllTraficMsg(epsInitialTrafficData);
         List<EpsInitialTrafficData> batchList = new ArrayList<>();
         for (EpsInitialTrafficData initialTrafficData : dataList) {
-            // 根据clientId查询节点名称
-            Map nodeMsg = epsServerRevenueConfigMapper.getNodeMsgBySn(initialTrafficData.getClientId());
-            // 赋值
-            if(nodeMsg != null){
-                initialTrafficData.setServiceSn(getNullableString(nodeMsg, "hardwareSn"));
-                initialTrafficData.setNodeName(getNullableString(nodeMsg, "resourceName"));
-                initialTrafficData.setRevenueMethod(getNullableString(nodeMsg, "revenueMethod"));
-                initialTrafficData.setBusinessId(getNullableString(nodeMsg, "businessCode"));
-                initialTrafficData.setBusinessName(getNullableString(nodeMsg, "businessName"));
-                if("2".equals(nodeMsg.get("revenueMethod") + "")
-                        && nodeMsg.containsKey("packageBandwidth")){
-                    Object bandwidth = nodeMsg.get("packageBandwidth");
-                    if (bandwidth instanceof BigDecimal) {
-                        initialTrafficData.setPackageBandwidth((BigDecimal) bandwidth);
-                    }
+            // 根据clientId查询业务名称
+            RmResourceRegistration rmResourceRegistration = new RmResourceRegistration();
+            rmResourceRegistration.setClientId(initialTrafficData.getClientId());
+            List<RmResourceRegistration> registerLst = rmResourceRegistrationMapper.selectRmResourceRegistrationList(rmResourceRegistration);
+            if(registerLst != null && !registerLst.isEmpty()){
+                RmResourceRegistration registerMsg = registerLst.get(0);
+                // 赋值
+                if(registerMsg != null){
+                    // 根据业务名称查询业务代码
+                    EpsBusiness epsBusiness = epsBusinessMapper.selectEpsBusinessByName(registerMsg.getBusinessName());
+                    initialTrafficData.setServiceSn(registerMsg.getHardwareSn());
+                    initialTrafficData.setRevenueMethod("1");
+                    initialTrafficData.setBusinessId(epsBusiness.getId());
+                    initialTrafficData.setBusinessName(registerMsg.getBusinessName());
                 }
             }
             // id自增

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/EpsBusinessMapper.xml

@@ -31,6 +31,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
+    <select id="selectEpsBusinessByName" parameterType="String" resultMap="EpsBusinessResult">
+        <include refid="selectEpsBusinessVo"/>
+        where business_name = #{businessName}
+        limit 1
+    </select>
+
     <insert id="insertEpsBusiness" parameterType="EpsBusiness">
         insert into eps_business
         <trim prefix="(" suffix=")" suffixOverrides=",">