diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 10068fa3..874761c2 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -9,7 +9,7 @@
4.0.0
jar
- ruoyi-admin
+ oms-admin
web服务入口
@@ -134,6 +134,22 @@
-->
+
+
+ src/main/resources
+ false
+
+ **/*.yml
+
+
+
+ src/main/resources
+ true
+
+ **/*.yml
+
+
+
${project.artifactId}
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index d315f3f4..068b98ba 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -16,7 +16,7 @@ ruoyi:
# 开发环境配置
server:
# 服务器的HTTP端口,默认为80
- port: 8080
+ port: 28080
servlet:
# 应用的访问路径
context-path: /
diff --git a/ruoyi-sip/pom.xml b/ruoyi-sip/pom.xml
index 1864f890..2dc8ebb6 100644
--- a/ruoyi-sip/pom.xml
+++ b/ruoyi-sip/pom.xml
@@ -10,7 +10,7 @@
4.0.0
ruoyi-sip
- war
+ jar
ruoyi-sip Maven Webapp
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ExternalController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ExternalController.java
index 335a3216..ed9cabf4 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ExternalController.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ExternalController.java
@@ -37,6 +37,7 @@ public class ExternalController {
private IDeliveryListService deliveryListService;
@Autowired
private IOrderInfoService orderInfoService;
+ private final static String API_KEY = "c7f858d0-30b8-4b7f-9ea1-0ccf5ceb1c54";
@@ -46,7 +47,8 @@ public class ExternalController {
if (StringUtils.isEmpty(apiKey)) {
return AjaxResult.error("apiKey不能为空");
}
- if (!"12345".equals(apiKey)){
+
+ if (!API_KEY.equals(apiKey)) {
return AjaxResult.error("鉴权失败");
}
return AjaxResult.success(orderInfoService.getOrderInfo(dto));
@@ -58,7 +60,7 @@ public class ExternalController {
if (StringUtils.isEmpty(apiKey)) {
return AjaxResult.error("apiKey不能为空");
}
- if (!"12345".equals(apiKey)){
+ if (!API_KEY.equals(apiKey)){
return AjaxResult.error("鉴权失败");
}
return AjaxResult.success(deliveryListService.getNumberInfo(dto));
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderInfo.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderInfo.java
index d924fcfa..0e95cf9d 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderInfo.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderInfo.java
@@ -46,6 +46,7 @@ public class OrderInfo extends BaseEntity
private String customerName;
//客户编码
private String customerCode;
+ private String bgType;
/**
* 客户邮编
*/
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java
index 0e306528..13c1262d 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java
@@ -4,6 +4,8 @@ import java.util.Collections;
import java.util.List;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.Dict;
+import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.sip.domain.*;
import com.ruoyi.sip.dto.ApiDataQueryDto;
import com.ruoyi.sip.service.IAgentInfoService;
@@ -173,8 +175,8 @@ public class OrderInfoServiceImpl implements IOrderInfoService
orderInfoVo.setOrderName(orderInfo.getOrderName());
orderInfoVo.setVersionCode(orderInfo.getVersionCode());
// 固定值待确认
- orderInfoVo.setBgType("1");
-
+ orderInfoVo.setBgType(DictUtils.getDictLabel("bg_type", orderInfo.getBgType()));
+ orderInfoVo.setLastUpdateTime(orderInfo.getUpdatedAt());
// 设置代表处信息
setAgentInfo(orderInfoVo, agentInfoMap.get(orderInfo.getOrderAgentCode()));
// 设置客户信息
@@ -235,7 +237,7 @@ public class OrderInfoServiceImpl implements IOrderInfoService
orderInfoVo.setCustomerCode(dto.getCustomerCode());
orderInfoVo.setCustomerName(dto.getCustomerName());
orderInfoVo.setCustomerPostcode(dto.getCustomerPostcode());
- orderInfoVo.setIndustryType(dto.getIndustryType());
+ orderInfoVo.setIndustryType(DictUtils.getDictLabel("industry_type",dto.getIndustryType()));
orderInfoVo.setCustomerAddress(dto.getCustomerAddress());
orderInfoVo.setContactPerson(dto.getCustomerContact());
orderInfoVo.setContactEmail(dto.getCustomerEmail());
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/vo/OrderInfoVo.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/vo/OrderInfoVo.java
index 8c36dabe..c09daea4 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/vo/OrderInfoVo.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/vo/OrderInfoVo.java
@@ -3,6 +3,8 @@ package com.ruoyi.sip.vo;
import lombok.Data;
+import java.util.Date;
+
/**
* @author : ch
* @version : 1.0
@@ -56,6 +58,5 @@ public class OrderInfoVo {
private String contactPhone;
//客户邮箱
private String contactEmail;
-
-
+ private Date lastUpdateTime;
}
diff --git a/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml
index ecdaa939..a0ad37c4 100644
--- a/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml
@@ -18,6 +18,7 @@
+
@@ -85,6 +86,7 @@
order_type,
order_agent_code,
order_partner_code,
+ bg_type,
order_date,
status,
remark,