解决冲突

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/util/TimeUtil.java

+package com.yeejoin.amos.boot.module.hygf.api.util;
+
+import java.util.Calendar;
+import java.util.Date;
+
+public class TimeUtil {
+
+	public static long getStartTimeOfDay(Date day) {
+		Calendar todayStart = Calendar.getInstance();
+		todayStart.setTime(day);
+		todayStart.set(Calendar.HOUR_OF_DAY, 0);
+		todayStart.set(Calendar.MINUTE, 0);
+		todayStart.set(Calendar.SECOND, 0);
+		todayStart.set(Calendar.MILLISECOND, 0);
+		return todayStart.getTime().getTime();
+	}
+
+	public static long getEndTimeOfDay(Date day) {
+		Calendar todayEnd = Calendar.getInstance();
+		todayEnd.set(Calendar.HOUR_OF_DAY, 23);
+		todayEnd.set(Calendar.MINUTE, 59);
+		todayEnd.set(Calendar.SECOND, 59);
+		todayEnd.set(Calendar.MILLISECOND, 999);
+		return todayEnd.getTime().getTime();
+	}
+}

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/TdHygfJpCollectorHistoryController.java

@@ -24,6 +24,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.hygf.api.dto.TdHygfJpCollectorHistoryDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.TdHygfJpCollectorHistory;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.TdHygfJpCollectorHistoryServiceImpl;
 
 import io.swagger.annotations.Api;
