Merge remote-tracking branch 'origin/test' into test

README.md

@@ -1,3 +1,45 @@
+## 基本描述
+* 登录管理员账号：admin
+* 登录管理员密码：whlx#gjf4zbq@
+
+* 其他用户通用密码：Zgkj1001..
+
+### 项目部署
+* JenKins：http://sxzgkj.baoxianzhanggui.com/jenkins/
+* 账号：sxzgkj
+* 密码：2h8RmFUaq9jIqnXJ
+
+#### 测试
+* test模块
+* java项目：insagent - test
+* java-lib包：insagent-lib - test
+* 前端pc：vue-insagent-pc - test
+
+#### 生产
+* prod模块
+* java项目：insagent-prod-all
+* java-lib包：insagent-lib-prod、insagent-lib-prod-2
+* 前端pc：vue-insagent-pc-prod
+
+
+
+
+
+
+### 环境说明
+* 生产环境PC：http://sxzgkj.baoxianzhanggui.com/
+* 生产环境H5：http://sxzgkj.baoxianzhanggui.com/h5/#/
+* 测试环境PC：http://39.98.239.48/
+
+
+### 文档说明
+* 文档路径：http://localhost:8080/doc.html
+* 登录验证码，接口文档为：admin - 登录控制器 - 获取验证码通过用户ID
+* 登录，接口文档为：admin - 登录控制器 - 登录2
+
+
+
+
 ## 更新公告 
 * 版本号：v0.0.1
 * 发布时间：2023-03-30
@@ -7,12 +49,10 @@
 
 ---
 * **《掌柜鼎PC平台》系统维护公告**
-* 
 * 预计更新时间：2023-04-13 9：30 ~ 2023-04-13 10：30
 * 版本号：v0.0.2 
 * 发布时间：2023-04-13
 * 更新内容：
-* 
 * 保险公司增加配置，是否开启报价功能。
 * 系统日志优化
 * 影响上传优化

src/main/java/com/ydtech/modules/admin/controller/SysLoginController.java

@@ -14,9 +14,7 @@ import com.ydtech.modules.admin.model.vo.LoginBean;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.utils.IPUtil;
 import com.ydtech.utils.RedisUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Authorization;
+import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.tomcat.util.http.fileupload.IOUtils;
@@ -90,17 +88,38 @@ public class SysLoginController {
         IOUtils.closeQuietly(out);
     }
 
+//    @GetMapping("captchaById")
+//    @ApiOperation(value = "获取验证码通过用户ID", produces = "application/octet-stream",notes = "字段（验证码ID，前端生成）：captchaId")
+//    public void captchaById(HttpServletResponse response, HttpServletRequest request) throws ServletException, IOException {
+//        response.setHeader("Cache-Control", "no-store, no-cache");
+//        response.setContentType("image/jpeg");
+//        // 生成文字验证码
+//        String text = producer.createText();
+//        // 生成图片验证码
+//        BufferedImage image = producer.createImage(text);
+////        String redisKey = IPUtil.getIpAddr(request);
+//        String codeUuid = request.getParameter("captchaId");
+//        if(StringUtils.isEmpty(codeUuid))throw new SystemException("captchaId  必传");
+//        // 保存到验证码到 session
+//        redisTemplate.opsForValue().set(codeUuid, text, 120, TimeUnit.SECONDS);
+//        ServletOutputStream out = response.getOutputStream();
+//        ImageIO.write(image, "jpg", out);
+//        IOUtils.closeQuietly(out);
+//    }
     @GetMapping("captchaById")
