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

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/dto/InverterDetailDto.java

@@ -27,8 +27,12 @@ public class InverterDetailDto {
     private String nationalStandards;
     private String version;
     private Double fullHour;
-    private Double power;
+    private Double power; // 额定功率
     private Double powerFactor;
+    private String updateShelfEndTimeStr; // 质保到期时间
+    private String fisTimeStr; // 投运时间
+    private String afciTypeStr; // AFCI方案
+    private String afciVer; // AFCI版本
     private Double iAc1;
     private Double iAc2;
     private Double iAc3;

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/hygf/JpInverter.java

@@ -188,4 +188,10 @@ public class    JpInverter implements Serializable {
 
     @TableField("sn_name")
     private String name;
+
+    /**
+     * 搬运时间
+     */
+    @TableField("fis_time_str")
+    private String fisTimeStr;
 }

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/GoLangDataAcquisitionServiceImpl.java

@@ -33,6 +33,7 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
+import javax.annotation.PostConstruct;
 import java.lang.reflect.Array;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -539,6 +540,13 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
 				jpInverter.setCurrentPower(inverterDetailDto.getPac());
 				jpInverter.setDayPowerGeneration(inverterDetailDto.getEToday());
 				jpInverter.setMonthPowerGeneration(inverterDetailDto.getEMonth());
+				jpInverter.setAfciProgramme(inverterDetailDto.getAfciTypeStr()); // AFCI方案
+				jpInverter.setWarrantyPeriod(inverterDetailDto.getUpdateShelfEndTimeStr()); // 质保到期时间
+				jpInverter.setFisTimeStr(inverterDetailDto.getFisTimeStr()); // 投运时间
+				jpInverter.setAfciVersion(inverterDetailDto.getAfciVer()); // AFCI版本
+				jpInverter.setRatedPower(inverterDetailDto.getPower() != null
+						? Double.valueOf(inverterDetailDto.getPower())
+						: null); // 额定功率
 				if (inverterDetailDto.getEMonthStr().toLowerCase().equals("mwh")) {
 					jpInverter.setMonthPowerGeneration(inverterDetailDto.getEMonth() * GoLangConstant.mwhTokwh);
 				}

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/KsolarDataAcquisitionServiceImpl.java

@@ -557,7 +557,6 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 	@Scheduled(cron = "${dataRequstScheduled.keshida}")
 	@Override
 	@Async
-	@PostConstruct
 	public void collectorDetail() {
 		long ts = System.currentTimeMillis();
 		logger.info("-------科士达同步采集器详情/逆变器开始" + ts + "------- " + sdf.format(new Date()));

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

@@ -91,4 +91,7 @@ public class JpCollectorDto  extends BaseDto {
  @ApiModelProperty(value = "所属项目公司")
  private String companyName;
 
+ @ApiModelProperty(value = "流量到期时间")
+ private String contractTimeStr;
+
 }

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

 package com.yeejoin.amos.boot.module.hygf.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.JpCollector;
 import com.yeejoin.amos.boot.module.hygf.api.entity.JpInverterElectricity;
@@ -121,4 +122,8 @@ public class JpInverterDto  extends BaseDto {
     private Double maxValue;
 
 
+   @ApiModelProperty(value = "投运时间")
+   private String fisTimeStr;
+
+
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/JpInverter.java

@@ -175,4 +175,11 @@ public class JpInverter extends BaseEntity {
 
     @TableField("sn_name")
     private String snName;
+
+
+    /**
+     * 投运时间
+     */
+    @TableField("fis_time_str")
+    private String fisTimeStr;
 }

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

+## DB properties:
+spring.db1.datasource.driver-class-name=com.kingbase8.Driver
+spring.db1.datasource.url=jdbc:kingbase8://10.20.1.176:54321/production?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8&currentSchema=root
+spring.db1.datasource.username=root
+spring.db1.datasource.password=Yeejoin@2020
+
+spring.db2.datasource.driver-class-name=com.kingbase8.Driver
+spring.db2.datasource.url=jdbc:kingbase8://10.20.1.176:54321/amos_project?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8&currentSchema=root
+spring.db2.datasource.username=root
+spring.db2.datasource.password=Yeejoin@2020
+
+spring.db3.datasource.driver-class-name:=com.kingbase8.Driver
+spring.db3.datasource.url=jdbc:kingbase8://10.20.1.176:54321/amos_mcb?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&currentSchema=root
+spring.db3.datasource.username=root
+spring.db3.datasource.password=Yeejoin@2020
+
+## eureka properties:
+eureka.instance.hostname=47.92.234.253
+eureka.client.serviceUrl.defaultZone=http://admin:a1234560@${eureka.instance.hostname}:10001/eureka/
+## redis properties:
+spring.redis.database=1
+spring.redis.host=47.92.234.253
+spring.redis.port=6379
+spring.redis.password=yeejoin@2020
+
+
+spring.cache.type=GENERIC
+j2cache.open-spring-cache=true
+j2cache.cache-clean-mode=passive
+j2cache.allow-null-values=true
+j2cache.redis-client=lettuce
+j2cache.l2-cache-open=true
+j2cache.broadcast=net.oschina.j2cache.cache.support.redis.SpringRedisPubSubPolicy
+j2cache.L1.provider_class=caffeine
+j2cache.L2.provider_class=net.oschina.j2cache.cache.support.redis.SpringRedisProvider
+j2cache.L2.config_section=lettuce
+j2cache.sync_ttl_to_redis=true
+j2cache.default_cache_null_object=false
+j2cache.serialization=fst
+caffeine.properties=/caffeine.properties
+lettuce.mode=single
+lettuce.namespace=
+lettuce.storage=generic
+lettuce.channel=j2cache
+lettuce.scheme=redis
+lettuce.hosts=${spring.redis.host}:${spring.redis.port}
+lettuce.password=${spring.redis.password}
+lettuce.database=${spring.redis.database}
+lettuce.sentinelMasterId=
+lettuce.maxTotal=100
+lettuce.maxIdle=10
+lettuce.minIdle=10
+lettuce.timeout=10000
+
+
+emqx.clean-session=true
+emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
+emqx.broker=tcp://47.92.234.253:2883
+emqx.user-name=super
+emqx.password=a123456
+emqx.max-inflight=1000
+
+
+spring.influx.url=http://39.98.246.31:8086
+spring.influx.password=Yeejoin@2020
+spring.influx.user=root
+spring.influx.database=iot_platform
+spring.influx.retention_policy=default
+spring.influx.retention_policy_time=30d
+spring.influx.actions=10000
+spring.influx.bufferLimit=20000
+
+
+knife4j.production=false
+knife4j.enable=true
+knife4j.basic.enable=true
+knife4j.basic.username=admin
+knife4j.basic.password=a1234560
+
+management.security.enabled=true
+spring.security.user.name=admin
+spring.security.user.password=a1234560
+
+fire-rescue=123
+
+mybatis-plus.global-config.db-config.update-strategy=ignored
+
+# user-amos setting : This value is the secretkey for person manage moudle accout password encryption.please don't change it!!!
+amos.secret.key=qaz
+# if your service can't be access ,you can use this setting , you need change ip as your.
+#eureka.instance.prefer-ip-address=true
+#eureka.instance.ip-address=172.16.3.122
+
+
+spring.activemq.broker-url=tcp://47.92.234.253:61616
+spring.activemq.user=admin
+spring.activemq.password=admin
+spring.jms.pub-sub-domain=false
+myqueue=amos.privilege.v1.JXIOP.AQSC_FDGL.userBusiness
+modifypasswordqueue= amos.privilege.v1.JXIOP.AMOS_ADMIN.modifyPassword
+yth.qg.id=1
\ No newline at end of file

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

@@ -2,7 +2,7 @@ spring.application.name=AMOS-JXIOP-CT
 server.servlet.context-path=/jxiop
 server.port=33100
 server.uri-encoding=UTF-8
-spring.profiles.active=dev
+spring.profiles.active=king
 spring.jackson.time-zone=GMT+8
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 logging.config=classpath:logback-${spring.profiles.active}.xml

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/resources/logback-king.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false">
+<!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
+<property name="LOG_HOME" value="log" />
+<property name="LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %-50.50logger{50} - %msg [%file:%line] %n" />
+<!-- 按照每天生成日志文件 -->
+<appender name="FILE"  class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+        <!--日志文件输出的文件名-->
+        <FileNamePattern>${LOG_HOME}/ccs.log.%d{yyyy-MM-dd}.log</FileNamePattern>
+        <!--日志文件保留天数-->
+        <MaxHistory>7</MaxHistory>
+    </rollingPolicy>
+    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+        <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+        <pattern>${LOG_PATTERN}</pattern>
+    </encoder>
+    <!--日志文件最大的大小-->
+    <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+        <MaxFileSize>30mb</MaxFileSize>
+    </triggeringPolicy>
+</appender>
+<!-- 控制台输出 -->
+<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+        <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+        <pattern>${LOG_PATTERN}</pattern>
+    </encoder>
+</appender>
+<!--myibatis log configure-->
+<logger name="com.apache.ibatis" level="DEBUG"/>
+<logger name="java.sql.Connection" level="DEBUG"/>
+<logger name="java.sql.Statement" level="DEBUG"/>
+<logger name="java.sql.PreparedStatement" level="DEBUG"/>
+<logger name="com.baomidou.mybatisplus" level="DEBUG"/>
+<logger name="org.springframework" level="DEBUG"/>
+<logger name="org.typroject" level="DEBUG"/>
+<logger name="com.yeejoin" level="DEBUG"/>
+<!-- 日志输出级别 -->
+<root level="INFO">
+    <appender-ref ref="FILE" />
+    <appender-ref ref="STDOUT" />
+</root>
+
+</configuration>

amos-boot-system-jxiop/pom.xml

@@ -103,6 +103,13 @@
             <artifactId>pooled-jms</artifactId>
             <version>1.0.5</version>
         </dependency>
+        
+        <dependency>
+	      <groupId>com.kingbase8</groupId>
+	      <artifactId>kingbase8</artifactId>
+	      <version>8.6.0</version>
+	   </dependency>
+	   
     </dependencies>
 
 </project>

pom.xml

@@ -313,8 +313,17 @@
 			<name>thirdparty</name>
 			<url>http://113.142.68.105:8081/nexus/content/repositories/thirdparty/</url>
 		</repository>
+		
 	</repositories>
 	
+	<distributionManagement>
+		<repository>
+			<id>com.e-iceblue</id>
+			<name>e-iceblue</name>
+			<url>http://113.142.68.105:8081/nexus/content/groups/public/</url>
+		</repository>
+    </distributionManagement>
+
 	<modules>
 		<module>amos-boot-biz-common</module>
 		<module>amos-boot-core</module>