@@ -66,8 +67,9 @@ public class TdHygfJpCollectorHistoryController extends BaseController {
 	@PutMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新户用光伏监盘采集器历史表", notes = "根据sequenceNbr更新户用光伏监盘采集器历史表")
 
-	public ResponseModel<TdHygfJpCollectorHistoryDto> updateBySequenceNbrTdHygfJpCollectorHistory(@RequestBody TdHygfJpCollectorHistoryDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-	    return ResponseHelper.buildResponse(tdHygfJpCollectorHistoryServiceImpl.updateWithModel(model));
+	public ResponseModel<TdHygfJpCollectorHistoryDto> updateBySequenceNbrTdHygfJpCollectorHistory(
+			@RequestBody TdHygfJpCollectorHistoryDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+		return ResponseHelper.buildResponse(tdHygfJpCollectorHistoryServiceImpl.updateWithModel(model));
 
 	}
 
@@ -125,8 +127,8 @@ public class TdHygfJpCollectorHistoryController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET", value = "户用光伏监盘采集器历史表列表全部数据查询", notes = "户用光伏监盘采集器历史表列表全部数据查询")
 	@GetMapping(value = "/list/day")
-	public ResponseModel<List<TdHygfJpCollectorHistoryDto>> dayList(@RequestParam(value = "id") long id,
+	public ResponseModel<List<TdHygfJpCollectorHistory>> dayList(@RequestParam(value = "id") long id,
 			@RequestParam(value = "day") @DateTimeFormat() Date day) {
-		return ResponseHelper.buildResponse(tdHygfJpCollectorHistoryServiceImpl.dayList(id,day));
+		return ResponseHelper.buildResponse(tdHygfJpCollectorHistoryServiceImpl.dayList(id, day));
 	}
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/TdHygfJpInvertorElecHistoryController.java

 package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
+import java.util.Date;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import java.util.List;
-import com.yeejoin.amos.boot.module.hygf.biz.service.impl.TdHygfJpInvertorElecHistoryServiceImpl;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.http.HttpServletRequest;
-import org.springframework.web.bind.annotation.*;
+
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.hygf.api.dto.TdHygfJpInvertorElecHistoryDto;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import com.yeejoin.amos.boot.module.hygf.api.entity.TdHygfJpInvertorElecHistory;
+import com.yeejoin.amos.boot.module.hygf.biz.service.impl.TdHygfJpInvertorElecHistoryServiceImpl;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 
 /**
  * 户用光伏监盘逆变器电能历史表
@@ -54,8 +67,9 @@ public class TdHygfJpInvertorElecHistoryController extends BaseController {
 	@PutMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新户用光伏监盘逆变器电能历史表", notes = "根据sequenceNbr更新户用光伏监盘逆变器电能历史表")
 
-	public ResponseModel<TdHygfJpInvertorElecHistoryDto> updateBySequenceNbrTdHygfJpInvertorElecHistory(@RequestBody TdHygfJpInvertorElecHistoryDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-	    return ResponseHelper.buildResponse(tdHygfJpInvertorElecHistoryServiceImpl.updateWithModel(model));
+	public ResponseModel<TdHygfJpInvertorElecHistoryDto> updateBySequenceNbrTdHygfJpInvertorElecHistory(
+			@RequestBody TdHygfJpInvertorElecHistoryDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+		return ResponseHelper.buildResponse(tdHygfJpInvertorElecHistoryServiceImpl.updateWithModel(model));
 
 	}
 
@@ -110,12 +124,11 @@ public class TdHygfJpInvertorElecHistoryController extends BaseController {
 	 *
 	 * @return
 	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY) 
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET", value = "户用光伏监盘逆变器电能历史表列表全部数据查询", notes = "户用光伏监盘逆变器电能历史表列表全部数据查询")
-	@GetMapping(value = "/list")
-	public ResponseModel<List<TdHygfJpInvertorElecHistoryDto>> selectForList(
-			@RequestParam(value = "type") String type) {
-		return ResponseHelper
-				.buildResponse(tdHygfJpInvertorElecHistoryServiceImpl.queryForTdHygfJpInvertorElecHistoryList());
+	@GetMapping(value = "/list/day")
+	public ResponseModel<List<TdHygfJpInvertorElecHistory>> dayList(@RequestParam(value = "id") long id,
+			@RequestParam(value = "day") @DateTimeFormat() Date day) {
+		return ResponseHelper.buildResponse(tdHygfJpInvertorElecHistoryServiceImpl.dayList(id, day));
 	}
 }

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

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
+import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
 import com.yeejoin.amos.boot.module.hygf.api.dto.TdHygfJpCollectorHistoryDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.JpCollector;
 import com.yeejoin.amos.boot.module.hygf.api.entity.TdHygfJpCollectorHistory;
 import com.yeejoin.amos.boot.module.hygf.api.service.ITdHygfJpCollectorHistoryService;
 import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.TdHygfJpCollectorHistoryMapper;
+import com.yeejoin.amos.boot.module.hygf.api.util.TimeUtil;
 
 /**
  * 户用光伏监盘采集器历史表服务实现类
@@ -25,6 +27,10 @@ import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.TdHygfJpCollectorHis
 public class TdHygfJpCollectorHistoryServiceImpl
 		extends BaseService<TdHygfJpCollectorHistoryDto, TdHygfJpCollectorHistory, TdHygfJpCollectorHistoryMapper>
 		implements ITdHygfJpCollectorHistoryService {
+
+	@Autowired
+	private JpCollectorServiceImpl jpCollectorServiceImpl;
+
 	/**
 	 * 分页查询
 	 */
@@ -36,9 +42,16 @@ public class TdHygfJpCollectorHistoryServiceImpl
 	/**
 	 * 列表查询 示例
 	 */
-	public List<TdHygfJpCollectorHistoryDto> dayList(long id, Date day) {
-		LambdaQueryWrapper<TdHygfJpCollectorHistory> warpper = new LambdaQueryWrapper<>();
-		warpper.between(TdHygfJpCollectorHistory::getTime, day, warpper);
-		return this.queryForList("", false);
+	public List<TdHygfJpCollectorHistory> dayList(long id, Date day) {
+		JpCollector collector = jpCollectorServiceImpl.getById(id);
+		if (collector != null) {
+			LambdaQueryChainWrapper<TdHygfJpCollectorHistory> warpper = this.lambdaQuery()
+					.between(TdHygfJpCollectorHistory::getTime, TimeUtil.getStartTimeOfDay(day),
+							TimeUtil.getEndTimeOfDay(day))
+					.eq(TdHygfJpCollectorHistory::getSnCode, collector.getSnCode())
+					.eq(TdHygfJpCollectorHistory::getThirdStationId, collector.getThirdStationId());
+			return this.baseMapper.selectList(warpper);
+		}
+		return new ArrayList<>();
 	}
 }
\ No newline at end of file

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

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
-import com.yeejoin.amos.boot.module.hygf.api.entity.TdHygfJpInvertorElecHistory;
-import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.TdHygfJpInvertorElecHistoryMapper;
-import com.yeejoin.amos.boot.module.hygf.api.service.ITdHygfJpInvertorElecHistoryService;
-import com.yeejoin.amos.boot.module.hygf.api.dto.TdHygfJpInvertorElecHistoryDto;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import java.util.List;
+import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
+import com.yeejoin.amos.boot.module.hygf.api.dto.TdHygfJpInvertorElecHistoryDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.JpInverter;
+import com.yeejoin.amos.boot.module.hygf.api.entity.TdHygfJpCollectorHistory;
+import com.yeejoin.amos.boot.module.hygf.api.entity.TdHygfJpInvertorElecHistory;
+import com.yeejoin.amos.boot.module.hygf.api.service.ITdHygfJpInvertorElecHistoryService;
+import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.TdHygfJpInvertorElecHistoryMapper;
+import com.yeejoin.amos.boot.module.hygf.api.util.TimeUtil;
 
 /**
  * 户用光伏监盘逆变器电能历史表服务实现类
@@ -16,18 +25,34 @@ import java.util.List;
  * @date 2023-09-19
  */
 @Service
-public class TdHygfJpInvertorElecHistoryServiceImpl extends BaseService<TdHygfJpInvertorElecHistoryDto,TdHygfJpInvertorElecHistory,TdHygfJpInvertorElecHistoryMapper> implements ITdHygfJpInvertorElecHistoryService {
-    /**
-     * 分页查询
-     */
-    public Page<TdHygfJpInvertorElecHistoryDto> queryForTdHygfJpInvertorElecHistoryPage(Page<TdHygfJpInvertorElecHistoryDto> page)   {
-        return this.queryForPage(page, null, false);
-    }
+public class TdHygfJpInvertorElecHistoryServiceImpl extends
+		BaseService<TdHygfJpInvertorElecHistoryDto, TdHygfJpInvertorElecHistory, TdHygfJpInvertorElecHistoryMapper>
+		implements ITdHygfJpInvertorElecHistoryService {
+
+	@Autowired
+	private JpInverterServiceImpl jpInvertorServiceImpl;
+
+	/**
+	 * 分页查询
+	 */
+	public Page<TdHygfJpInvertorElecHistoryDto> queryForTdHygfJpInvertorElecHistoryPage(
+			Page<TdHygfJpInvertorElecHistoryDto> page) {
+		return this.queryForPage(page, null, false);
+	}
 
-    /**
-     * 列表查询 示例
-     */
-    public List<TdHygfJpInvertorElecHistoryDto> queryForTdHygfJpInvertorElecHistoryList()   {
-        return this.queryForList("" , false);
-    }
+	/**
+	 * 列表查询 示例
+	 */
+	public List<TdHygfJpInvertorElecHistory> dayList(long id, Date day) {
+		JpInverter invertor = jpInvertorServiceImpl.getById(id);
+		if (invertor != null) {
+			LambdaQueryChainWrapper<TdHygfJpInvertorElecHistory> warpper = this.lambdaQuery()
+					.between(TdHygfJpInvertorElecHistory::getTime, TimeUtil.getStartTimeOfDay(day),
+							TimeUtil.getEndTimeOfDay(day))
+					.eq(TdHygfJpInvertorElecHistory::getSnCode, invertor.getSnCode())
+					.eq(TdHygfJpInvertorElecHistory::getThirdStationId, invertor.getThirdStationId());
+			return this.baseMapper.selectList(warpper);
+		}
+		return new ArrayList<>();
+	}
 }
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/config/TdEngineConfig.java

+package com.yeejoin.amos.config;
+
+
+import com.alibaba.druid.pool.DruidDataSource;
+import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.annotation.MapperScan;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+
+import javax.sql.DataSource;
+
+/**
+ * 从数据源配置
+ * 若需要配置更多数据源 , 直接在yml中添加数据源配置再增加相应的新的数据源配置类即可
+ */
+@Configuration
+@MapperScan(basePackages = "com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine", sqlSessionFactoryRef = "taosSqlSessionFactory")
+public class TdEngineConfig {
+    private Logger logger = LoggerFactory.getLogger(TdEngineConfig.class);
+    // 精确到 cluster 目录，以便跟其他数据源隔离
+    private static final String MAPPER_LOCATION = "classpath*:mapper/tdengine/*.xml";
+
+
+    @Value("${spring.db3.datasource.url}")
+    private String dbUrl;
+
+    @Value("${spring.db3.datasource.username}")
+    private String username;
+
+    @Value("${spring.db3.datasource.password}")
+    private String password;
+
+    @Value("${spring.db3.datasource.driver-class-name}")
+    private String driverClassName;
+
+
+    @Bean(name = "taosDataSource")   //声明其为Bean实例
+    public DataSource clusterDataSource() {
+        DruidDataSource datasource = new DruidDataSource();
+
+        datasource.setUrl(this.dbUrl);
+        datasource.setUsername(username);
+        datasource.setPassword(password);
+        datasource.setDriverClassName(driverClassName);
+        return datasource;
+    }
+
+    @Bean(name = "taosTransactionManager")
+    public DataSourceTransactionManager clusterTransactionManager() {
+        return new DataSourceTransactionManager(clusterDataSource());
+    }
+
+    @Bean(name = "taosSqlSessionFactory")
+    public SqlSessionFactory clusterSqlSessionFactory(@Qualifier("taosDataSource") DataSource culsterDataSource)
+            throws Exception {
+        final MybatisSqlSessionFactoryBean sessionFactory = new MybatisSqlSessionFactoryBean();
+        sessionFactory.setDataSource(culsterDataSource);
+        sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver()
+                .getResources(TdEngineConfig.MAPPER_LOCATION));
+        sessionFactory.setTypeAliasesPackage("com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine");
+        //mybatis 数据库字段与实体类属性驼峰映射配置
+        sessionFactory.getObject().getConfiguration().setMapUnderscoreToCamelCase(true);
+        return sessionFactory.getObject();
+    }
+}
+

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

@@ -627,7 +627,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         }
         alarmEventService.saveBatch(newAlarmEvents);
 
-    }
+    },
 
 
     public void timingTemporarysSorageData(String gatewayId, long timeInMillis) {
@@ -635,7 +635,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
         queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("瞬时风速"));
         List<ESEquipments> indicatorsDtoList = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class);
