人大金仓适配

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/amosprojectmapper/UserEmpowerMapper.java

@@ -15,7 +15,7 @@ import java.util.Map;
  * @createDate: 2023/11/9
  */
 public interface UserEmpowerMapper extends BaseMapper<StdUserEmpower> {
-    @Select("select company_name as companyName , level from privilege_company where org_code = #{orgCode}")
+    @Select("select company_name as companyName , level_ from privilege_company where org_code = #{orgCode}")
     CompanyModel getCompanyInfoByOrgCode(String orgCode);
 
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/TDBigScreenAnalyseController.java

@@ -60,6 +60,7 @@ import com.yeejoin.amos.boot.module.jxiop.biz.tdMapper2.PvHealthIndexDayMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.tdMapper2.PvHealthIndexMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.tdMapper2.PvWaringRecordMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.tdmapper.IndicatorDataMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.utils.TimeRangeUtil;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
@@ -154,21 +155,26 @@ public class TDBigScreenAnalyseController extends BaseController {
         }
 
         HashMap<String, Object> resultMap = new HashMap<>();
-        List<Map<String, String>> dateInfoBy15 = new ArrayList<>();
+        //List<Map<String, String>> dateInfoBy15 = new ArrayList<>();
+        List<String> dateList=new ArrayList<>();
         if (startTime != null && endTime != null) {
             if (WarningPeriodEnum.DAY.getName().equals(analysisType)) {
-                dateInfoBy15 = idxBizFanHealthIndexMapper.getDateInfo(startTime, endTime);
+                //dateInfoBy15 = idxBizFanHealthIndexMapper.getDateInfo(startTime, endTime);
+            	dateList=TimeRangeUtil.getDateInfo(startTime, endTime);
             } else if (WarningPeriodEnum.HOUR.getName().equals(analysisType)) {
-                dateInfoBy15 = idxBizFanHealthIndexMapper.getHourInfo(startTime, endTime);
+                //dateInfoBy15 = idxBizFanHealthIndexMapper.getHourInfo(startTime, endTime);
+            	dateList=TimeRangeUtil.getHourInfo(startTime, endTime);
             } else if (WarningPeriodEnum.MINUTES.getName().equals(analysisType)) {
-                dateInfoBy15 = idxBizFanHealthIndexMapper.getMomentInfo(startTime, endTime);
+                //dateInfoBy15 = idxBizFanHealthIndexMapper.getMomentInfo(startTime, endTime);
+            	dateList=TimeRangeUtil.getMomentInfo(startTime, endTime);
             }
         } else {
-            dateInfoBy15 = idxBizFanHealthIndexMapper.getDateInfoBy15();
+            //dateInfoBy15 = idxBizFanHealthIndexMapper.getDateInfoBy15();
+        	dateList=TimeRangeUtil.getDateInfoBy15();
         }
         List<String> valueList = new ArrayList<>();
         String finalStationCode = stationCode;
-        List<String> dateList = dateInfoBy15.stream().map(i -> i.get("date")).collect(Collectors.toList());
+       // List<String> dateList = dateInfoBy15.stream().map(i -> i.get("date")).collect(Collectors.toList());
         String finalAreaCode = areaCode;
         if ((WarningPeriodEnum.DAY.getName().equals(analysisType) || analysisType == null)) {
             List<String> fullDateList = dateList.stream().map(s -> {

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/kafka/KafkaConsumerService.java

@@ -41,7 +41,7 @@ import static com.yeejoin.amos.boot.module.jxiop.biz.kafka.Constant.*;
  * @create 2022/11/1 10:06
  **/
 @Slf4j
-@Service
+//@Service
 public class KafkaConsumerService {
 
 	@Autowired

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mapper2/IdxBizFanHealthIndexMapper.java

@@ -31,13 +31,13 @@ public interface IdxBizFanHealthIndexMapper extends BaseMapper<IdxBizFanHealthIn
 	BigDecimal getHealthScoreInfoByParam(@Param("areaCode") String areaCode, @Param("stationCode") String stationCode,
 			@Param("analysisType") String analysisType);
 
-	List<Map<String, String>> getDateInfoBy15();
-
-	List<Map<String, String>> getDateInfo(Date startTime, Date endTime);
-
-	List<Map<String, String>> getHourInfo(Date startTime, Date endTime);
-
-	List<Map<String, String>> getMomentInfo(Date startTime, Date endTime);
+//	List<Map<String, String>> getDateInfoBy15();
+//
+//	List<Map<String, String>> getDateInfo(Date startTime, Date endTime);
+//
+//	List<Map<String, String>> getHourInfo(Date startTime, Date endTime);
+//
+//	List<Map<String, String>> getMomentInfo(Date startTime, Date endTime);
 
 	List<Map<String, Object>> getHealthListInfo(@Param("areaCode") String areaCode,
 			@Param("stationCode") String stationCode, @Param("gatewayIds") List<String> gatewayIds);

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/utils/TimeRangeUtil.java

+package com.yeejoin.amos.boot.module.jxiop.biz.utils;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class TimeRangeUtil {
+
+//	public static void main(String[] args) throws ParseException {
+//		LocalDate start = LocalDate.of(2024, 7, 5);
+//		LocalDate end = LocalDate.of(2024, 7, 9);
+//		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+//		Date date = sdf.parse("2024-07-05");
+//		Date date2 = sdf.parse("2024-07-09");
+//		//getDateInfo(date, date2);
+//		//getHourInfo(date, date2);
+//		//getMomentInfo(date, date2);
+//	}
+
+	public static List<String> getDateInfoBy15() {
+		List<String> list = new ArrayList<String>();
+
+		LocalDate today = LocalDate.now().minusDays(1); // 获取今天的日期
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+
+		for (int i = 0; i < 15; i++) {
+			LocalDate previousDay = today.minusDays(i);
+			String formattedDate = previousDay.format(formatter);
+			list.add(formattedDate);
+		}
+
+		return list;
+	}
+
+	public static List<String> getDateInfo(Date startTime, Date endTime) {
+		List<String> list = new ArrayList<String>();
+		List<LocalDate> dates = new ArrayList<>();
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+
+		LocalDate startInclusive = LocalDate.parse(sdf.format(startTime));
+		LocalDate endExclusive = LocalDate.parse(sdf.format(endTime));
+
+		while (!startInclusive.isAfter(endExclusive.minusDays(0))) {
+			dates.add(startInclusive);
+			String formattedDate = startInclusive.format(formatter);
+			list.add(formattedDate);
+			startInclusive = startInclusive.plusDays(1);
+		}
+
+		return list;
+	}
+
+	public static List<String> getHourInfo(Date startTime, Date endTime) {
+		List<String> list = new ArrayList<String>();
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		LocalDateTime startInclusive = LocalDateTime.parse(sdf.format(startTime),formatter);
+		LocalDateTime endExclusive = LocalDateTime.parse(sdf.format(endTime),formatter);
+
+		List<LocalDateTime> hourlyList = new ArrayList<>();
+		LocalDateTime currentDateTime = startInclusive;
+
+		// 当前时间小于或等于结束时间
+		while (currentDateTime.isBefore(endExclusive.plusDays(1)) || currentDateTime.isEqual(endExclusive)) {
+			// 仅在开始和结束时间范围内添加每小时
+			if (currentDateTime.isAfter(startInclusive.minusSeconds(1))
+					&& currentDateTime.isBefore(endExclusive.plusSeconds(1))) {
+				hourlyList.add(currentDateTime.withMinute(0).withSecond(0).withNano(0)); // 移除分钟、秒和纳秒
+				list.add(formatter.format(currentDateTime));
+			}
+			// 移动到下一个小时
+			currentDateTime = currentDateTime.plus(1, ChronoUnit.HOURS);
+		}
+
+		return list;
+	}
+
+	public static List<String> getMomentInfo(Date startTime, Date endTime) {
+		List<String> list = new ArrayList<String>();
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		LocalDateTime startInclusive = LocalDateTime.parse(sdf.format(startTime),formatter);
+		LocalDateTime endExclusive = LocalDateTime.parse(sdf.format(endTime),formatter);
+
+		List<LocalDateTime> hourlyList = new ArrayList<>();
+		LocalDateTime currentDateTime = startInclusive;
+
+		// 当前时间小于或等于结束时间
+		while (currentDateTime.isBefore(endExclusive.plusDays(1)) || currentDateTime.isEqual(endExclusive)) {
+			// 仅在开始和结束时间范围内添加每小时
+			if (currentDateTime.isAfter(startInclusive.minusSeconds(1))
+					&& currentDateTime.isBefore(endExclusive.plusSeconds(1))) {
+				hourlyList.add(currentDateTime.withMinute(0).withSecond(0).withNano(0)); // 移除分钟、秒和纳秒
+				list.add(formatter.format(currentDateTime));
+			}
+			// 移动到下一个小时
+			currentDateTime = currentDateTime.plus(10, ChronoUnit.MINUTES);
+		}
+		
+		for(String s: list) 
+		{
+			System.out.println(s);
+		}
+
+		return list;
+	}
+}

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

 ## DB properties:
 ## db1-production database
 spring.db1.datasource.type: com.alibaba.druid.pool.DruidDataSource
-spring.db1.datasource.url=jdbc:mysql://10.20.1.157:54321/production?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.db1.datasource.url=jdbc:kingbase8://10.20.1.176:54321/production?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.db1.datasource.username=root
 spring.db1.datasource.password=Yeejoin@2020
-spring.db1.datasource.driver-class-name: com.mysql.cj.jdbc.Driver
+spring.db1.datasource.driver-class-name=com.kingbase8.Driver
 ## db2-sync_data
 spring.db2.datasource.type: com.alibaba.druid.pool.DruidDataSource
-spring.db2.datasource.url=jdbc:mysql://10.20.1.157:3306/amos_idx_biz?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.db2.datasource.url=jdbc:kingbase8://10.20.1.176:54321/amos_idx_biz?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.db2.datasource.username=root
 spring.db2.datasource.password=Yeejoin@2020
-spring.db2.datasource.driver-class-name: com.mysql.cj.jdbc.Driver
+spring.db2.datasource.driver-class-name=com.kingbase8.Driver
 
 ## db5-sync_data
 spring.db5.datasource.type: com.alibaba.druid.pool.DruidDataSource
-spring.db5.datasource.url=jdbc:mysql://10.20.1.157:3306/jxiop_sync_data?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.db5.datasource.url=jdbc:kingbase8://10.20.1.176:54321/jxiop_sync_data?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.db5.datasource.username=root
 spring.db5.datasource.password=Yeejoin@2020
-spring.db5.datasource.driver-class-name: com.mysql.cj.jdbc.Driver
+spring.db5.datasource.driver-class-name=com.kingbase8.Driver
 ## amos-project
 spring.db6.datasource.type: com.alibaba.druid.pool.DruidDataSource
-spring.db6.datasource.url=jdbc:mysql://10.20.1.157:3306/amos_project?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.db6.datasource.url=jdbc:kingbase8://10.20.1.176:54321/amos_project?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.db6.datasource.username=root
 spring.db6.datasource.password=Yeejoin@2020
-spring.db6.datasource.driver-class-name: com.mysql.cj.jdbc.Driver
+spring.db6.datasource.driver-class-name=com.kingbase8.Driver
 
 ## eureka properties:
-eureka.instance.hostname=10.20.1.160
+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=10.20.1.210
+spring.redis.host=47.92.234.253
 spring.redis.port=6379
 spring.redis.password=yeejoin@2020
 
@@ -66,10 +66,10 @@ lettuce.timeout=10000
 
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
-emqx.broker=tcp://10.20.1.210:2883
+emqx.broker=tcp://47.92.234.253:2883
 emqx.user-name=admin
 emqx.password=public
-mqtt.scene.host=mqtt://10.20.1.210:8083/mqtt
+mqtt.scene.host=mqtt://47.92.234.253:8083/mqtt
 mqtt.client.product.id=mqtt
 mqtt.topic=topic_mqtt
 spring.mqtt.completionTimeout=3000
@@ -150,7 +150,7 @@ amos.secret.key=qaz
 #eureka.instance.ip-address=172.16.3.122
 
 
-spring.activemq.broker-url=tcp://10.20.1.210:61616
+spring.activemq.broker-url=tcp://47.92.234.253:61616
 spring.activemq.user=admin
 spring.activemq.password=admin
 spring.jms.pub-sub-domain=false
@@ -198,3 +198,6 @@ base.url.GKHF=http://139.9.171.247:8052/intelligent-analysis/working-condition-d
 base.url.ZXZ=http://139.9.171.247:8052/intelligent-analysis/central-value
 #ָ���������㷨����
 base.url.zsfx:http://139.9.171.247:8052/intelligent-analysis/index-analysis
+
+forecast.url=
+logic=
\ No newline at end of file

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

@@ -2,7 +2,7 @@ spring.application.name=AMOS-JXIOP-ANALYSE-WJ
 server.servlet.context-path=/jxiop-analyse
 server.port=33400
 server.uri-encoding=UTF-8
-spring.profiles.active=dev1
+spring.profiles.active=kingbase8
 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-analyse-biz/src/main/resources/logback-kingbase8.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/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizTableMapper.xml

@@ -5,10 +5,10 @@
         SELECT
             DISTINCT ${column} AS text,
             <if test="valueColumn != null and valueColumn != ''">
-                ${valueColumn} AS value
+                MAX(${valueColumn}) AS value
             </if>
             <if test="valueColumn == null or valueColumn == ''">
-                ${column} AS value
+                MAX(${column}) AS value
             </if>
         FROM
             ${tableName}

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

@@ -132,7 +132,7 @@ public class HouseholdPv extends BaseEntity {
 	/**
 	 * 告警等级
 	 */
-	@TableField("level")
+	@TableField("level_")
 	private String level;
 
 	/**

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/LargeScreenImpl.java

@@ -243,7 +243,7 @@ public class LargeScreenImpl {
 	}
 
 	@Scheduled(cron = "0/10 * * * * ?")
-	//@PostConstruct
+	@PostConstruct
 	private void sendQYYXZBMqtt() {
 		List<StationCacheInfoDto> listStationCacheInfoDto = commonServiceImpl.getListStationCacheInfoDto();
 		Map<String, List<StationCacheInfoDto>> belongAreaList = listStationCacheInfoDto.stream()
@@ -434,7 +434,7 @@ public class LargeScreenImpl {
 			// 计算昨天日期
 			LocalDate yesterday = currentDate.minusDays(1);
 			formattedDate = yesterday.format(formatter);
-			data = httpRequestUtil.getResPonse(requestUrl + "&reporting_data=" + formattedDate, Constants.REQUEST_GET,
+			data = httpRequestUtil.getResPonse(requestUrl + "&reporting_data=" + formattedDate+"&code="+s, Constants.REQUEST_GET,
 					"", Constants.resovleRule_data);
 		}
 		mapdta.put("SS", data.getString("average_wind_speed"));

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/amosprojectmapper/UserEmpowerMapper.java

@@ -17,7 +17,7 @@ import java.util.Map;
  * @createDate: 2023/11/9
  */
 public interface UserEmpowerMapper extends BaseMapper<StdUserEmpower> {
-    @Select("select company_name as companyName , level from privilege_company where org_code = #{orgCode}")
+    @Select("select company_name as companyName , level_ from privilege_company where org_code = #{orgCode}")
     CompanyModel getCompanyInfoByOrgCode(String orgCode);
 
     List<CompanyModel> getCompanyBoList(@Param("companyType") String companyType,

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/PrivilegeCompany.java

@@ -22,7 +22,7 @@ public class PrivilegeCompany extends BaseEntity {
     private Long parentId;
     @TableField("REGION_SEQ")
     private String regionSeq;
-    @TableField("LEVEL")
+    @TableField("LEVEL_")
     private String level;
     @TableField("EMAIL")
     private String email;

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/amosprojectmapper/UserEmpowerMapper.java

@@ -12,7 +12,7 @@ import com.yeejoin.amos.feign.privilege.model.CompanyModel;
  * @createDate: 2023/11/9
  */
 public interface UserEmpowerMapper extends BaseMapper<StdUserEmpower> {
-    @Select("select company_name as companyName , level from privilege_company where org_code = #{orgCode}")
+    @Select("select company_name as companyName , level_ from privilege_company where org_code = #{orgCode}")
     CompanyModel getCompanyInfoByOrgCode(String orgCode);
 
 }