存量合同2.0开发 接口补充

amos-boot-data/amos-boot-data-equip/src/main/resources/application-kingbase8.properties

@@ -52,7 +52,7 @@ eureka.instance.status-page-url-path=/actuator/info
 eureka.instance.metadata-map.management.api-docs=http://localhost:${server.port}${server.servlet.context-path}/doc.html
 eureka.instance.hostname= 172.17.3.6
 eureka.instance.prefer-ip-address = true
-eureka.client.serviceUrl.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@10.20.1.160:10001/eureka/
+eureka.client.serviceUrl.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@47.92.234.253:10001/eureka/
 spring.security.user.name=admin
 spring.security.user.password=a1234560
 

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/HistoryPeasantHouseholdDto.java

@@ -45,7 +45,7 @@ public class HistoryPeasantHouseholdDto extends BaseDto {
     @ApiModelProperty(value = "房屋地址")
     private String houseAddress;
 
-    @ExcelProperty(value = "并网容量", index = 5)
+    @ExcelProperty(value = "并网容量(kW)", index = 5)
     @ApiModelProperty(value = "并网容量")
     private String basicGridCapacity;
 

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/FinancingInfoHistoryMapper.xml

@@ -8,7 +8,7 @@
         SELECT
             hfi.*
         FROM
-            `hygf_financing_info` hfi
+            `hygf_financing_info_history` hfi
         WHERE
             hfi.peasant_household_id = #{peasantHouseholdId}
     </select>

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application-dev.properties

@@ -269,4 +269,5 @@ hygf.icbc.projectId=PJ14001401B000160171
 #hygf.icbc.camsPublicKey=655CE8706E6ED9A30B92E57D8D645ADDE8C541C27C5C5AFD529C610C4C0B04F9074E3B6E933C50A3316AEA60CEF461BE4C7916D2AF51170D3A2631394A7F3939
 #hygf.icbc.apigwPublicKey=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCMpjaWjngB4E3ATh+G1DVAmQnIpiPEFAEDqRfNGAVvvH35yDetqewKi0l7OEceTMN1C6NPym3zStvSoQayjYV+eIcZERkx31KhtFu9clZKgRTyPjdKMIth/wBtPKjL/5+PYalLdomM4ONthrPgnkN4x4R0+D4+EBpXo8gNiAFsNwIDAQAB
 #hygf.icbc.outVendorId=071301
-#hygf.icbc.projectId=PJ14001401B000160171
\ No newline at end of file
+#hygf.icbc.projectId=PJ14001401B000160171
+

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/application-dev.properties

@@ -191,12 +191,12 @@ spring.kafka.consumer.max-poll-records=30
 last.month.num = 12
 
 #����� �㷨����
-base.url.XGX=http://139.9.171.247:8052/intelligent-analysis/correlation
+base.url.XGX=http://10.20.1.29:8052/intelligent-analysis/correlation
 #�������� �㷨���õ�ַ
-base.url.GKHF=http://139.9.171.247:8052/intelligent-analysis/working-condition-division
+base.url.GKHF=http://10.20.1.29:8052/intelligent-analysis/working-condition-division
 #����� �㷨����
-base.url.ZXZ=http://139.9.171.247:8052/intelligent-analysis/central-value
+base.url.ZXZ=http://10.20.1.29:8052/intelligent-analysis/central-value
 #ָ���������㷨����
-base.url.zsfx:http://139.9.171.247:8052/intelligent-analysis/index-analysis
+base.url.zsfx:http://10.20.1.29:8052/intelligent-analysis/index-analysis
 
 logic=
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/application-kingbase8.properties

@@ -34,7 +34,6 @@ spring.redis.host=10.20.1.210
 spring.redis.port=6379
 spring.redis.password=yeejoin@2020
 
-openHealth=false
 spring.cache.type=GENERIC
 j2cache.open-spring-cache=true
 j2cache.cache-clean-mode=passive