From d8adebdef26328de9b5f3965648c984fd0b3f683 Mon Sep 17 00:00:00 2001
From: bobol <bobolixyz@163.com>
Date: Tue, 30 Jan 2024 15:03:42 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=A7=A3=E6=9E=90=E6=97=A5=E6=8A=A5e?=
 =?UTF-8?q?xcel=E6=97=B6=EF=BC=8C=E9=81=87=E5=88=B0=E5=85=AC=E5=BC=8F?=
 =?UTF-8?q?=E7=95=A5=E8=BF=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-test.yml   | 25 +++++++++++++++++++
 .../DcBusiTargetInputMasterService.java       |  3 ++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/lzbi-admin/src/main/resources/application-test.yml b/lzbi-admin/src/main/resources/application-test.yml
index 059b2e5..2e56abc 100644
--- a/lzbi-admin/src/main/resources/application-test.yml
+++ b/lzbi-admin/src/main/resources/application-test.yml
@@ -129,3 +129,28 @@ target-model:
   outputOfPlant: TM000FDL # 发电量
   provideWaterAverageTemperature: TM000GSJW # 供水均温
   answerWaterAverageTemperature: TM000HSJW # 回水均温
+
+# 微信相关配置
+wechat:
+  # 小程序ID
+  appId: wx4c96b81e6331fefa
+  # 小程序密钥
+  appSecret: b7258ba1e7db304d086cb83f034b3b60
+  # 小程序登录接口
+  code2Session: https://api.weixin.qq.com/sns/jscode2session?appid={appid}&secret={secret}&js_code={js_code}&grant_type={grant_type}
+  # 获取接口调用凭据
+  accessToken: https://api.weixin.qq.com/cgi-bin/token?appid={appid}&secret={secret}&grant_type={grant_type}
+  # 获取手机号
+  phoneNumber: https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token={access_token}
+
+# 外部服务
+goal-server:
+  # iot平台服务地址
+  iot: http://127.0.0.1:9010
+
+# 外部服务接口
+goal-server-api:
+  # 获取组织资产参数树形结构
+  getOrgAssetParamsTree: ${goal-server.iot}/biz/common/orgAssetParamsTree
+  # 获取组织资产参数树形结构
+  getParamsValue: ${goal-server.iot}/biz/common/paramsValue
diff --git a/lzbi-module/src/main/java/com/lzbi/bill/service/DcBusiTargetInputMasterService.java b/lzbi-module/src/main/java/com/lzbi/bill/service/DcBusiTargetInputMasterService.java
index 9ba13dd..c0811a1 100644
--- a/lzbi-module/src/main/java/com/lzbi/bill/service/DcBusiTargetInputMasterService.java
+++ b/lzbi-module/src/main/java/com/lzbi/bill/service/DcBusiTargetInputMasterService.java
@@ -180,7 +180,8 @@ public class DcBusiTargetInputMasterService extends ServiceImpl<DcBusiTargetInpu
                                 // 获取单元格内容的类型
                                 CellType cellType = cell.getCellType();
                                 if (null != cellType && cellType.equals(CellType.FORMULA)) {
-//                                throw new RuntimeException("excel中不能存在公式!");
+                                    cellList.add("");
+                                    // throw new RuntimeException("excel中不能存在公式!");
                                 } else {
                                     cellList.add(formatter.formatCellValue(cell, formulaEvaluator));
                                 }