diff --git a/docs/installHcDev.md b/docs/installHcDev.md
index 97ba37e4ea..a5df9a0f55 100644
--- a/docs/installHcDev.md
+++ b/docs/installHcDev.md
@@ -1,7 +1,7 @@
## HC小区管理系统安装教程(开发环境)
1、下载代码
-git clone https://github.com/java110/MicroCommunity.git
+git clone https://gitee.com/wuxw7/MicroCommunity.git
执行 mvn clean package 和 mvn clean install
2、添加hosts
127.0.0.1 dev.db.java110.com
@@ -82,7 +82,7 @@ dataSource.yml 中修改password密码
6、启动模块service-开头服务下的*ServiceApplicationStart.java文件中的main方法
注意启动是没有顺序的,但是我们优先推荐您启动service-eureka
7、下载前段代码
-git clone https://github.com/java110/MicroCommunityWeb.git
+git clone https://gitee.com/java110/MicroCommunityWeb.git
8、修改app.js 中的地址
```shell script
app.use('/callComponent', proxy('http://192.168.100.108:8008', opts));
diff --git a/java110-boot/pom.xml b/java110-boot/pom.xml
index e6e63cbab5..d806f888a8 100644
--- a/java110-boot/pom.xml
+++ b/java110-boot/pom.xml
@@ -25,7 +25,7 @@
junit
junit
- 4.11
+ 4.13.1
test
diff --git a/java110-core/src/main/java/com/java110/core/smo/impl/SaveTransactionLogSMOImpl.java b/java110-core/src/main/java/com/java110/core/smo/impl/SaveTransactionLogSMOImpl.java
index 2b552aa94b..db6ff8e425 100755
--- a/java110-core/src/main/java/com/java110/core/smo/impl/SaveTransactionLogSMOImpl.java
+++ b/java110-core/src/main/java/com/java110/core/smo/impl/SaveTransactionLogSMOImpl.java
@@ -1,6 +1,7 @@
package com.java110.core.smo.impl;
import com.alibaba.fastjson.JSONObject;
+import com.java110.core.context.Environment;
import com.java110.core.context.IPageData;
import com.java110.core.context.PageData;
import com.java110.core.factory.CallApiServiceFactory;
@@ -9,6 +10,7 @@
import com.java110.dto.assetImportLog.AssetImportLogDto;
import com.java110.intf.common.ITransactionLogInnerServiceSMO;
import com.java110.po.transactionLog.TransactionLogPo;
+import com.java110.utils.factory.ApplicationContextFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpMethod;
import org.springframework.scheduling.annotation.Async;
@@ -32,6 +34,9 @@ public class SaveTransactionLogSMOImpl implements ISaveTransactionLogSMO {
@Autowired(required = false)
private RestTemplate restTemplate;
+ @Autowired(required = false)
+ private RestTemplate outRestTemplate;
+
@Override
@Async
public void saveLog(TransactionLogPo transactionLogPo) {
@@ -41,11 +46,17 @@ public void saveLog(TransactionLogPo transactionLogPo) {
@Override
@Async
public void saveAssetImportLog(AssetImportLogDto assetImportLogDto) {
+
String apiUrl = "http://api-service/api/assetImportLog/saveAssetImportLog";
+ RestTemplate tmpRestTemplate = restTemplate;
+ if (Environment.isStartBootWay()) {
+ apiUrl = "http://127.0.0.1:8008/api/assetImportLog/saveAssetImportLog";
+ tmpRestTemplate = outRestTemplate;
+ }
IPageData newPd = PageData.newInstance().builder("-1", "批量日志", "", "",
"", "", apiUrl, "",
AppDto.WEB_APP_ID);
- CallApiServiceFactory.callCenterService(restTemplate, newPd, JSONObject.toJSONString(assetImportLogDto), apiUrl, HttpMethod.POST);
+ CallApiServiceFactory.callCenterService(tmpRestTemplate, newPd, JSONObject.toJSONString(assetImportLogDto), apiUrl, HttpMethod.POST);
}
}
diff --git a/java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml
index 6b6b93c446..45c339004c 100755
--- a/java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml
@@ -121,7 +121,7 @@
t.state,d.name stateName,t.start_time,t.end_time,t.start_time startTime,t.end_time endTime,pfa.`value`
importFeeName,pfc.fee_name feeName,t.payable_amount,t.payable_amount payableAmount,
mw.cur_degrees curDegrees,mw.pre_degrees preDegrees, mw.pre_reading_time preReadingTime,mw.cur_reading_time
- curReadingTime
+ curReadingTime,t.pay_order_id payOrderId
from pay_fee_detail t
left join pay_fee_attrs pfa on t.fee_id = pfa.fee_id and pfa.spec_cd = '390002'
left join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
@@ -307,12 +307,12 @@
insert into
pay_fee_detail(
- prime_rate,detail_id,receivable_amount,cycles,remark,status_cd,received_amount,community_id,b_id,fee_id,state,start_time,end_time,payable_amount
+ prime_rate,detail_id,receivable_amount,cycles,remark,received_amount,community_id,fee_id,state,start_time,end_time,payable_amount
,create_time
)
- values(#{primeRate},#{detailId},#{receivableAmount},#{cycles},#{remark},'0',#{receivedAmount},#{communityId},'-1',#{feeId},#{state},
+ values(#{primeRate},#{detailId},#{receivableAmount},#{cycles},#{remark},#{receivedAmount},#{communityId},#{feeId},#{state},
#{startTime},#{endTime},#{payableAmount}
,#{createTime}
diff --git a/java110-doc/pom.xml b/java110-doc/pom.xml
index 6d2cc179e2..eaf5b4b733 100644
--- a/java110-doc/pom.xml
+++ b/java110-doc/pom.xml
@@ -25,7 +25,7 @@
junit
junit
- 4.11
+ 4.13.1
test
diff --git a/pom.xml b/pom.xml
old mode 100755
new mode 100644
index f268c4ff69..ca18749101
--- a/pom.xml
+++ b/pom.xml
@@ -58,10 +58,10 @@
6.0.37
1.1.10
1.3.1
- 8.0.16
+ 8.0.28
2.2
3.2.1
- 1.3.3
+ 1.5
1.6
1.1.1
2.5
@@ -250,7 +250,7 @@
com.jcraft
jsch
- 0.1.49
+ 0.1.54
@@ -343,7 +343,7 @@
commons-net
commons-net
- 3.3
+ 3.9.0
@@ -466,7 +466,7 @@
org.apache.poi
poi
- 3.17
+ 4.1.1
diff --git a/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeSummaryCmd.java b/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeSummaryCmd.java
index 40a60f01a2..a72130c32a 100644
--- a/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeSummaryCmd.java
+++ b/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeSummaryCmd.java
@@ -103,6 +103,8 @@ public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJso
ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reportFeeMonthStatisticsDto.getRow()), count, reportFeeMonthStatisticsDtos);
ResponseEntity responseEntity = new ResponseEntity(resultVo.toString(), HttpStatus.OK);
+ context.setResponseEntity(responseEntity);
+
}
private List dealConfigReportFeeMonthStatisticsList(List reportFeeMonthStatisticsList, String flag) {
diff --git a/springboot/pom.xml b/springboot/pom.xml
index f6b9cc5a4f..d3fc209a0d 100644
--- a/springboot/pom.xml
+++ b/springboot/pom.xml
@@ -31,7 +31,7 @@
junit
junit
- 4.11
+ 4.13.1
test
diff --git a/springboot/src/main/resources/application.yml b/springboot/src/main/resources/application.yml
index bfa50977b3..caf4dfcd64 100644
--- a/springboot/src/main/resources/application.yml
+++ b/springboot/src/main/resources/application.yml
@@ -1,3 +1,3 @@
spring:
profiles:
- active: debug
\ No newline at end of file
+ active: dev
\ No newline at end of file