-        queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("有功功率"));
+        queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("220kV夏雩线212线路测控装置PCS-9705TA有功功率一次值"));
         List<ESEquipments> indicatorsDtoLists = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class);
         List<TemporaryData> temporaryDatas = new ArrayList<>();
         List<TemporaryData> temporaryDatass = new ArrayList<>();
@@ -681,9 +681,9 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
     public void schedSolarPower(String gatewayId, long timeInMillis) {
         Map<String, List<String>> queryCondtion = new HashMap<>();
         queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
-        queryCondtion.put(CommonConstans.QueryStringDisplayNameKeyword, Arrays.asList("总辐射累计"));
+        queryCondtion.put(CommonConstans.QueryStringDisplayNameKeyword, Arrays.asList("WTX-801_25_WTX-801_总辐射"));
         List<ESEquipments> indicatorsDtoList = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class);
-        queryCondtion.put(CommonConstans.QueryStringDisplayNameKeyword, Arrays.asList("有功功率"));
+        queryCondtion.put(CommonConstans.QueryStringDisplayNameKeyword, Arrays.asList("南瑞光差保护_313P"));
         List<ESEquipments> indicatorsDtoLists = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class);
         List<TemporaryData> temporaryDatas = new ArrayList<>();
         List<TemporaryData> temporaryDatass = new ArrayList<>();