-    @ApiOperation(value = "获取验证码通过用户ID", produces = "application/octet-stream",notes = "字段（验证码ID，前端生成）：captchaId")
-    public void captchaById(HttpServletResponse response, HttpServletRequest request) throws ServletException, IOException {
+    @ApiOperation(value = "获取验证码通过用户ID")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "captchaId", value = "验证码ID，前端生成", required = true, dataType = "String")
+    })
+    public void captchaByIdNew(HttpServletResponse response, String captchaId) throws ServletException, IOException {
         response.setHeader("Cache-Control", "no-store, no-cache");
         response.setContentType("image/jpeg");
         // 生成文字验证码
         String text = producer.createText();
         // 生成图片验证码
         BufferedImage image = producer.createImage(text);
-//        String redisKey = IPUtil.getIpAddr(request);
-        String codeUuid = request.getParameter("captchaId");
+//        String codeUuid = request.getParameter("captchaId");
+        String codeUuid = captchaId;
         if(StringUtils.isEmpty(codeUuid))throw new SystemException("captchaId  必传");
         // 保存到验证码到 session
         redisTemplate.opsForValue().set(codeUuid, text, 120, TimeUnit.SECONDS);

src/main/java/com/ydtech/modules/admin/controller/SysUserController.java

@@ -685,7 +685,7 @@ public class SysUserController extends BaseController {
         SysUser sysUser = sysUserService.getById(getUserId());
         sysUser.setName(dto.getParam1());
         sysUser.setIdentity(dto.getParam2());
-        sysUser.setStatus(1);
+//        sysUser.setStatus(1);
 
         return HttpResult.ok(sysUserService.updateById(sysUser));
     }

src/main/java/com/ydtech/modules/esm/controller/EsmUserController.java

@@ -1,6 +1,7 @@
 package com.ydtech.modules.esm.controller;
 
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.ydtech.core.page.HttpResult;
@@ -57,11 +58,8 @@ public class EsmUserController extends BaseController {
     @ApiOperation(value = "查询团队人数")
     @PostMapping("/queryTeamNum")
     public HttpResult queryTeamNum(@RequestBody SysUserDto dto) {
-
-
         List<TeamUserVO> teamList = new ArrayList<>();
 
-
         LambdaQueryWrapper<SysUserRole> userRoleLqw = new LambdaQueryWrapper<>();
         userRoleLqw.select(SysUserRole::getUserId);
         userRoleLqw.eq(SysUserRole::getRoleId,20);
@@ -78,65 +76,65 @@ public class EsmUserController extends BaseController {
             }
         });
 
-        //获取团队长
-        LambdaQueryWrapper<SysUser> lqwUser = new LambdaQueryWrapper<>();
-        lqwUser.in(SysUser::getId,longs);
-        lqwUser.eq(SysUser::getStatus,1);
-        lqwUser.ne(SysUser::getId,"admin");
-        lqwUser.eq(StringUtils.isNotEmpty(dto.getName()),SysUser::getName,dto.getName());
-        lqwUser.eq(StringUtils.isNotEmpty(dto.getMobile()),SysUser::getMobile,dto.getMobile());
-        List<SysUser> userList= sysUserService.list(lqwUser);
+        if(CollUtil.isNotEmpty(longs)){
+            //获取团队长
+            LambdaQueryWrapper<SysUser> lqwUser = new LambdaQueryWrapper<>();
+            lqwUser.in(SysUser::getId,longs);
+            lqwUser.eq(SysUser::getStatus,1);
+            lqwUser.ne(SysUser::getId,"admin");
+            lqwUser.eq(StringUtils.isNotEmpty(dto.getName()),SysUser::getName,dto.getName());
+            lqwUser.eq(StringUtils.isNotEmpty(dto.getMobile()),SysUser::getMobile,dto.getMobile());
+            List<SysUser> userList= sysUserService.list(lqwUser);
 
 
+            userList.stream().forEach(a ->{
 
+                TeamUserVO vo = new TeamUserVO();
+                List<SysUser> oneList = new ArrayList<>();
+                List<SysUser> oneTempList = new ArrayList<>();
 
-        userList.stream().forEach(a ->{
+                List<SysUser> twoList = new ArrayList<>();
+                List<SysUser> twoTempList = new ArrayList<>();
 
-            TeamUserVO vo = new TeamUserVO();
-            List<SysUser> oneList = new ArrayList<>();
-            List<SysUser> oneTempList = new ArrayList<>();
+                List<SysUser> threeList = new ArrayList<>();
+                List<SysUser> threeTempList = new ArrayList<>();
 
-            List<SysUser> twoList = new ArrayList<>();
-            List<SysUser> twoTempList = new ArrayList<>();
+                //一级
+                esmUserReferrerService.buildLevelList(a,oneList,oneTempList);
 
-            List<SysUser> threeList = new ArrayList<>();
-            List<SysUser> threeTempList = new ArrayList<>();
+                oneList.stream().forEach(b ->{
+                    //二级
+                    esmUserReferrerService.buildLevelList(b,twoList,twoTempList);
+                    twoList.stream().forEach(c ->{
+                        //三级
+                        esmUserReferrerService.buildLevelList(c,threeList,threeTempList);
+                    });
 
-            //一级
-            esmUserReferrerService.buildLevelList(a,oneList,oneTempList);
-
-            oneList.stream().forEach(b ->{
-                //二级
-                esmUserReferrerService.buildLevelList(b,twoList,twoTempList);
-                twoList.stream().forEach(c ->{
-                    //三级
-                    esmUserReferrerService.buildLevelList(c,threeList,threeTempList);
                 });
 
-            });
-
-            vo.setLevel1num(oneList.size());
-            vo.setLevel2num(twoList.size());
-            vo.setLevel3num(threeList.size());
-
-            //临时人数
-            vo.setTempnum(oneTempList.size() + twoTempList.size() + threeTempList.size());
-            //我的团队数
-            vo.setTeamnum(vo.getTempnum() + oneList.size() + twoList.size() + threeList.size());
-            vo.setId(a.getId());
-            vo.setName(a.getName());
-            vo.setMobile(a.getMobile());
+                vo.setLevel1num(oneList.size());
+                vo.setLevel2num(twoList.size());
+                vo.setLevel3num(threeList.size());
+
+                //临时人数
+                vo.setTempnum(oneTempList.size() + twoTempList.size() + threeTempList.size());
+                //我的团队数
+                vo.setTeamnum(vo.getTempnum() + oneList.size() + twoList.size() + threeList.size());
+                vo.setId(a.getId());
+                vo.setName(a.getName());
+                vo.setMobile(a.getMobile());
 //            vo.setSex(a.getSex());
 
-            SysDept sysDept = sysDeptService.getById(a.getDeptId());
-            if(null != sysDept){
-                vo.setDeptId(sysDept.getId());
-                vo.setDeptName(sysDept.getName());
-            }
-            teamList.add(vo);
+                SysDept sysDept = sysDeptService.getById(a.getDeptId());
+                if(null != sysDept){
+                    vo.setDeptId(sysDept.getId());
+                    vo.setDeptName(sysDept.getName());
+                }
+                teamList.add(vo);
 
 
-        });
+            });
+        }
 
         return HttpResult.ok(teamList);
 

src/main/java/com/ydtech/modules/esm/service/impl/EsmUserReferrerServiceImpl.java

@@ -17,10 +17,7 @@ import com.ydtech.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 
 @Service

src/main/java/com/ydtech/modules/fee/service/impl/FeeRuleSchemeServiceImpl.java

@@ -860,6 +860,13 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
         }
         return premium;
     }
+    private BigDecimal getPremiumForSubtract(BigDecimal former,BigDecimal latter){
+        BigDecimal premium = new BigDecimal(0);
+        if(former!=null && latter!=null){
+            former.subtract(latter);
+        }
+        return premium;
+    }
 
     public List<QueryOrderFeeResultVo> queryFeeOrderInfo(String companyId){
         QueryOrderFeeVo queryOrderFeeVo = new QueryOrderFeeVo();
@@ -1028,14 +1035,14 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
 
         //再利用总费-交强费，得出商业费
         InsFeeOrder syInsFeeOrderTemp = new InsFeeOrder();
-        syInsFeeOrderTemp.setFirstDeptPremiums(insFeeOrder.getFirstDeptPremiums().subtract(jqInsFeeOrderTemp.getFirstDeptPremiums()));
-        syInsFeeOrderTemp.setSecondDeptPremiums(insFeeOrder.getSecondDeptPremiums().subtract(jqInsFeeOrderTemp.getSecondDeptPremiums()));
-        syInsFeeOrderTemp.setThirdDeptPremiums(insFeeOrder.getThirdDeptPremiums().subtract(jqInsFeeOrderTemp.getThirdDeptPremiums()));
-        syInsFeeOrderTemp.setForthDeptPremiums(insFeeOrder.getForthDeptPremiums().subtract(jqInsFeeOrderTemp.getForthDeptPremiums()));
-        syInsFeeOrderTemp.setFifthDeptPremiums(insFeeOrder.getFifthDeptPremiums().subtract(jqInsFeeOrderTemp.getFifthDeptPremiums()));
-        syInsFeeOrderTemp.setFirstRetailPremiums(insFeeOrder.getFirstRetailPremiums().subtract(jqInsFeeOrderTemp.getFirstRetailPremiums()));
-        syInsFeeOrderTemp.setSecondRetailPremiums(insFeeOrder.getSecondRetailPremiums().subtract(jqInsFeeOrderTemp.getSecondRetailPremiums()));
-        syInsFeeOrderTemp.setThirdRetailPremiums(insFeeOrder.getThirdRetailPremiums().subtract(jqInsFeeOrderTemp.getThirdRetailPremiums()));
+        syInsFeeOrderTemp.setFirstDeptPremiums(getPremiumForSubtract(insFeeOrder.getFirstDeptPremiums(),jqInsFeeOrderTemp.getFirstDeptPremiums()));
+        syInsFeeOrderTemp.setSecondDeptPremiums(getPremiumForSubtract(insFeeOrder.getSecondDeptPremiums(),jqInsFeeOrderTemp.getSecondDeptPremiums()));
+        syInsFeeOrderTemp.setThirdDeptPremiums(getPremiumForSubtract(insFeeOrder.getThirdDeptPremiums(),jqInsFeeOrderTemp.getThirdDeptPremiums()));
+        syInsFeeOrderTemp.setForthDeptPremiums(getPremiumForSubtract(insFeeOrder.getForthDeptPremiums(),jqInsFeeOrderTemp.getForthDeptPremiums()));
+        syInsFeeOrderTemp.setFifthDeptPremiums(getPremiumForSubtract(insFeeOrder.getFifthDeptPremiums(),jqInsFeeOrderTemp.getFifthDeptPremiums()));
+        syInsFeeOrderTemp.setFirstRetailPremiums(getPremiumForSubtract(insFeeOrder.getFirstRetailPremiums(),jqInsFeeOrderTemp.getFirstRetailPremiums()));
+        syInsFeeOrderTemp.setSecondRetailPremiums(getPremiumForSubtract(insFeeOrder.getSecondRetailPremiums(),jqInsFeeOrderTemp.getSecondRetailPremiums()));
+        syInsFeeOrderTemp.setThirdRetailPremiums(getPremiumForSubtract(insFeeOrder.getThirdRetailPremiums(),jqInsFeeOrderTemp.getThirdRetailPremiums()));
 
         //交强费转换赋值
         OrderFeeVo jqOrderFeeVo = packageOrderFeeInfoOne(insFeeOrder);

src/main/java/com/ydtech/modules/ins/controller/InsAlltrustApiController.java

@@ -2,7 +2,6 @@ package com.ydtech.modules.ins.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-//import com.ydtech.aop.request.MethodLogAnnotation;
 import com.ydtech.aop.request.RequestSingleParam;
 import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
 import com.ydtech.core.page.HttpResult;
@@ -12,26 +11,24 @@ import com.ydtech.modules.esm.dao.EsmInsAttachInsureMapper;
 import com.ydtech.modules.esm.model.EsmInsAttachInsure;
 import com.ydtech.modules.esm.model.EsmInsAttachInsureDetails;
 import com.ydtech.modules.esm.service.InsTaskImageService;
-import com.ydtech.modules.ins.model.ya.CarModel_Req;
-import com.ydtech.modules.ins.model.yc.CallBackRequest;
 import com.ydtech.modules.ins.service.InsAlltrustApiService;
 import com.ydtech.modules.order.components.InsOrdersComponents;
 import com.ydtech.modules.order.entity.InsAreaCompany;
-import com.ydtech.modules.order.entity.vo.*;
+import com.ydtech.modules.order.entity.vo.AccidentalDrivingQueryVo;
+import com.ydtech.modules.order.entity.vo.AccidentalDrivingVo;
+import com.ydtech.modules.order.entity.vo.BaseQuoteVo;
+import com.ydtech.modules.order.entity.vo.PolicyPrintVo;
 import com.ydtech.modules.order.service.InsAreaCompanyService;
-import com.ydtech.utils.Base64Utils;
-import com.ydtech.utils.StringUtils;
 import io.swagger.annotations.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.time.LocalDate;
-import java.util.*;
-
-import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @description: 永诚API方式对接 控制类
@@ -83,10 +80,10 @@ public class InsAlltrustApiController {
     }
 
     @ApiOperation(value = "永诚API方式 - 影像上传")
-    @PostMapping(value = "/UploadImage")
-    public HttpResult UploadImageApi(@RequestSingleParam(value = "companyId") String companyId) {
+    @PostMapping(value = "/uploadImage")
+    public HttpResult uploadImageApi(@RequestSingleParam(value = "companyId") String companyId) {
 
-        return insYongchengApiService.UploadImageApi(companyId);
+        return insYongchengApiService.uploadImageApi(companyId);
     }
 
 

src/main/java/com/ydtech/modules/ins/model/yc/YcBuildData.java

@@ -40,7 +40,7 @@ public class YcBuildData {
     public static String API_QUOTE = "NewPremiumXnyCalculationService";
     //接口 核保
     public static String API_AUDIT = "NewXnyUnderwritingService";
-    //接口 影响上传
+    //接口 影像上传
     public static String API_UPLOAD = "newImageUpService";
     //接口 支付
     public static String API_PAY = "newGetPayNoService";

src/main/java/com/ydtech/modules/ins/service/InsAlltrustApiService.java

@@ -35,7 +35,7 @@ public interface InsAlltrustApiService {
      * @param
      * @return
      */
-    HttpResult UploadImageApi(String quoteOrderNo);
+    HttpResult uploadImageApi(String quoteOrderNo);
 //    /**
 //     * 影像上传
 //     *

src/main/java/com/ydtech/modules/ins/service/impl/InsAlltrustApiServiceImpl.java

@@ -614,12 +614,14 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
 //            findRegion()
 
             //接口请求
-            String responseData = httpPostResultLog(m, YcBuildData.API_AUDIT, "永诚API方式 - 核保（车牌号：" + order.getLicenseno() + "） - ");
+            String responseData = httpPostResultLog(m, YcBuildData.API_AUDIT, "永诚API方式 - 核保（订单号："+iac.getId()+"）（车牌号：" + order.getLicenseno() + "） - ");
             AssertionUtils.isEmpty(responseData, logNo + "核保请求超时请重试。");
 
             String cleanStr = YcBuildData.cleanResponseStr(responseData);
             AuditResponse rd = gainXmlMapper().readValue(cleanStr, AuditResponse.class);
 
+            if(rd.getResponseHead().getReturnCode().equals("E0001") && rd.getResponseHead().getReturnMessage().contains("核保时间需要小于起保日期"))return HttpResult.error("核保请求异常，请重试核保。");
+
             if (rd.getResponseHead().getReturnCode().equals("0000")) {
                 String statusJq = StringUtils.toString(rd.getStatusJq(), "");
                 String statusSy = StringUtils.toString(rd.getStatusSY(), "");
@@ -683,7 +685,7 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
      * 4 影像上传
      */
     @Override
-    public HttpResult UploadImageApi(String quoteOrderNo) {
+    public HttpResult uploadImageApi(String quoteOrderNo) {
 
         String logNo = String.format("（日志号：%s)", IPUtil.gainServerNo());
         InsAreaCompany iac = insAreaCompanyService.getByIdIsExist(quoteOrderNo);
@@ -878,7 +880,7 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
             AssertionUtils.isEmpty(iac, "报价订单不存在");
             InsOrders order = insOrdersService.getById(iac.getOrderno());
 
-            String ip = IPUtil.gainServerNo();
+            String ip = IPUtil.gainServerNetIp("eth0");
             log.debug("------------------------------");
             log.debug("----测试服务器IP----" + ip);
             log.debug("------------------------------");
@@ -2267,31 +2269,20 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
 
     private void buildOrderStatus(InsOrders order, InsAreaCompany iac) {
 
-
-        //订单状态不为已承包的处理
-        if (!order.getOrderstatus().equals(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode())) {
-
-            //订单状态 报价中，状态覆盖
-            if (order.getOrderstatus().equals(InsOrderStatusEnum.QUOTE_ING.getCode())) {
-                order.setOrderstatus(iac.getOrderstatus());
-            }
-            //订单状态 待核保
-            if (order.getOrderstatus().equals(InsOrderStatusEnum.WAIT_AUDIT.getCode())) {
-                if (StringUtils.toInt(iac.getOrderstatus()) > StringUtils.toInt(order.getOrderstatus())) {
-                    order.setOrderstatus(iac.getOrderstatus());
-                }
-            }
-            //订单状态 已核保待缴费  不处理
-            //        if (order.getOrderstatus().equals(InsOrderStatusEnum.WAIT_PAY.getCode())) {
-            //                order.setOrderstatus(iac.getOrderstatus());
-            //        }
-
-            //订单状态 核保退回  不处理
-            if (order.getOrderstatus().equals(InsOrderStatusEnum.TO_BACK.getCode())) {
-                if (!iac.getOrderstatus().equals(InsOrderStatusEnum.WAIT_PAY.getCode())) {
-                    order.setOrderstatus(iac.getOrderstatus());
-                }
-            }
+        String iacStatus = iac.getOrderstatus();
+        String orderStatus = order.getOrderstatus();
+        if(orderStatus.equals(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode())) return;
+
+        if(iacStatus.equals(InsOrderStatusEnum.WAIT_PAY.getCode()) && orderStatus.equals(InsOrderStatusEnum.WAIT_AUDIT.getCode())){
+            order.setOrderstatus(iac.getOrderstatus());
+        } else if (iacStatus.equals(InsOrderStatusEnum.WAIT_AUDIT.getCode()) && orderStatus.equals(InsOrderStatusEnum.QUOTE_ING.getCode())) {
+            order.setOrderstatus(iac.getOrderstatus());
+        } else if (iacStatus.equals(InsOrderStatusEnum.WAIT_PAY.getCode()) && !orderStatus.equals(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode())) {
+            order.setOrderstatus(iac.getOrderstatus());
+        } else if (iacStatus.equals(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode()) ) {
+            order.setOrderstatus(iac.getOrderstatus());
+        } else if (iacStatus.equals(InsOrderStatusEnum.TO_BACK.getCode()) && orderStatus.equals(InsOrderStatusEnum.WAIT_AUDIT.getCode()) ) {
+            order.setOrderstatus(iac.getOrderstatus());
         }
 
     }

src/main/java/com/ydtech/utils/IPUtil.java

@@ -55,33 +55,77 @@ public class IPUtil {
 
 
     /**
-     *  获取服务器号
+     * 获取服务器号
      *
      * @author: lig
      * @date: 2023年10月09日 0009
      */
     public static String gainServerNo() {
         String serverNo = "0";
+        String ip = gainServerNetIp("eth0");
+        if (StringUtils.isNotEmpty(ip)) {
+            if (ip.contains("172.24.144.220")) serverNo = "1";
+            if (ip.contains("172.24.144.219")) serverNo = "2";
+        }
+
+        return serverNo;
+
+    }
+
+    /**
+     * 获取服务器 网卡 ip
+     *
+     * @param netName 网卡名称
+     */
+    public static String gainServerNetIp(String netName) {
+        StringBuffer sb = new StringBuffer();
         try {
             Enumeration<NetworkInterface> networkInterfaces = NetworkInterface.getNetworkInterfaces();
             while (networkInterfaces.hasMoreElements()) {
                 NetworkInterface networkInterface = networkInterfaces.nextElement();
-                if (networkInterface.getName().equals("eth0")) {
-                    Enumeration<InetAddress> inetAddresses = networkInterface.getInetAddresses();
-                    while (inetAddresses.hasMoreElements()) {
-                        InetAddress inetAddress = inetAddresses.nextElement();
-                        if (inetAddress instanceof Inet4Address) {
-                            String ip = inetAddress.getHostAddress();
-                            if(ip.equals("172.24.144.220"))serverNo = "1";
-                            if(ip.equals("172.24.144.219"))serverNo = "2";
-                            System.out.println("eth0的IP地址是：" + ip);
-                        }
+                System.out.print("网络接口名：" + networkInterface.getDisplayName() + "，地址：");
+                sb.append("网络接口名：");
+                sb.append(networkInterface.getDisplayName());
+                Enumeration<InetAddress> inetAddresses = networkInterface.getInetAddresses();
+                while (inetAddresses.hasMoreElements()) {
+                    InetAddress inetAddress = inetAddresses.nextElement();
+//                    if (inetAddress instanceof Inet4Address) {
+//                        String ip = inetAddress.getHostAddress();
+//                        System.out.println("eth0的IP地址是：" + ip);
+//                        sb.append(networkInterface.getName() );
+//                        sb.append("|" );
+//                        sb.append(ip );
+//
+//                        sb.append(" %%% ");
+//                    }
+
+                    if (!inetAddress.isLoopbackAddress() && inetAddress.isSiteLocalAddress() && !inetAddress.isAnyLocalAddress()) {
+                        System.out.print(inetAddress.getHostAddress() + " ");
+                        sb.append("，地址：");
+                        sb.append(inetAddress.getHostAddress());
                     }
                 }
+//                if (networkInterface.getName().equals(netName)) {
+//                    Enumeration<InetAddress> inetAddresses = networkInterface.getInetAddresses();
+//                    while (inetAddresses.hasMoreElements()) {
+//                        InetAddress inetAddress = inetAddresses.nextElement();
+//                        if (inetAddress instanceof Inet4Address) {
+//                            String ip = inetAddress.getHostAddress();
+//                            System.out.println("eth0的IP地址是：" + ip);
+//                            return ip;
+//                        }
+//                    }
+//                }
             }
+
+            return sb.toString();
         } catch (SocketException e) {
             e.printStackTrace();
         }
-        return serverNo;
+        return null;
+    }
+
+    public static void main(String[] args) {
+        System.err.println(gainServerNetIp("dd"));
     }
 }