Merge branch 'developer' into wofkflow0620

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/entity/BaseEntity.java

@@ -4,7 +4,10 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.yeejoin.amos.boot.biz.config.BitTypeHandler;
 import lombok.Data;
+import org.apache.ibatis.type.BigDecimalTypeHandler;
+import org.apache.ibatis.type.BigIntegerTypeHandler;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -34,7 +37,7 @@ public class BaseEntity implements Serializable{
 	/**
 	 * 是否删除
 	 */
-	@TableField(value = "is_delete")
+	@TableField(value = "is_delete",typeHandler = BitTypeHandler.class)
 	public Boolean isDelete=false;
 
 }

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/DateUtils.java

@@ -8,6 +8,7 @@ import java.text.SimpleDateFormat;
 import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 
@@ -20,7 +21,7 @@ public class DateUtils {
 
     public static final String DATE_TIME_PATTERN = "yyyy-MM-dd HH:mm:ss";
     public static final String MINUTE_PATTERN = "yyyy-MM-dd HH:mm";
-    public static final String HOUR_PATTERN = "yyyy-MM-dd HH:mm:ss";
+    public static final String HOUR_PATTERN = "yyyy-MM-dd HH";
     public static final String DATE_PATTERN = "yyyy-MM-dd";
     public static final String MONTH_PATTERN = "yyyy-MM";
     public static final String YEAR_PATTERN = "yyyy";
@@ -664,13 +665,9 @@ public class DateUtils {
         /*System.out.println(dateFormat(maxDateOfMonth(dateParse("2016-02", "yyyy-MM")), null));
         System.out.println(dateFormat(minDateOfMonth(dateParse("2016-03-31", null)), null));*/
 
-//        System.out.println(dateFormat(new Date(), CHN_DATE_PATTERN_YEAR));
-//        System.out.println(dateFormat(new Date(), CHN_DATE_PATTERN_MONTH));
-//        System.out.println(getWeekOfYear(new Date()));
-//        System.out.println(getQuarterStr(getMonth(dateParse("2021-5-11", null))));
-//        System.out.println(getWeekBeginDate(dateParse("2021-10-11", null)));
-//        System.out.println(getWeekEndDate(dateParse("2021-10-11", null)));
-        System.out.println(secondsToTimeStr(3600));
+
+
+        System.out.println(getDateNowString());
     }
 
     /**
@@ -685,6 +682,53 @@ public class DateUtils {
         return name;
     }
 
+    //获取当前时间下一整时分点 例如 传入17:18  返回 17:20
+    public static String getNextWholeMinute(String currentTimeString) {
+
+        // 定义日期时间字符串的格式
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+        // 将字符串转换为 LocalDateTime
+        LocalDateTime currentTime = LocalDateTime.parse(currentTimeString, formatter);
+
+        int currentMinute = currentTime.getMinute();
+        int seconds = currentTime.getSecond();
+        int nanos = currentTime.getNano();
+
+        // 如果当前分钟已经是整时分点，则加上 60 分钟
+        if (currentMinute % 10 == 0 && seconds == 0 && nanos == 0) {
+            return currentTimeString;
+        }
+
+        // 否则计算下一个整时分点
+        LocalDateTime localDateTime = currentTime.withSecond(0).withNano(0).plusMinutes(10 - currentMinute % 10);
+
+        return    localDateTime.format(formatter);
+    }
+
+    //获取当前时间下一整时分点 例如 传入17:18  返回 17:20
+    public static String getBeforeWholeMinute(String currentTimeString) {
+
+        // 定义日期时间字符串的格式
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+        // 将字符串转换为 LocalDateTime
+        LocalDateTime currentTime = LocalDateTime.parse(currentTimeString, formatter);
+
+        int currentMinute = currentTime.getMinute();
+        int seconds = currentTime.getSecond();
+        int nanos = currentTime.getNano();
+
+        // 如果当前分钟已经是整时分点，则加上 60 分钟
+        if (currentMinute % 10 == 0 && seconds == 0 && nanos == 0) {
+            return currentTimeString;
+        }
+
+        // 否则计算下一个整时分点
+        LocalDateTime localDateTime = currentTime.withSecond(0).withNano(0).minusMinutes(currentMinute % 10);
+        return    localDateTime.format(formatter);
+    }
+
     /**
      * 获取某月的日期List
      *
@@ -1073,4 +1117,26 @@ public class DateUtils {
         final LocalDateTime end = LocalDateTime.parse(sdf.format(endTime), DateTimeFormatter.ofPattern(pattern));
         return Duration.between(start, end).toDays();
     }
+
+
+
+    public static List<String> getBeforeCurrentMonth(int num,Boolean bool ){
+        int n = 0;
+        if (!bool){
+            n = n+1;
+        }
+        List<String> objects = new ArrayList<>();
+        for (int i = n; shouldContinue(i,num,bool); i++) {
+            Date date1 = dateAddMonths(new Date(),num>0?i:-i);
+            String s = convertDateToString(date1, MONTH_PATTERN);
+            objects.add(s);
+        }
+
+        return objects;
+    }
+
+
+    private static boolean shouldContinue(int i, int num, Boolean bool) {
+        return bool ? i < Math.abs(num) : i <=Math.abs(num) ;
+    }
 }

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/MyBatisPlusCodeGenerator.java

@@ -103,12 +103,12 @@ public class MyBatisPlusCodeGenerator {
         gc.setActiveRecord(false);
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl("jdbc:mysql://47.92.234.253:3306/amos_project?serverTimezone=GMT%2B8");
+        dsc.setUrl("jdbc:mysql://47.92.234.253:13306/amos_project?serverTimezone=GMT%2B8");
         // dsc.setSchemaName("public");
 //        dsc.setDriverName("com.mysql.jdbc.Driver");
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
-        dsc.setPassword("Yeejoin@2020");
+        dsc.setPassword("Yeejoin_1234");
 
         dsc.setTypeConvert(new ITypeConvert() {
             @Override
@@ -130,7 +130,7 @@ public class MyBatisPlusCodeGenerator {
         // 包配置
         final PackageConfig pc = new PackageConfig();
         // 填写对应模块
-        pc.setModuleName(projectShortName);
+        pc.setModuleName(projectShortName1);
         // 实体路径
         pc.setParent("com.yeejoin.amos.boot.module");
         pc.setEntity("api.entity");
@@ -294,7 +294,7 @@ public class MyBatisPlusCodeGenerator {
         strategy.setTablePrefix();
         //去除表名前缀
         strategy.setTablePrefix("tz_" + projectShortName1 + "_", "t_", "tb_", "sys_", "other_", "rpm_", "s_", "tcb_",
-                "cb_", "tz_", "jc_", "jcb_", "flc_");
+                "cb_", "tz_", "jc_", "jcb_", "flc_","hygf_");
         // 设置父级Controller
         strategy.setSuperControllerClass("com.yeejoin.amos.boot.biz.common.controller.BaseController");
         autoGenerator.setStrategy(strategy);

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/config/BitTypeHandler.java

+package com.yeejoin.amos.boot.biz.config;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import org.apache.ibatis.type.BaseTypeHandler;
+import org.apache.ibatis.type.JdbcType;
+import org.apache.ibatis.type.MappedJdbcTypes;
+
+@MappedJdbcTypes(JdbcType.BIT)
+public class BitTypeHandler extends BaseTypeHandler<Boolean> {
+	@Override
+	public void setNonNullParameter(PreparedStatement ps, int i, Boolean parameter, JdbcType jdbcType)
+			throws SQLException {
+		//原生的boolean会再sql上加上引号比如'0'或者'1',人大金仓不支持,支持不带引号的
+		//ps.setBoolean(i, parameter);
+		ps.setInt(i, parameter?1:0);
+	}
+
+	@Override
+	public Boolean getNullableResult(ResultSet rs, String columnName) throws SQLException {
+		return rs.getBoolean(columnName);
+	}
+
+	@Override
+	public Boolean getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
+		return rs.getBoolean(columnIndex);
+	}
+
+	@Override
+	public Boolean getNullableResult(java.sql.CallableStatement cs, int columnIndex) throws SQLException {
+		return cs.getBoolean(columnIndex);
+	}
+}

amos-boot-data/amos-boot-data-alarm/src/main/java/com/yeejoin/amos/api/alarm/entity/EquipmentSpecificIndex.java

@@ -50,7 +50,7 @@ public class EquipmentSpecificIndex {
 	private String emergencyLevelColor;
 
 	@TableField("is_alarm")
-	private boolean isAlarm;
+	private Double isAlarm;
 	
 	@TableField("emergency_level")
 	private String emergencyLevel;
@@ -81,4 +81,10 @@ public class EquipmentSpecificIndex {
 	
 	@TableField("unit")
 	private String unit;
+	
+	@TableField("topic")
+	private String topic;
+	
+	@TableField("group")
+	private String group;
 }

amos-boot-data/amos-boot-data-alarm/src/main/java/com/yeejoin/amos/api/alarm/entity/PointSystem.java

@@ -59,4 +59,10 @@ public class PointSystem extends BaseEntity {
 	@ApiModelProperty(value = "场站缩写")
 	@TableField("station_abbr")
 	private String stationAbbr;
+	
+	@TableField("topic")
+	private String topic;
+	
+	@TableField("group")
+	private String group;
 }

amos-boot-data/amos-boot-data-alarm/src/main/java/com/yeejoin/amos/api/alarm/service/impl/PointSystemServiceImpl.java

@@ -6,10 +6,9 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
-import javax.annotation.PostConstruct;
-
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -20,8 +19,8 @@ import org.springframework.stereotype.Service;
 import org.typroject.tyboot.component.emq.EmqKeeper;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yeejoin.amos.api.alarm.dto.DynamicDetails;
@@ -267,8 +266,8 @@ public class PointSystemServiceImpl extends ServiceImpl<PointSystemMapper, Point
 		if ("SYZ".equals(pointSystem.getNumber())) {
 			// 如果开启升压站预警
 			if (warnSYZ) {
-				indexKey =new StringBuilder("WL-").append(pointSystem.getStation()).append("#").append(pointSystem.getNumber())
-						.append("#").append(pointSystem.getFunctionNum());
+				indexKey = new StringBuilder("WL-").append(pointSystem.getStation()).append("#")
+						.append(pointSystem.getNumber()).append("#").append(pointSystem.getFunctionNum());
 			} else {
 				System.out.println("升压站预警不发送: " + warningObjectCode + " , " + indexValue);
 				return null;
@@ -289,4 +288,91 @@ public class PointSystemServiceImpl extends ServiceImpl<PointSystemMapper, Point
 			return WarningDto;
 		}
 	}
+
+	@Async("equipAsyncExecutor")
+	public void sendWarningMqttAsync(String topic, String msg) {
+		try {
+			JSONObject jsonObject = JSONObject.parseObject(msg);
+			String group = jsonObject.getString("group");
+			JSONObject valueObj = jsonObject.getJSONObject("value");
+			Set<String> keys = valueObj.keySet();
+			String address = null;
+			String value = null;
+			for (String key : keys) {
+				address = key;
+				value = valueObj.getString(key);
+				break;
+			}
+			this.sendWarningMqtt(address, value, topic, group);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	public void sendWarningMqtt(String address, String value, String topic, String group) {
+
+		QueryWrapper<EquipmentSpecificIndex> indexWrapper = new QueryWrapper<>();
+		indexWrapper.lambda().eq(EquipmentSpecificIndex::getIndexAddress, address);
+		indexWrapper.lambda().eq(EquipmentSpecificIndex::getTopic, topic);
+		indexWrapper.lambda().eq(EquipmentSpecificIndex::getGroup, group);
+		EquipmentSpecificIndex esi = equipmentSpecificIndexMapper.selectOne(indexWrapper);
+		
+		String isAlarm = String.valueOf(esi.getIsAlarm().intValue());
+		// 对应 equipment库的wl_equipment_specific_index_alarm_dic表
+		String[] s = { "1", "7", "9" };
+		// 如果不满足择返回
+		if (!Arrays.asList(s).contains(isAlarm)) {
+			System.out.println("不满足告警类型: " + isAlarm);
+			return;
+		}
+
+		System.out.println("满足告警消息address: " + address + ",topic: " + topic + " ,value:" + value
+				+ " ,group: " + group + " ,isAlarm: " + isAlarm);
+		logger.info("满足告警消息address: " + address + ",topic: " + topic + " ,value:" + value
+				+ " ,group: " + group + " ,isAlarm: " + isAlarm);
+		
+		LambdaQueryWrapper<PointSystem> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(PointSystem::getTopic, topic);
+		wrapper.eq(PointSystem::getGroup, group);
+		wrapper.eq(PointSystem::getAddress, address);
+		PointSystem pointSystem = pointSystemMapper.selectOne(wrapper);
+		
+		String valueLabe=null;
+		JSONObject eqdata = new JSONObject();
+		
+		// 调用获取设备相关信息
+		QueryWrapper<KKSData> KKSDataWrapper = new QueryWrapper<>();
+		KKSDataWrapper.lambda().eq(KKSData::getKKSBM, pointSystem.getKks());
+		KKSData KKSData = kksDataMapper.selectOne(KKSDataWrapper);
+		if (KKSData == null) {
+			// throw new RuntimeException("kks码查询热工院表不存在:" + pointSystem.getKks());
+			System.out.println("kks码查询热工院表不存在:" + pointSystem.getKks());
+			return;
+		}
+		eqdata.put("kksms", KKSData.getKKSMS());
+		
+		QueryWrapper<StationBasic> stationWrapper = new QueryWrapper<>();
+		stationWrapper.lambda().eq(StationBasic::getStationNumber, pointSystem.getStation());
+		StationBasic stationBasic = stationBasicMapper.selectOne(stationWrapper);
+		if (stationBasic != null) {
+			eqdata.put("sourceAttribution", stationBasic.getProjectOrgCode());
+			eqdata.put("sourceAttributionDesc", stationBasic.getStationName());
+		} else {
+			// throw new RuntimeException("获取场站失败: " + pointSystem.getStation());
+			System.out.println("获取场站失败: " + pointSystem.getStation());
+			return;
+		}
+		
+		try {
+			// 组装数据，发送预警
+			WarningDto warningDto = setWarningDto(pointSystem, eqdata, valueLabe);
+			if (warningDto != null) {
+				emqKeeper.getMqttClient().publish(STATIONWARNING, JSON.toJSONString(warningDto).getBytes(), 0, false);
+				System.out.println("发送预警成功: " + JSON.toJSONString(warningDto));
+				// logger.info("发送预警成功: " + JSON.toJSONString(warningDto));
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
 }
\ No newline at end of file

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

+
 #mysql ???
 spring.datasource.mysql-server.driver-class-name=com.kingbase8.Driver
 spring.datasource.mysql-server.jdbc-url = jdbc:kingbase8://10.20.1.176:54321/equipment?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&currentSchema=root
@@ -14,7 +15,7 @@ spring.datasource.mysql-server.hikari.connection-timeout= 60000
 spring.datasource.mysql-server.hikari.connection-test-query= SELECT 1
 #TDengine ???
 spring.datasource.tdengine-server.driver-class-name=com.taosdata.jdbc.rs.RestfulDriver
-spring.datasource.tdengine-server.jdbc-url = jdbc:TAOS-RS://139.9.170.47:6041/iot_data?user=root&password=taosdata&timezone=GMT%2b8&allowMultiQueries=true
+spring.datasource.tdengine-server.jdbc-url = jdbc:TAOS-RS://10.20.0.169:6041/iot_data?user=root&password=taosdata&timezone=GMT%2b8&allowMultiQueries=true
 spring.datasource.tdengine-server.username=root
 spring.datasource.tdengine-server.password=taosdata
 spring.datasource.tdengine-server.type=com.zaxxer.hikari.HikariDataSource
@@ -27,8 +28,11 @@ spring.datasource.tdengine-server.hikari.max-lifetime= 1800000
 spring.datasource.tdengine-server.hikari.connection-timeout= 60000
 spring.datasource.tdengine-server.hikari.connection-test-query= show tables
 
+
+
+
 spring.redis.database=0
-spring.redis.host=139.9.173.44
+spring.redis.host=10.20.0.169
 spring.redis.port=6379
 spring.redis.password=yeejoin@2020
 spring.redis.timeout=3000
@@ -46,33 +50,35 @@ eureka.instance.lease-renewal-interval-in-seconds=5
 eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
 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= 139.9.173.44
+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}@139.9.173.44:10001/eureka/
+eureka.client.serviceUrl.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@10.20.1.160:10001/eureka/
 spring.security.user.name=admin
 spring.security.user.password=a1234560
 
+
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}-${random.int[1,65536]}
-emqx.biz-client-id=consumer-${random.int[1,65536]}
-emqx.broker=tcp://139.9.173.44:1883
+emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
+emqx.biz-client-id=consumer-${random.int[1024,65536]}
+emqx.broker=tcp://10.20.1.210:2883
 emqx.client-user-name=admin
 emqx.client-password=public
 emqx.max-inflight=1000
-emqx.keep-alive-interval=10
+emqx.keep-alive-interval=100
 emqx.biz-topic[0]= iot/data/perspective
 
+
 #kafka
-spring.kafka.bootstrap-servers=139.9.173.44:9092
+spring.kafka.bootstrap-servers=10.20.0.169:9092
 spring.kafka.producer.retries=1
-spring.kafka.producer.bootstrap-servers=139.9.173.44:9092
+spring.kafka.producer.bootstrap-servers=10.20.0.169:9092
 spring.kafka.producer.batch-size=16384
 spring.kafka.producer.buffer-memory=33554432
 spring.kafka.producer.acks=1
 spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer
 spring.kafka.producer.value-serializer=org.apache.kafka.common.serialization.StringSerializer
 spring.kafka.consumer.group-id=messageConsumerGroup
-spring.kafka.consumer.bootstrap-servers=139.9.173.44:9092
+spring.kafka.consumer.bootstrap-servers=10.20.0.169:9092
 spring.kafka.consumer.enable-auto-commit=true
 spring.kafka.consumer.auto-offset-reset=earliest
 spring.kafka.consumer.key-deserializer=org.apache.kafka.common.serialization.StringDeserializer
@@ -85,12 +91,12 @@ kafka.alarm.topic=EQUIPMENT_ALARM
 kafka.topic=PERSPECTIVE
 emq.topic=iot/data/perspective
 
-elasticsearch.address= 139.9.173.44:9200
-elasticsearch.username= elastic
-elasticsearch.password= Yeejoin@2020
-elasticsearch.scheme= http
-elasticsearch.connectTimeout= 50000
-elasticsearch.socketTimeout= 50000
-elasticsearch.connectionRequestTimeout= 50000
-elasticsearch.maxConnectNum= 1000
-elasticsearch.maxConnectPerRoute= 1000
+elasticsearch.address=10.20.0.169:9200
+elasticsearch.username=elastic
+elasticsearch.password=123456
+elasticsearch.scheme=http
+elasticsearch.connectTimeout=50000
+elasticsearch.socketTimeout=50000
+elasticsearch.connectionRequestTimeout=50000
+elasticsearch.maxConnectNum=1000
+elasticsearch.maxConnectPerRoute=1000
\ No newline at end of file

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

-spring.application.name=AMOS-DATA-EQUIP
+spring.application.name=AMOS-DATA-EQUIP-CZ
 server.servlet.context-path=/data-equip
 server.port=8100
 
-spring.profiles.active=dev
+spring.profiles.active=kingbase8
 server.compression.enabled=true
 spring.jackson.dateFormat=yyyy-MM-dd HH:mm:ss
 

amos-boot-data/amos-boot-data-housepvapi/pom.xml

@@ -195,6 +195,21 @@
         <version>2.2.2</version>
         <scope>compile</scope>
     </dependency>
+	<dependency>
+		<groupId>com.alibaba</groupId>
+		<artifactId>easyexcel</artifactId>
+		<version>3.0.5</version>
+	</dependency>
+	<dependency>
+		<groupId>org.apache.poi</groupId>
+		<artifactId>poi-ooxml</artifactId>
+		<version>4.1.2</version>
+	</dependency>
+	<dependency>
+		<groupId>org.apache.poi</groupId>
+		<artifactId>poi</artifactId>
+		<version>4.1.2</version>
+	</dependency>
 </dependencies>
 	<build>
 		<plugins>

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/Utils/GolangRequestUtil.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.api.householdapi.Utils;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.log.Log;
 import com.alibaba.fastjson.JSONArray;
@@ -11,6 +12,7 @@ import com.yeejoin.amos.api.householdapi.constant.GoLangConstant;
 import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.houseapi.HousepvapiRecords;
 import com.yeejoin.amos.api.householdapi.face.orm.mapper.houseapi.HousepvapiRecordsMapper;
 import com.yeejoin.amos.openapi.enums.PVProducerInfoEnum;
+import fastjson.JSON;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -43,6 +45,63 @@ public class GolangRequestUtil {
         return hashMap;
     }
 
+
+    /**
+     * 这个方法是为了查出全部的数据
+     * @param apiurl            请求url
+     * @param requestMethod     请求方式
+     * @param requestInfo       请求信息
+     * @param ResultResolveRule 请求的解析
+     * @param tClass            需要转换成的bean
+     * @param <T>               泛型数据
+     * @return List<T> list<Result>
+     * @desc 根据请求参数发送http请求并且对于返回的数据进行处理
+     */
+    public <T> List<T> getResPonseList(String apiurl, String requestMethod, HashMap<String, Object> requestInfo, String ResultResolveRule, Class<T> tClass) {
+        String respone = "";
+        String params = "";
+        JSONArray jsonArray = null;
+        List<T> result = new ArrayList<>();
+        Integer pageNo = 1;
+        try {
+            do {
+                requestInfo.put("pageNo", pageNo);
+                String requestParmInfo = JSON.toJSONString(requestInfo);
+                HashMap<String, Object> producerInfo = getHeaderOfGolang();
+                String baseurl = (String) producerInfo.get("apiurl");
+                HashMap<String, String> headMap = (HashMap<String, String>) producerInfo.get("header");
+                String orginalAuthorization = headMap.get("Authorization") + ":";
+                String url = baseurl + apiurl;
+                String appsecret = (String) producerInfo.get("appsecret");
+                JLYHeaderMapHandler(params, headMap, orginalAuthorization, appsecret, apiurl);
+                respone = sendRequest(requestMethod, url, requestParmInfo, headMap);
+                jsonArray = handlerResponseByResultResolverule(ResultResolveRule, respone);
+                if (!ObjectUtils.isEmpty(jsonArray)) {
+                    result.addAll(JSONArray.parseArray(jsonArray.toJSONString(), tClass));
+                }
+                //处理其他页数的数据
+                JSONObject responeJSON = JSONObject.parseObject(respone);
+                JSONObject data = responeJSON.getJSONObject("data");
+                Integer responePages = 0;
+                if (data.containsKey("pages")){
+                    responePages = data.getInteger("pages");
+                } else {
+                    JSONObject page = data.getJSONObject("page");
+                    responePages = page.getInteger("pages");
+                }
+                if (responePages == pageNo){
+                    break;
+                } else {
+                    pageNo++;
+                }
+            }while (true);
+        } catch (Exception exception) {
+            log.error(exception.getMessage(),exception);
+            return result;
+        }
+        return result;
+    }
+
     /**
      * @param apiurl            请求url
      * @param requestMethod     请求方式

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/Utils/GoodWeRequestUtil.java

@@ -46,6 +46,55 @@ public class GoodWeRequestUtil {
         }
         return hashMap;
     }
+    /**
+     * @param apiurl            请求url
+     * @param requestMethod     请求方式
+     * @param requestInfo   请求参数mapper
+     * @param ResultResolveRule 请求的解析
+     * @param tClass            需要转换成的bean
+     * @param <T>               泛型数据
+     * @return List<T> list<Result>
+     * @desc 根据请求参数发送http请求并且对于返回的数据进行处理
+     */
+    public <T> List<T> getResPonseList(String apiurl, String requestMethod, HashMap<String, Object> requestInfo, String ResultResolveRule, Class<T> tClass) {
+        String respone = "";
+        JSONArray jsonArray = null;
+        List<T> result = new ArrayList<>();
+        Integer pageNo = 1;
+        try {
+            do {
+                requestInfo.put("page_index", pageNo);
+                String requestParmInfo = fastjson.JSON.toJSONString(requestInfo);
+                HashMap<String, String> headMap = getHeaderOfGoodWE();
+                String url = GoodWeConstant.baseurl + apiurl;
+                respone = sendRequest(requestMethod, url, requestParmInfo, headMap);
+                //token如果失效重新获取{"code":100002,"msg":"授权已失效，请重新登录","data":null}
+                if(JSONObject.parseObject(respone).getInteger("code") == 100002){
+                    redisUtils.del(redisKey);
+                    respone = sendRequest(requestMethod, url, requestParmInfo, getHeaderOfGoodWE());
+                }
+                jsonArray = handlerResponseByResultResolverule(ResultResolveRule, respone);
+                if (!ObjectUtils.isEmpty(jsonArray)) {
+                    result.addAll(JSONArray.parseArray(jsonArray.toJSONString(), tClass));
+                }
+                //处理其他页数的数据
+                JSONObject responeJSON = JSONObject.parseObject(respone);
+                JSONObject data = responeJSON.getJSONObject("data");
+                Integer record = data.getInteger("record");
+                Integer pageSize= requestInfo.get("page_size")==null || (Integer)requestInfo.get("page_size")==0? 1:(Integer)requestInfo.get("page_size");
+                Integer responePages=(record/pageSize)+1;
+                if (responePages == pageNo){
+                    break;
+                } else {
+                    pageNo++;
+                }
+            } while (true);
+
+        } catch (Exception exception) {
+            return result;
+        }
+        return result;
+    }
 
     /**
      * @param apiurl            请求url
@@ -66,6 +115,11 @@ public class GoodWeRequestUtil {
             HashMap<String, String> headMap = getHeaderOfGoodWE();
             String url = GoodWeConstant.baseurl + apiurl;
             respone = sendRequest(requestMethod, url, requestParmInfo, headMap);
+            //token如果失效重新获取{"code":100002,"msg":"授权已失效，请重新登录","data":null}
+            if(JSONObject.parseObject(respone).getInteger("code") == 100002){
+                redisUtils.del(redisKey);
+                respone = sendRequest(requestMethod, url, requestParmInfo, getHeaderOfGoodWE());
+            }
             jsonArray = handlerResponseByResultResolverule(ResultResolveRule, respone);
             if (!ObjectUtils.isEmpty(jsonArray)) {
                 result = JSONArray.parseArray(jsonArray.toJSONString(), tClass);

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/Utils/SofarRequestUtil.java

@@ -5,16 +5,14 @@ import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.yeejoin.amos.api.householdapi.constant.GoodWeConstant;
 import com.yeejoin.amos.api.householdapi.constant.SoFarConstant;
-import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.Sunlight;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.springframework.util.ObjectUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Component
 
@@ -86,6 +84,54 @@ public class SofarRequestUtil {
 
         return requestHeader;
     }
+    /**
+     * @param apiurl            请求url
+     * @param requestMethod     请求方式
+     * @param requestInfo   请求参数mapper
+     * @param ResultResolveRule 请求的解析
+     * @param tClass            需要转换成的bean
+     * @param <T>               泛型数据
+     * @return List<T> list<Result>
+     * @desc 根据请求参数发送http请求并且对于返回的数据进行处理
+     */
+    public <T> List<T> getResPonseList(String apiurl, String requestMethod, Map<String, Object> requestInfo, String ResultResolveRule, Class<T> tClass) {
+        String respone = "";
+        List<T> result = new ArrayList<>();
+        Integer pageNo = 1;
+        try {
+            do {
+                requestInfo.put("page", pageNo);
+                String requestParmInfo = JSON.toJSONString(requestInfo);
+                HashMap<String, String> headMap = getHeaderOfSofar();
+                String url = SoFarConstant.baseurl + apiurl;
+                respone = sendRequest(requestMethod, url, requestParmInfo, headMap);
+                //token如果失效重新获取{"code": 500,"msg": "Login status has expired","success": false}
+                if(JSONObject.parseObject(respone).getInteger("code") == 500){
+                    redisUtils.del(redisKey);
+                    respone = sendRequest(requestMethod, url, requestParmInfo, headMap);
+                }
+                JSONObject jsonObject = JSONObject.parseObject(respone);
+                if(jsonObject!=null&&jsonObject.get(ResultResolveRule)!=null){
+                    result.addAll(JSONArray.parseArray(fastjson.JSON.toJSONString(jsonObject.get(ResultResolveRule)), tClass));
+
+                }
+                //处理其他页数的数据
+                JSONObject responeJSON = JSONObject.parseObject(respone);
+                Integer total = responeJSON.getInteger("total");
+                Integer pageSize= requestInfo.get("size")==null || (Integer)requestInfo.get("size")==0? 1:(Integer)requestInfo.get("size");
+                Integer responePages=(total/pageSize)+1;
+                if (responePages == pageNo){
+                    break;
+                } else {
+                    pageNo++;
+                }
+            } while (true);
+        } catch (Exception exception) {
+            exception.printStackTrace();
+            return result;
+        }
+        return result;
+    }
 
     /**
      * @param apiurl            请求url
@@ -112,6 +158,7 @@ public class SofarRequestUtil {
             }
         } catch (Exception exception) {
             exception.printStackTrace();
+            return result;
         }
         return result;
     }

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/Utils/SunlightUtil.java

@@ -6,9 +6,12 @@ import cn.hutool.http.HttpResponse;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSONArray;
 import com.google.gson.Gson;
 import com.yeejoin.amos.api.householdapi.face.dto.SunlightDto;
+import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.Sunlight;
 import com.yeejoin.amos.api.householdapi.face.orm.mapper.houseapi.HousepvapiRecordsMapper;
+import fastjson.JSON;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -23,7 +26,9 @@ import javax.naming.Name;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -207,6 +212,60 @@ public class SunlightUtil {
         }
     }
 
+    /**
+     * 获取全部的数据
+     * @param url
+     * @param bodyparam
+     * @return
+     */
+    public JSONObject getDataList(String url, Map<String, Object> bodyparam){
+        JSONObject resultData = new JSONObject();
+        JSONArray pageList = new JSONArray();
+        Integer pageNo = 1;
+        try {
+            do {
+                bodyparam.put("curPage", pageNo);
+                //请求头
+                HttpRequest request = HttpUtil.createPost(dfurl+url);
+                request.header("Content-Type", "application/json;charset=UTF-8");
+                request.header("sys_code", "901");
+                request.header("x-access-key", access_key);
+                //请求body
+                bodyparam.put("appkey", appkey);
+                bodyparam.put("token", this.getSunlightToken());
+
+                Gson gson = new Gson();
+                String body = gson.toJson(bodyparam);
+                request.body(body);
+                HttpResponse execute = request.execute();
+                if (!execute.isOk()) {
+                    throw new RuntimeException(execute.body());
+                }
+                String res = UnicodeUtil.toString(execute.body());
+
+                JSONObject jsonObject = JSONUtil.parseObj(res, true);
+                resultData = JSONUtil.parseObj(jsonObject.get("result_data"), true);
+                if(resultData!=null && resultData.get("pageList")!=null){
+                    pageList.addAll(JSONArray.parseArray(JSON.toJSONString(resultData.get("pageList"))));
+                    resultData.putOpt("pageList",pageList);
+                }
+                //处理其他页数的数据
+                Integer rowCount = resultData.getInt("rowCount");
+                Integer pageSize= bodyparam.get("size")==null || (Integer)bodyparam.get("size")==0? 1:(Integer)bodyparam.get("size");
+                Integer responePages=(rowCount/pageSize)+1;
+                if (responePages == pageNo){
+                    break;
+                } else {
+                    pageNo++;
+                }
+            } while (true);
+        } catch (Exception e) {
+            log.error("失败,msg["+e.getMessage()+"]", e);
+            return resultData;
+        }
+        return resultData;
+
+    }
 
 
     //获取接口数据
@@ -239,9 +298,8 @@ public class SunlightUtil {
 
             return resultData;
         } catch (Exception e) {
-            log.error("失败,msg={}", e.getMessage());
-            e.printStackTrace();
-            throw new RuntimeException(e.getMessage());
+            log.error("失败,msg["+e.getMessage()+"]", e);
+            return new JSONObject();
         }
 
 

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/constant/TanYinConstant.java

+package com.yeejoin.amos.api.householdapi.constant;
+
+import java.util.HashMap;
+
+/**
+ * 碳银常量类
+ * <p>
+ * ProjectName: amos-boot-zx-biz
+ * PackageName: com.yeejoin.amos.api.householdapi.constant
+ *
+ * @author yangyang
+ * @version v1.0
+ * @date 2024/7/15 10:22
+ */
+public class TanYinConstant {
+
+    public static String ACCESS_TOKEN_KEY = "TanYin_Token";
+
+    /**
+     * 获取电站信息
+     */
+    public static String stationListUrl = "/v1/yx/query/station/info";
+    /**
+     * 获取客户信息
+     */
+    public static String customerInfoUrl = "/v1/yx/query/customer/info";
+    /**
+     * 电站逆变器信息接口
+     */
+    public static String inverterListUrl = "/v1/station/getTodayDetail";
+    /**
+     * 电站逆变器故障信息接口
+     */
+    public static String inverterAlramUrl = "/v1/yx/query/invert/fault";
+    /**
+     * 获取 Access_Token
+     */
+    public static String getAccessTokenUrl = "/v1/auth/getAccessToken";
+    /**
+     * 刷新 Access_Token
+     */
+    public static String refreshAccessTokenUrl = "/v1/auth/refreshAccessToken";
+
+    public static final HashMap<String, String> stationStatus = new HashMap<String, String>() {
+        {
+            put("0", "在线");
+            put("1", "离线");
+            put("2", "异常");
+        }
+    };
+
+    public static final HashMap<String, String> intoNetWorkStatus = new HashMap<String, String>() {
+        {
+            put("0", "固定全额上网");
+        }
+    };
+
+}

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/controller/HouseholdTestController.java

@@ -42,6 +42,8 @@ public class HouseholdTestController {
     @Autowired
     private SofarDataAcquisitionService sofarDataAcquisitionService;
 
+    @Autowired
+    private SunlightService sunlightService;
 
 
 
@@ -53,14 +55,13 @@ public class HouseholdTestController {
     @Autowired
     private TdHYGFInverterYearGenerateImpl tdHYGFInverterYearGenerateImpl;
     @Autowired
-    private TdHYGFStationDayGenerateImpl tdHYGFStationDayGenerateImpl;
+    private TdHYGFStationAllGenerateImpl tdHYGFStationAllGenerateImpl;
     @Autowired
-    private TdHYGFStationMonthGenerateImpl tdHYGFStationMonthGenerateImpl;
-
+    private TdHYGFStationYearGenerateImpl tdHYGFStationMonthGenerateImpl;
     @Autowired
     private TdHYGFInverterTotalGenerateImpl tdHYGFInverterTotalGenerateImpl;
     @Autowired
-    TdHYGFStationYearGenerateImpl tdHYGFStationYearGenerateImpl;
+    TdHYGFStationAllGenerateImpl tdHYGFStationYearGenerateImpl;
 
     //户用光伏日发电量
     @Autowired
@@ -74,7 +75,8 @@ public class HouseholdTestController {
 
 
 
-
+    @Autowired
+    private TanYinDataAcquisitionService tanYinDataAcquisitionService;
 
     /**
      * 新增户用光伏-厂商API haders
@@ -111,8 +113,8 @@ public class HouseholdTestController {
 //        goLangDataAcquisitionService.collectorList();
 //        goLangDataAcquisitionService.inverterList();
 //        goLangDataAcquisitionService.collectorDetail();
-    //    goLangDataAcquisitionService.inverterDetail();
-    //   goLangDataAcquisitionService.inverAlramInfo();
+//        goLangDataAcquisitionService.inverterDetail();
+//        goLangDataAcquisitionService.inverAlramInfo();
 
     }
 
@@ -125,13 +127,14 @@ public class HouseholdTestController {
     @PostMapping(value = "/sofarnew")
     @ApiOperation(httpMethod = "POST", value = "首航", notes = "首航")
     public void sofarnew() throws IOException {
-   //     sofarDataAcquisitionService.stationList();
+        sunlightService.inverAlramInfo();
+//        sofarDataAcquisitionService.stationList();
 //          goLangDataAcquisitionService.stationDetail();
 //        goLangDataAcquisitionService.collectorList();
 //        goLangDataAcquisitionService.inverterList();
 //        goLangDataAcquisitionService.collectorDetail();
 //        goLangDataAcquisitionService.inverterDetail();
-        goLangDataAcquisitionService.inverAlramInfo();
+//        goLangDataAcquisitionService.inverAlramInfo();
     }
 
     /**
@@ -221,8 +224,8 @@ public class HouseholdTestController {
          case "td_hygf_jp_station_power_history":
              ascriptionService=hygfjpStationPowerHistoryImpl;
              break;
-         case "td_hygf_station_day_generate":
-             ascriptionService=tdHYGFStationDayGenerateImpl;
+         case "td_hygf_station_all_generate":
+             ascriptionService=tdHYGFStationAllGenerateImpl;
              break;
          case "td_hygf_station_month_generate":
              ascriptionService=tdHYGFStationMonthGenerateImpl;
@@ -258,8 +261,32 @@ public class HouseholdTestController {
 
 
 
+    /* ---------------- 碳银接口 Test -------------- */
+    @TycloudOperation(ApiLevel = UserType.PUBLIC, needAuth = false)
+    @PostMapping(value = "/tanyin/station")
+    @ApiOperation(httpMethod = "POST", value = "电站基本信息接口", notes = "电站基本信息接口")
+    public void tanyinStation() {
+        tanYinDataAcquisitionService.stationList();
+    }
 
+    @TycloudOperation(ApiLevel = UserType.PUBLIC, needAuth = false)
+    @PostMapping(value = "/tanyin/inverter")
+    @ApiOperation(httpMethod = "POST", value = "电站逆变器信息接口", notes = "电站逆变器信息接口")
+    public void tanyinInverter() {
+        tanYinDataAcquisitionService.inverterList();
+    }
 
+    @TycloudOperation(ApiLevel = UserType.PUBLIC, needAuth = false)
+    @PostMapping(value = "/tanyin/customer")
+    @ApiOperation(httpMethod = "POST", value = "客户信息查询接口", notes = "客户信息查询接口")
+    public void tanyinCustomer() {
+        tanYinDataAcquisitionService.customerInfoList();
+    }
 
-
+    @TycloudOperation(ApiLevel = UserType.PUBLIC, needAuth = false)
+    @PostMapping(value = "/tanyin/inverAlram")
+    @ApiOperation(httpMethod = "POST", value = "电站逆变器故障接口", notes = "电站逆变器故障接口")
+    public void tanyinInverAlram() {
+        tanYinDataAcquisitionService.inverAlramInfo();
+    }
 }

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/controller/StationImportController.java

+package com.yeejoin.amos.api.householdapi.controller;
+
+import cn.hutool.poi.excel.ExcelReader;
+import cn.hutool.poi.excel.ExcelUtil;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.hygf.JpStation;
+import com.yeejoin.amos.api.householdapi.face.orm.mapper.hygf.CompanyMapper;
+import com.yeejoin.amos.api.householdapi.face.orm.mapper.hygf.JpStationMapper;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@Api(tags = "测试")
+@RequestMapping(value = "/station")
+@Slf4j
+public class StationImportController {
+    @Autowired
+    private CompanyMapper companyMapper;
+    @Autowired
+    private JpStationMapper jpStationMapper;
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @PostMapping(value = "/importStation")
+    @ApiOperation(httpMethod = "POST", value = "导入", notes = "导入")
+    public void importStation(@RequestPart("file") MultipartFile file, @RequestParam("thirdCode") String thirdCode) throws IOException {
+        log.info("=============开始执行==============");
+        ExcelReader reader = ExcelUtil.getReader(file.getInputStream());
+        List<List<Object>> read = reader.read(1);
+        for (List<Object> objects : read) {
+            String regionalCompanyName = (String) objects.get(0);
+            String amosCompanyName = (String) objects.get(1);
+            String stationName = (String) objects.get(2);
+            String regionalCompanyNameCode = companyMapper.getCompanyNameCode(regionalCompanyName);
+            if (StringUtils.isEmpty(regionalCompanyNameCode)&&StringUtils.isNotEmpty(regionalCompanyName)) {
+                log.warn("====项目公司=====" + regionalCompanyName + "==========");
+            }
+            String amosCompanyNameCode = companyMapper.getCompanyNameCode(amosCompanyName);
+            if (StringUtils.isEmpty(amosCompanyNameCode)&&StringUtils.isNotEmpty(amosCompanyName)) {
+                log.warn("===经销商=====" + amosCompanyName + "==========");
+            }
+            updateJpStation(stationName, regionalCompanyNameCode, amosCompanyNameCode, thirdCode);
+        }
+        log.info("=============执行完成==============");
+    }
+
+    private void updateJpStation(String stationName, String regionalCompanyNameCode, String amosCompanyNameCode, String code) {
+        UpdateWrapper<JpStation> wrapper = new UpdateWrapper<JpStation>()
+                .set("regional_companies_code", regionalCompanyNameCode)
+                .set("amos_company_code", amosCompanyNameCode)
+                .eq("third_code", code)
+                .eq("name", stationName);
+        jpStationMapper.update(null, wrapper);
+    }
+}

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/exception/BusinessException.java

+package com.yeejoin.amos.api.householdapi.exception;
+
+import org.apache.commons.lang3.StringUtils;
+import org.typroject.tyboot.core.foundation.exception.BaseException;
+
+/**
+ * 自定义异常
+ *
+ * @author yangyang
+ * @version v1.0
+ * @date 2023/9/19 12:37
+ */
+public class BusinessException extends BaseException {
+
+    private String code;
+
+    public BusinessException(String message) {
+        super(message, BusinessException.class.getSimpleName(), "错误的请求.");
+        this.code = "-1";
+        this.httpStatus = 500;
+    }
+
+    public BusinessException(String errorCode, String message) {
+        super(message, BusinessException.class.getSimpleName(), message);
+        if (StringUtils.isBlank(errorCode)) {
+            this.httpStatus = 500;
+            this.code = errorCode;
+        } else {
+            this.httpStatus = Integer.parseInt(errorCode);
+            this.code = errorCode;
+        }
+    }
+
+    public boolean isTokenError() {
+        return "401".equals(this.code);
+    }
+
+}

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

+package com.yeejoin.amos.api.householdapi.face.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 碳银Access_Token类
+ * <p>
+ * ProjectName: amos-boot-zx-biz
+ * PackageName: com.yeejoin.amos.api.householdapi.face.dto
+ *
+ * @author yangyang
+ * @version v1.0
+ * @date 2024/7/16 14:08
+ */
+@NoArgsConstructor
+@Data
+public class TanYinAccessTokenDTO {
+
+    @ApiModelProperty ("业务请求 token")
+    @JsonProperty ("access_token")
+    private String accessToken;
+
+    @ApiModelProperty ("有效时间")
+    @JsonProperty ("expires_in")
+    private Integer accessTokenExpiresIn;
+}

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

+package com.yeejoin.amos.api.householdapi.face.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 碳银接口返回类
+ * <p>
+ * ProjectName: amos-boot-zx-biz
+ * PackageName: com.yeejoin.amos.api.householdapi.face.dto
+ *
+ * @author yangyang
+ * @version v1.0
+ * @date 2024/7/15 14:03
+ */
+@NoArgsConstructor
+@Data
+public class TanYinBaseResultDTO<T> {
+
+    @JsonProperty ("code")
+    private Integer code;
+
+    @JsonProperty ("data")
+    private T data;
+
+    @JsonProperty ("msg")
+    private String msg;
+
+    @JsonProperty ("deskey")
+    private Object deskey;
+
+    @JsonProperty ("success")
+    private Boolean success;
+
+    @JsonProperty ("fail")
+    private Boolean fail;
+
+}

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

+package com.yeejoin.amos.api.householdapi.face.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * 碳银分页请求类
+ * <p>
+ * ProjectName: amos-boot-zx-biz
+ * PackageName: com.yeejoin.amos.api.householdapi.face.dto
+ *
+ * @author yangyang
+ * @version v1.0
+ * @date 2024/7/16 14:09
+ */
+@NoArgsConstructor
+@Data
+public class TanYinPageResultDTO<T> {
+
+    @JsonProperty ("pageNo")
+    private Integer pageNo;
+
+    @JsonProperty ("pageSize")
+    private Integer pageSize;
+
+    @JsonProperty ("totalPage")
+    private Integer totalPage;
+
+    @JsonProperty ("total")
+    private Integer total;
+
+    @JsonProperty ("list")
+    private List<T> list;
+
+    @JsonProperty ("start")
+    private Integer start;
+}

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

@@ -6,10 +6,14 @@ import lombok.Data;
 import java.io.Serializable;
 
 @Data
-@TableName(value = "td_hygf_day_power",autoResultMap = true)
+@TableName(value = "td_hygf_station_power_day",autoResultMap = true)
 public class HYGFJPDayPower implements Serializable {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 	private Long createdTime;
-    private String tationId;
+    private String thirdStationId;
     private String hour;
     private String yearMonthDay;
     private Double power;
@@ -19,7 +23,4 @@ public class HYGFJPDayPower implements Serializable {
     private String regionalCompaniesCode; //区域公司code
     private String amosCompanyCode; //经销商code
     private String stationState;//电站状态
-
-
-
 }

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

+package com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 客户信息
+ * <p>
+ * ProjectName: amos-boot-zx-biz
+ * PackageName: com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine
+ *
+ * @author yangyang
+ * @version v1.0
+ * @date 2024/7/15 16:11
+ */
+@NoArgsConstructor
+@Data
+@TableName (value = "tanyin_alram_info", autoResultMap = true)
+public class TanYinAlramInfo {
+
+    @ApiModelProperty ("唯一序号")
+    @TableField ("id")
+    private String id;
+
+    @ApiModelProperty ("项目编号")
+    @TableField ("project_no")
+    private String projectNo;
+
+    @TableField("create_time")
+    private Long createTime;
+
+    @ApiModelProperty ("逆变器 SN")
+    @TableField ("sn")
+    private String sn;
+
+    @ApiModelProperty ("故障状态")
+    @TableField ("status")
+    private String status;
+
+    @ApiModelProperty ("故障码")
+    @TableField ("code")
+    private String code;
+
+    @ApiModelProperty ("故障等级")
+    @TableField ("level")
+    private String level;
+
+    @ApiModelProperty ("故障内容")
+    @TableField ("content")
+    private String content;
+
+    @ApiModelProperty ("解决方法")
+    @TableField ("solution")
+    private String solution;
+
+    @ApiModelProperty ("故障发生时间")
+    @TableField ("fault_occur_time")
+    private String faultOccurTime;
+
+    @ApiModelProperty ("故障结束时间")
+    @TableField ("fault_end_time")
+    private String faultEndTime;
+
+}

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

+package com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 客户信息
+ * <p>
+ * ProjectName: amos-boot-zx-biz
+ * PackageName: com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine
+ *
+ * @author yangyang
+ * @version v1.0
+ * @date 2024/7/15 16:11
+ */
+@NoArgsConstructor
+@Data
+@TableName (value = "tanyin_customer_info", autoResultMap = true)
+public class TanYinCustomerInfo {
+
+    @ApiModelProperty ("客户身份证号码")
+    @TableField ("customer_id_no")
+    private String customerIdNo;
+
+    @ApiModelProperty ("客户姓名")
+    @TableField ("customer_name")
+    private String customerName;
+
+    @ApiModelProperty ("客户手机号")
+    @TableField ("customer_phone")
+    private String customerPhone;
+
+    @ApiModelProperty ("客户并网通过时间 毫秒时间戳")
+    @TableField ("electric_contract_pass")
+    private Long electricContractPass;
+
+    @ApiModelProperty ("项目编号")
+    @TableField ("project_no")
+    private String projectNo;
+
+    @TableField("create_time")
+    private Long createTime;
+}

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

+package com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 逆变器实时数据
+ * <p>
+ * ProjectName: amos-boot-zx-biz
+ * PackageName: com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine
+ *
+ * @author yangyang
+ * @version v1.0
+ * @date 2024/7/15 16:10
+ */
+@NoArgsConstructor
+@Data
+@TableName (value = "tanyin_inveter_info", autoResultMap = true)
+public class TanYinInveterInfo {
+
+    @TableField ("project_no")
+    private String projectNo;
+
+    @TableField ("device_name")
+    private String deviceName;
+
+    @TableField ("sn")
+    private String sn;
+
+    @TableField ("supplier")
+    private Integer supplier;
+
+    @ApiModelProperty ("更新时间")
+    @TableField ("gmt_create")
+    private String gmtCreate;
+
+    @ApiModelProperty ("ID")
+    @TableField ("id_string")
+    private String idString;
+
+    @ApiModelProperty ("功率")
+    @TableField ("watt")
+    private String watt;
+
+    @ApiModelProperty ("日发电量")
+    @TableField ("daily_energy")
+    private String dailyEnergy;
+
+    @ApiModelProperty ("总发电量")
+    @TableField ("total_energy")
+    private String totalEnergy;
+
+    @ApiModelProperty ("逆变器在线状态：在线；1、离线；2、异常")
+    @TableField ("status")
+    private String status;
+
+    @ApiModelProperty ("故障原因")
+    @TableField ("error_detail")
+    private String errorDetail;
+
+    @ApiModelProperty ("故障码")
+    @TableField ("error_code")
+    private String errorCode;
+
+    @ApiModelProperty ("输入电压 1")
+    @TableField ("vol0")
+    private String vol0;
+
+    @ApiModelProperty ("输入电压 2")
+    @TableField ("vol1")
+    private String vol1;
+
+    @ApiModelProperty ("输入电压 3")
+    @TableField ("vol2")
+    private String vol2;
+
+    @ApiModelProperty ("输入电压 4")
+    @TableField ("vol3")
+    private String vol3;
+
+    @ApiModelProperty ("输入电压 5")
+    @TableField ("vol4")
+    private String vol4;
+
+    @ApiModelProperty ("输出电压 1")
+    @TableField ("vol5")
+    private String vol5;
+
+    @ApiModelProperty ("输出电压 2")
+    @TableField ("vol6")
+    private String vol6;
+
+    @ApiModelProperty ("输出电压 3")
+    @TableField ("vol7")
+    private String vol7;
+
+    @ApiModelProperty ("输出电压 3")
+    @TableField ("vol8")
+    private String vol8;
+
+    @ApiModelProperty ("输出电压 3")
+    @TableField ("vol9")
+    private String vol9;
+
+    @ApiModelProperty ("输入电压 6")
+    @TableField ("vol10")
+    private String vol10;
+
+    @ApiModelProperty ("输出电压 3")
+    @TableField ("vol11")
+    private String vol11;
+
+    @ApiModelProperty ("输出电压 3")
+    @TableField ("vol12")
+    private String vol12;
+
+    @ApiModelProperty ("输出电压 3")
+    @TableField ("vol13")
+    private String vol13;
+
+    @ApiModelProperty ("输出电压 3")
+    @TableField ("vol14")
+    private String vol14;
+
+    @ApiModelProperty ("输出电压 3")
+    @TableField ("vol15")
+    private String vol15;
+
+    @ApiModelProperty ("输入电流 1")
+    @TableField ("amp0")
+    private String amp0;
+
+    @ApiModelProperty ("输入电流 2")
+    @TableField ("amp1")
+    private String amp1;
+
+    @ApiModelProperty ("输入电流 3")
+    @TableField ("amp2")
+    private String amp2;
+
+    @ApiModelProperty ("输入电流 4")
+    @TableField ("amp3")
+    private String amp3;
+
+    @ApiModelProperty ("输入电流 5")
+    @TableField ("amp4")
+    private String amp4;
+
+    @ApiModelProperty ("输入电流 6")
+    @TableField ("amp5")
+    private String amp5;
+
+    @ApiModelProperty ("输入电流 7")
+    @TableField ("amp6")
+    private String amp6;
+
+    @ApiModelProperty ("输入电流 8")
+    @TableField ("amp7")
+    private String amp7;
+
+    @ApiModelProperty ("输入电流 9")
+    @TableField ("amp8")
+    private String amp8;
+
+    @ApiModelProperty ("输入电流 10")
+    @TableField ("amp9")
+    private String amp9;
+
+    @ApiModelProperty ("输入电流 11")
+    @TableField ("amp10")
+    private String amp10;
+
+    @ApiModelProperty ("输入电流 12")
+    @TableField ("amp11")
+    private String amp11;
+
+    @ApiModelProperty ("输入电流 13")
+    @TableField ("amp12")
+    private String amp12;
+
+    @ApiModelProperty ("输入电流 14")
+    @TableField ("amp13")
+    private String amp13;
+
+    @ApiModelProperty ("输入电流 15")
+    @TableField ("amp14")
+    private String amp14;
+
+    @ApiModelProperty ("输入电流 16")
+    @TableField ("amp15")
+    private String amp15;
+
+    @ApiModelProperty ("温度(单位:摄氏度)")
+    @TableField ("temperature")
+    private String temperature;
+
+    @TableField ("create_time")
+    private Long createTime;
+}

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

+package com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * 电站基本信息
+ * <p>
+ * ProjectName: amos-boot-zx-biz
+ * PackageName: com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine
+ *
+ * @author yangyang
+ * @version v1.0
+ * @date 2024/7/15 16:05
+ */
+@NoArgsConstructor
+@Data
+@TableName (value = "tanyin_station_info", autoResultMap = true)
+public class TanYinStationInfo {
+
+    @ApiModelProperty ("项目编号")
+    @TableField ("project_no")
+    private String projectNo;
+
+    @ApiModelProperty ("姓名")
+    @TableField ("customer_name")
+    private String customerName;
+
+    @ApiModelProperty ("手机号")
+    @TableField ("customer_phone")
+    private String customerPhone;
+
+    @ApiModelProperty ("身份证")
+    @TableField ("customer_id_no")
+    private String customerIdNo;
+
+    @ApiModelProperty ("省")
+    @TableField ("province")
+    private String province;
+
+    @ApiModelProperty ("市")
+    @TableField ("city")
+    private String city;
+
+    @ApiModelProperty ("区")
+    @TableField ("area")
+    private String area;
+
+    @ApiModelProperty ("镇 + 详细地址")
+    @TableField ("complete_address")
+    private String completeAddress;
+
+    @TableField (value = "inverterList",exist = false)
+    private List<InverterListDTO> inverterList;
+
+    @ApiModelProperty ("装机容量")
+    @TableField ("capacity_size")
+    private String capacitySize;
+
+    @ApiModelProperty ("累计总发电量")
+    @TableField ("total_power")
+    private String totalPower;
+
+    @ApiModelProperty ("当年发电量")
+    @TableField ("year_power")
+    private String yearPower;
+
+    @ApiModelProperty ("当月发电量")
+    @TableField ("month_power")
+    private String monthPower;
+
+    @ApiModelProperty ("当日发电量")
+    @TableField ("day_power")
+    private String dayPower;
+
+    @ApiModelProperty ("纬度")
+    @TableField ("latitude")
+    private String latitude;
+
+    @ApiModelProperty ("经度")
+    @TableField ("longitude")
+    private String longitude;
+
+    @TableField ("create_time")
+    private Long createTime;
+
+    @NoArgsConstructor
+    @Data
+    public static class InverterListDTO {
+
+        private String deviceName;
+
+        private Integer supplier;
+
+        private String sn;
+    }
+}

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/tdeingine/TdHYGFStationDayGenerate.java → amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/tdeingine/TdHYGFStationAllGenerate.java

@@ -9,8 +9,8 @@ import java.io.Serializable;
  * @author DELL
  */
 @Data
-@TableName(value = "td_hygf_station_day_generate" ,autoResultMap = true)
-public class TdHYGFStationDayGenerate implements Serializable {
+@TableName(value = "td_hygf_station_generate_all" ,autoResultMap = true)
+public class TdHYGFStationAllGenerate implements Serializable {
     /**
      * 创建时间
      */
@@ -20,13 +20,13 @@ public class TdHYGFStationDayGenerate implements Serializable {
      */
     private String thirdStationId;
     /**
-     *日  yyyy-MM-dd
+     *日  yyyy-MM
      */
-    private String dayTime;
+    private String yearTime;
     /**
-     *月  yyyy-MM
+     *月  yyyy
      */
-    private String yearMonth;
+    private String year;
     /**
      * 发电量
      */

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

@@ -9,7 +9,7 @@ import java.io.Serializable;
  * @author DELL
  */
 @Data
-@TableName(value = "td_hygf_station_month_generate" ,autoResultMap = true)
+@TableName(value = "td_hygf_station_generate_month" ,autoResultMap = true)
 public class TdHYGFStationMonthGenerate implements Serializable {
     /**
      * 创建时间
@@ -20,13 +20,13 @@ public class TdHYGFStationMonthGenerate implements Serializable {
      */
     private String thirdStationId;
     /**
-     *日  yyyy-MM
+     *日  yyyy-MM-dd
      */
-    private String monthTime;
+    private String dayTime;
     /**
-     *月  yyyy
+     *月  yyyy-MM
      */
-    private String year;
+    private String yearMonth;
     /**
      * 发电量
      */

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

 package com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine;
 
+import java.io.Serializable;
+
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
 
-import java.io.Serializable;
+import lombok.Data;
 
 /**
  * @author DELL
  */
 @Data
-@TableName(value = "td_hygf_station_year_generate" ,autoResultMap = true)
+@TableName(value = "td_hygf_station_generate_year" ,autoResultMap = true)
 public class TdHYGFStationYearGenerate implements Serializable {
     /**
      * 创建时间
@@ -22,7 +23,7 @@ public class TdHYGFStationYearGenerate implements Serializable {
     /**
      *日  yyyy-MM
      */
-    private String yearTime;
+    private String monthTime;
     /**
      *月  yyyy
      */

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/mapper/hygf/CompanyMapper.java

+package com.yeejoin.amos.api.householdapi.face.orm.mapper.hygf;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
+
+@Component
+public interface CompanyMapper {
+
+    String getCompanyNameCode(@Param("companyName") String companyName);
+}

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/mapper/tdengine/TanYinAlramInfoMapper.java

+package com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TanYinAlramInfo;
+
+public interface TanYinAlramInfoMapper extends BaseMapper<TanYinAlramInfo> {
+}

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/mapper/tdengine/TanYinCustomerInfoMapper.java

+package com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TanYinCustomerInfo;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+public interface TanYinCustomerInfoMapper extends BaseMapper<TanYinCustomerInfo> {
+
+    @Select("select project_no from tanyin_customer_info group by project_no")
+    List<String> listProjectNo();
+
+}

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/mapper/tdengine/TanYinInveterInfoMapper.java

+package com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TanYinInveterInfo;
+
+
+public interface TanYinInveterInfoMapper extends BaseMapper<TanYinInveterInfo> {
+
+}

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/mapper/tdengine/TanYinStationInfoMapper.java

+package com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TanYinStationInfo;
+
+
+public interface TanYinStationInfoMapper extends BaseMapper<TanYinStationInfo> {
+
+}

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/mapper/tdengine/TdHYGFStationDayGenerateMapper.java → amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/mapper/tdengine/TdHYGFStationAllGenerateMapper.java

 package com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFStationDayGenerate;
+import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFStationAllGenerate;
 
-public interface TdHYGFStationDayGenerateMapper extends BaseMapper<TdHYGFStationDayGenerate> {
+public interface TdHYGFStationAllGenerateMapper extends BaseMapper<TdHYGFStationAllGenerate> {
 }

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

+package com.yeejoin.amos.api.householdapi.face.service;
+
+/**
+ * <p>
+ * ProjectName: amos-boot-zx-biz
+ * PackageName: com.yeejoin.amos.api.householdapi.face.service
+ *
+ * @author yangyang
+ * @version v1.0
+ * @date 2024/7/15 10:05
+ */
+public interface TanYinDataAcquisitionService {
+    /**
+     * 通过并网时间段查询对应范围内的项目信息
+     *
+     * @param
+     * @return {@link }
+     * @throws
+     * @author yangyang
+     * @date 2024/7/15 16:55
+     */
+    void customerInfoList();
+
+    /**
+     * 电站基本信息
+     *
+     * @param
+     * @return {@link }
+     * @throws
+     * @author yangyang
+     * @date 2024/7/15 16:55
+     */
+    void stationList();
+
+    /**
+     * 电站逆变器信息
+     *
+     * @param
+     * @return {@link }
+     * @throws
+     * @author yangyang
+     * @date 2024/7/15 16:55
+     */
+    void inverterList();
+
+    /**
+     * 告警信息
+     *
+     * @return {@link }
+     * @throws
+     * @author yangyang
+     * @date 2024/7/24 09:44
+     */
+    void inverAlramInfo();
+}

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

@@ -44,7 +44,7 @@ public class HYGFJPDayPowerImpl  implements AscriptionService {
         if(hygfjpDayPower!=null&&!hygfjpDayPower.isEmpty()){
             for (HYGFJPDayPower dayPower : hygfjpDayPower) {
                 JpStation jpStation = jpStationMapper.selectOne(new QueryWrapper<JpStation>().
-                        eq("third_station_id", dayPower.getTationId()));
+                        eq("third_station_id", dayPower.getThirdStationId()));
                 if(jpStation!=null) {
                     dayPower.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                     dayPower.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/business/TdHYGFStationDayGenerateImpl.java → amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/business/TdHYGFStationAllGenerateImpl.java

 package com.yeejoin.amos.api.householdapi.face.service.business;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.hygf.JpStation;
-import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.HYGFJPDayPower;
-import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFInverterMonthGenerate;
-import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFStationDayGenerate;
-import com.yeejoin.amos.api.householdapi.face.orm.mapper.hygf.JpStationMapper;
-import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdHYGFStationDayGenerateMapper;
-import com.yeejoin.amos.api.householdapi.face.service.AscriptionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.hygf.JpStation;
+import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFStationAllGenerate;
+import com.yeejoin.amos.api.householdapi.face.orm.mapper.hygf.JpStationMapper;
+import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdHYGFStationAllGenerateMapper;
+import com.yeejoin.amos.api.householdapi.face.service.AscriptionService;
+
 /**
  * @description:
  * @author: tw
  * @createDate: 2024/4/9
  */
 @Service
-public class TdHYGFStationDayGenerateImpl  implements AscriptionService {
+public class TdHYGFStationAllGenerateImpl  implements AscriptionService {
     @Autowired
     private JpStationMapper jpStationMapper;
     @Autowired
-    private TdHYGFStationDayGenerateMapper tdHYGFStationDayGenerateMapper;
+    private TdHYGFStationAllGenerateMapper tdHYGFStationAllGenerateMapper;
     @Override
     public void updateAscription(String timeNum) {
         try {
-//            DateFormat dft = new SimpleDateFormat("yyyy-MM-dd");
-//            DateFormat dfty = new SimpleDateFormat("yyyy-MM");
-//
-//            Date star = dft.parse(timeNum);//开始时间
-//            String yearMonth=   dfty.format(star);
-            List<TdHYGFStationDayGenerate> hygfjpDayPower = tdHYGFStationDayGenerateMapper.selectList(
-                    new QueryWrapper<TdHYGFStationDayGenerate>().
-                            eq("day_time", timeNum).and(wrapper -> {
+            DateFormat dft = new SimpleDateFormat("yyyy-MM-dd");
+            DateFormat dfty = new SimpleDateFormat("yyyy");
+
+            Date star = dft.parse(timeNum);//开始时间
+            String yearMonth=   dfty.format(star);
+            List<TdHYGFStationAllGenerate> hygfjpDayPower = tdHYGFStationAllGenerateMapper.selectList(
+                    new QueryWrapper<TdHYGFStationAllGenerate>().
+                            eq("year", yearMonth).and(wrapper -> {
                         wrapper.isNull("regional_companies_code")
                                 .or()
                                 .isNull("amos_company_code")
@@ -49,15 +48,15 @@ public class TdHYGFStationDayGenerateImpl  implements AscriptionService {
             );
 
             if(hygfjpDayPower!=null&&!hygfjpDayPower.isEmpty()){
-                for (TdHYGFStationDayGenerate dayPower : hygfjpDayPower) {
+                for (TdHYGFStationAllGenerate dayPower : hygfjpDayPower) {
                     JpStation jpStation = jpStationMapper.selectOne(new QueryWrapper<JpStation>().
                             eq("third_station_id", dayPower.getThirdStationId()));
-                    if(jpStation!=null){
+                    if(jpStation!=null) {
                         dayPower.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                         dayPower.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                         dayPower.setStationName(jpStation.getName());
                         dayPower.setStationState(jpStation.getState());
-                    tdHYGFStationDayGenerateMapper.insert(dayPower);
+                        tdHYGFStationAllGenerateMapper.insert(dayPower);
                     }
                 }
             }

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

@@ -2,7 +2,8 @@ package com.yeejoin.amos.api.householdapi.face.service.business;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.hygf.JpStation;
-import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFInverterYearGenerate;
+import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.HYGFJPDayPower;
+import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFInverterMonthGenerate;
 import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFStationMonthGenerate;
 import com.yeejoin.amos.api.householdapi.face.orm.mapper.hygf.JpStationMapper;
 import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdHYGFStationMonthGenerateMapper;
@@ -25,18 +26,18 @@ public class TdHYGFStationMonthGenerateImpl  implements AscriptionService {
     @Autowired
     private JpStationMapper jpStationMapper;
     @Autowired
-    private TdHYGFStationMonthGenerateMapper tdHYGFStationMonthGenerateMapper;
+    private TdHYGFStationMonthGenerateMapper TdHYGFStationMonthGenerateMapper;
     @Override
     public void updateAscription(String timeNum) {
         try {
-            DateFormat dft = new SimpleDateFormat("yyyy-MM-dd");
-            DateFormat dfty = new SimpleDateFormat("yyyy-MM");
-
-            Date star = dft.parse(timeNum);//开始时间
-            String yearMonth=   dfty.format(star);
-            List<TdHYGFStationMonthGenerate> hygfjpDayPower = tdHYGFStationMonthGenerateMapper.selectList(
+//            DateFormat dft = new SimpleDateFormat("yyyy-MM-dd");
+//            DateFormat dfty = new SimpleDateFormat("yyyy-MM");
+//
+//            Date star = dft.parse(timeNum);//开始时间
+//            String yearMonth=   dfty.format(star);
+            List<TdHYGFStationMonthGenerate> hygfjpDayPower = TdHYGFStationMonthGenerateMapper.selectList(
                     new QueryWrapper<TdHYGFStationMonthGenerate>().
-                            eq("month_time", yearMonth).and(wrapper -> {
+                            eq("day_time", timeNum).and(wrapper -> {
                         wrapper.isNull("regional_companies_code")
                                 .or()
                                 .isNull("amos_company_code")
@@ -56,7 +57,7 @@ public class TdHYGFStationMonthGenerateImpl  implements AscriptionService {
                     dayPower.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                     dayPower.setStationName(jpStation.getName());
                     dayPower.setStationState(jpStation.getState());
-                    tdHYGFStationMonthGenerateMapper.insert(dayPower);
+                    TdHYGFStationMonthGenerateMapper.insert(dayPower);
                     }
                 }
             }

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

 package com.yeejoin.amos.api.householdapi.face.service.business;
 
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.hygf.JpStation;
-import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFStationMonthGenerate;
 import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFStationYearGenerate;
 import com.yeejoin.amos.api.householdapi.face.orm.mapper.hygf.JpStationMapper;
 import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdHYGFStationYearGenerateMapper;
 import com.yeejoin.amos.api.householdapi.face.service.AscriptionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
 
 /**
  * @description:
@@ -30,13 +30,13 @@ public class TdHYGFStationYearGenerateImpl  implements AscriptionService {
     public void updateAscription(String timeNum) {
         try {
             DateFormat dft = new SimpleDateFormat("yyyy-MM-dd");
-            DateFormat dfty = new SimpleDateFormat("yyyy");
+            DateFormat dfty = new SimpleDateFormat("yyyy-MM");
 
             Date star = dft.parse(timeNum);//开始时间
             String yearMonth=   dfty.format(star);
             List<TdHYGFStationYearGenerate> hygfjpDayPower = tdHYGFStationYearGenerateMapper.selectList(
                     new QueryWrapper<TdHYGFStationYearGenerate>().
-                            eq("year", yearMonth).and(wrapper -> {
+                            eq("month_time", yearMonth).and(wrapper -> {
                         wrapper.isNull("regional_companies_code")
                                 .or()
                                 .isNull("amos_company_code")
@@ -51,7 +51,7 @@ public class TdHYGFStationYearGenerateImpl  implements AscriptionService {
                 for (TdHYGFStationYearGenerate dayPower : hygfjpDayPower) {
                     JpStation jpStation = jpStationMapper.selectOne(new QueryWrapper<JpStation>().
                             eq("third_station_id", dayPower.getThirdStationId()));
-                    if(jpStation!=null) {
+                    if(jpStation!=null){
                     dayPower.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                     dayPower.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                     dayPower.setStationName(jpStation.getName());

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/config/SchedulerConfig.java

+package com.yeejoin.amos.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
+
+@Configuration
+@EnableScheduling
+public class SchedulerConfig {
+ 
+    @Bean
+    public ThreadPoolTaskScheduler taskScheduler() {
+        ThreadPoolTaskScheduler scheduler = new ThreadPoolTaskScheduler();
+        scheduler.setPoolSize(10); // 设置线程池大小为10
+        scheduler.setThreadNamePrefix("my-scheduled-task-"); // 设置线程名称前缀
+        scheduler.initialize(); // 初始化线程池
+        return scheduler;
+    }
+}
\ No newline at end of file

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/openapi/enums/PVProducerInfoEnum.java

@@ -9,7 +9,8 @@ public enum PVProducerInfoEnum {
     JLY("锦浪云","JLY"),
     KSOLAR("科士达","KSD"),
     YG("阳光","YG"),
-    HUAWEI("华为","HW");
+    HUAWEI("华为","HW"),
+    TANYIN("碳银","TY");
     private String name;
 
 

amos-boot-data/amos-boot-data-housepvapi/src/main/resources/application-dev.properties

 ## DB properties hygf
 ## db1-production database
 spring.db1.datasource.type: com.alibaba.druid.pool.DruidDataSource
-spring.db1.datasource.url=jdbc:mysql://47.92.234.253:3306/amos_openapi?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.db1.datasource.url=jdbc:mysql://47.92.234.253:13306/amos_openapi?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.db1.datasource.username=root
-spring.db1.datasource.password=Yeejoin@2020
+spring.db1.datasource.password=Yeejoin_1234
 spring.db1.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 ## db2-sync_data
 spring.db2.datasource.type: com.alibaba.druid.pool.DruidDataSource
-spring.db2.datasource.url=jdbc:mysql://47.92.234.253:3306/amos_project?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.db2.datasource.url=jdbc:mysql://47.92.234.253:13306/amos_project?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.db2.datasource.username=root
-spring.db2.datasource.password=Yeejoin@2020
+spring.db2.datasource.password=Yeejoin_1234
 spring.db2.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 ## db3-taosiData
 spring.db3.datasource.type: com.alibaba.druid.pool.DruidDataSource
@@ -70,6 +70,13 @@ dataRequstScheduled.huawei=0 0/50 * * * *
 dataRequstScheduled.keshida=0 0/50 * * * *
 
 dataRequstScheduled.Sunlight=0 0/50 * * * *
-dataRequstScheduled.GoodWe=0 0/3 * * * *
+dataRequstScheduled.GoodWe=0 0/50 * * * *
 
 dataRequstScheduled.Sofar=0 0/50 * * * *
+
+# 碳银
+tanYin.api.apiUrl=https://userauth.tanwin.cn
+tanYin.api.clientSecret=rKrWVa2sXsSZeNAOW43v
+tanYin.api.clientKey=yx10001
+dataRequestScheduled.tanYin=0 0/50 * * * *
+dataRequestScheduled.tanYin.warn=0 0/50 * * * *
\ No newline at end of file

amos-boot-data/amos-boot-data-housepvapi/src/main/resources/application-dev1.properties

@@ -45,3 +45,10 @@ emqx.client-password=public
 
 ##biz custem properties
 biz.lxyd.lift.url=http://39.106.181.149:8088/elevatorapi
+
+# 碳银
+tanYin.api.apiUrl=https://userauth.tanwin.cn
+tanYin.api.clientSecret=rKrWVa2sXsSZeNAOW43v
+tanYin.api.clientKey=yx10001
+dataRequestScheduled.tanYin=0 0/10 * * * *
+dataRequestScheduled.tanYin.warn=0 0/5 * * * *
\ No newline at end of file

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

@@ -70,6 +70,13 @@ dataRequstScheduled.huawei=0 0/50 * * * *
 dataRequstScheduled.keshida=0 0/50 * * * *
 
 dataRequstScheduled.Sunlight=0 0/50 * * * *
-dataRequstScheduled.GoodWe=0 0/3 * * * *
+dataRequstScheduled.GoodWe=0 0/50 * * * *
 
 dataRequstScheduled.Sofar=0 0/50 * * * *
+
+# 碳银
+tanYin.api.apiUrl=https://userauth.tanwin.cn
+tanYin.api.clientSecret=rKrWVa2sXsSZeNAOW43v
+tanYin.api.clientKey=yx10001
+dataRequestScheduled.tanYin=0 0/50 * * * *
+dataRequestScheduled.tanYin.warn=0 0/50 * * * *
\ No newline at end of file

amos-boot-data/amos-boot-data-housepvapi/src/main/resources/application-qa.properties

@@ -47,3 +47,10 @@ emqx.password=public
 
 ##biz custem properties
 biz.lxyd.lift.url=http://39.106.181.149:8088/elevatorapi
+
+# 碳银
+tanYin.api.apiUrl=https://userauth.tanwin.cn
+tanYin.api.clientSecret=rKrWVa2sXsSZeNAOW43v
+tanYin.api.clientKey=yx10001
+dataRequestScheduled.tanYin=0 0/10 * * * *
+dataRequestScheduled.tanYin.warn=0 0/5 * * * *
\ No newline at end of file

amos-boot-data/amos-boot-data-housepvapi/src/main/resources/application.properties

 spring.application.name=AMOS-API-ACCESSAPI
 server.servlet.context-path=/housepvapi
 server.port=11006
-spring.profiles.active=dev
+spring.profiles.active=kingbase8
 server.compression.enabled=true
 spring.jackson.dateFormat=yyyy-MM-dd HH:mm:ss
 

amos-boot-data/amos-boot-data-housepvapi/src/main/resources/mapper/hygf/CompanyMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.api.householdapi.face.orm.mapper.hygf.CompanyMapper">
+
+<select id="getCompanyNameCode" resultType="java.lang.String">
+    select
+    ORG_CODE
+    from
+    privilege_company
+    where
+    COMPANY_NAME = #{companyName}
+    limit 1
+</select>
+
+</mapper>

amos-boot-system-equip/src/main/resources/mapper/EquipmentMapper.xml

@@ -83,7 +83,7 @@
         LEFT JOIN wl_equipment_category cate ON cate.id = eq.category_id
         <where>
             <if test="whereConditionStr != null and whereConditionStr != '' ">
-                eq.name like CONCAT("%",#{whereConditionStr},"%" )
+                eq.name like CONCAT('%',#{whereConditionStr},'%' )
             </if>
             <if test="isIot != null and isIot != '' ">
                 eq.is_iot = #{isIot}
@@ -102,7 +102,7 @@
         LEFT JOIN wl_equipment_category cate ON cate.id = eq.category_id
         <where>
             <if test="whereConditionStr != null and whereConditionStr != '' ">
-                eq.name like CONCAT("%",#{whereConditionStr},"%" )
+                eq.name like CONCAT('%',#{whereConditionStr},'%' )
             </if>
         </where>
     </select>

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml

@@ -220,10 +220,10 @@
         <where>
             <if test="param.warehouseStructureName != null and param.warehouseStructureName != ''">
                 CONCAT_WS(' ', wles.position,wled.area) like
-                concat(concat("%",#{param.warehouseStructureName}),"%")
+                concat(concat('%',#{param.warehouseStructureName}),'%')
             </if>
             <if test="param.equipCode != null and param.equipCode != ''">AND wles.code like
-                concat(concat("%",#{param.equipCode}),"%")
+                concat(concat('%',#{param.equipCode}),'%')
             </if>
             <if test="param.beginDate!=null">AND wlesal.create_date <![CDATA[>=]]> #{param.beginDate}</if>
             <if test="param.endDate!=null">AND wlesal.create_date <![CDATA[<=]]> #{param.endDate}</if>
@@ -400,10 +400,10 @@
                 and wlesal.id = #{param.alarmLogId}
             </if>
             <if test="param.warehouseStructureName != null and param.warehouseStructureName != ''">
-                and wlesal.location like concat(concat("%",#{param.warehouseStructureName}),"%")
+                and wlesal.location like concat(concat('%',#{param.warehouseStructureName}),'%')
             </if>
             <if test="param.equipCode != null and param.equipCode != ''">
-                AND wlesal.equipment_specific_code like concat(concat("%",#{param.equipCode}),"%")
+                AND wlesal.equipment_specific_code like concat(concat('%',#{param.equipCode}),'%')
             </if>
             <if test="param.confirmType != null and param.confirmType != '' and param.confirmType == 1">
                 AND wlesal.confirm_type  <![CDATA[<>]]> ''
@@ -443,16 +443,16 @@
                 wlesal.type != 'FIREALARM'
             </if>
             <if test="param.equipmentCode != null and param.equipmentCode != ''">
-                AND wlesal.equipment_code like concat(concat("%",#{param.equipmentCode}),"%")
+                AND wlesal.equipment_code like concat(concat('%',#{param.equipmentCode}),'%')
             </if>
             <if test="param.equipDetailCode != null and param.equipDetailCode != ''">
-                AND wlesal.equipment_code like concat(concat("%",#{param.equipDetailCode}),"%")
+                AND wlesal.equipment_code like concat(concat('%',#{param.equipDetailCode}),'%')
             </if>
             <if test="param.indexTypeCode != null and param.indexTypeCode != ''">
                 AND wlesal.type = #{param.indexTypeCode}
             </if>
             <if test="param.fireEquipmentSpecificIndexKey != null and param.fireEquipmentSpecificIndexKey != ''">
-                AND wlesal.equipment_specific_index_key like concat(concat("%",#{param.fireEquipmentSpecificIndexKey}),"%")
+                AND wlesal.equipment_specific_index_key like concat(concat('%',#{param.fireEquipmentSpecificIndexKey}),'%')
             </if>
         </where>
             ORDER BY wlesal.create_date DESC
@@ -526,10 +526,10 @@
         <where>
             <if test="warehouseStructureName != null and warehouseStructureName != ''">
                  d.warehouseStructureName like
-                concat(concat("%",#{warehouseStructureName}),"%")
+                concat(concat('%',#{warehouseStructureName}),'%')
             </if>
             <if test="equipCode != null and equipCode != ''">AND d.fireEquipmentCode like
-                concat(concat("%",#{equipCode}),"%")
+                concat(concat('%',#{equipCode}),'%')
             </if>
             <if test="beginDate!=null">AND d.createDate >= #{beginDate}</if>
             <if test="endDate!=null">AND d.createDate <![CDATA[<=]]> #{endDate}</if>
@@ -1525,7 +1525,7 @@
                   and update_date >=
                       #{startTime} and  #{endTime} >=  update_date
                 <if test="orgCode != null and orgCode != ''">
-                    and wes.biz_org_code like concat(#{orgCode}, "%")
+                    and wes.biz_org_code like concat(#{orgCode}, '%')
                 </if>
             ) as allNum,
             (
@@ -1539,7 +1539,7 @@
                         where
                             wed.code like '92010800%'
                         <if test="orgCode != null and orgCode != ''">
-                            and wes.biz_org_code like concat(#{orgCode}, "%")
+                            and wes.biz_org_code like concat(#{orgCode}, '%')
                         </if>
                         ) as allEqu) as allEqu,
             (
@@ -1558,7 +1558,7 @@
                           and wesi.update_date >=
                               #{startTime} and  #{endTime} >=  update_date
                                 <if test="orgCode != null and orgCode != ''">
-                                    and wes.biz_org_code like concat(#{orgCode}, "%")
+                                    and wes.biz_org_code like concat(#{orgCode}, '%')
                                 </if>
                     ) as startNum) as startNum
     </select>     

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificMapper.xml

@@ -190,7 +190,7 @@
 						`wes`.`system_id`
 					)) AS `code`,
                   wes.system_id systemId,
-         ( SELECT GROUP_CONCAT(fs.name) FROM f_fire_fighting_system fs WHERE `wes`.`system_id`  like  CONCAT("%",fs.id,'%') )  AS systemName
+         ( SELECT GROUP_CONCAT(fs.name) FROM f_fire_fighting_system fs WHERE `wes`.`system_id`  like  CONCAT('%',fs.id,'%') )  AS systemName
 
          FROM
 					wl_equipment_specific AS wes
@@ -454,9 +454,9 @@
         <if test="companyId != null and companyId != ''">
            and spec.agency_id = #{companyId}
         </if>
-        <if test="equipCode != '' and equipCode != null">and spec.code like concat("%", #{equipCode}, "%")</if>
+        <if test="equipCode != '' and equipCode != null">and spec.code like concat('%', #{equipCode}, '%')</if>
         <if test="equipName != '' and equipName != null">
-            and spec.name like CONCAT("%", #{equipName},'%')
+            and spec.name like CONCAT('%', #{equipName},'%')
         </if>
         <if test="current != null and size != null">
             Limit #{current},#{size}
@@ -501,9 +501,9 @@
         <if test="companyId != null and companyId != ''">
             and spec.agency_id = #{companyId}
         </if>
-        <if test="equipCode != '' and equipCode != null">and spec.code like concat("%", #{equipCode}, "%")</if>
+        <if test="equipCode != '' and equipCode != null">and spec.code like concat('%', #{equipCode}, '%')</if>
         <if test="equipName != '' and equipName != null">
-            and spec.name like CONCAT("%", #{equipName},'%')
+            and spec.name like CONCAT('%', #{equipName},'%')
         </if>
     </select>
 

amos-boot-system-equip/src/main/resources/mapper/UnitMapper.xml

@@ -46,7 +46,7 @@
 			LEFT JOIN wl_unit u1 ON u1.id = u.id
 		OR u1.parent_id = u.id
 		WHERE
-			u1.`name` LIKE concat(concat("%",#{name}),"%")
+			u1.`name` LIKE concat(concat('%',#{name}),'%')
 		</if>
 		ORDER BY
 			u.code

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/AcceptanceStatusEnum.java

@@ -35,7 +35,7 @@ public enum AcceptanceStatusEnum {
     
     线下验收完成("验收完成", "10", "hygf_ys6","0"),
     
-    工程审核不通过("审核不通过", "12", "hygf_bw2","5");
+    工程审核不通过("并网审核不通过", "12", "hygf_bw2","5");
     /**
      * 名称，描述
      */
@@ -72,4 +72,15 @@ public enum AcceptanceStatusEnum {
         }
         return acceptanceStatusEnum.getCode();
     }
+
+    public static AcceptanceStatusEnum getAcceptanceStatusByKey(String Key, String state) {
+        AcceptanceStatusEnum acceptanceStatusEnum = null;
+        for (AcceptanceStatusEnum type : AcceptanceStatusEnum.values()) {
+            if (type.getKey().contains(Key) && type.getState().equals(state)) {
+                acceptanceStatusEnum = type;
+                break;
+            }
+        }
+        return acceptanceStatusEnum;
+    }
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/ArrivalStateeEnum.java

@@ -28,6 +28,7 @@ public enum ArrivalStateeEnum {
     施工中("施工中", "施工中"),
     施工完成 ("施工完成", "施工完成"),
     并网中("并网中", "并网中"),
+    验收中("验收中", "验收中"),
     并网完成("并网完成", "并网完成"),
     线上验收("线上验收", "线上验收"),
     线下验收("线下验收", "线下验收"),

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/BusinessWorkflowKey.java

+package com.yeejoin.amos.boot.module.hygf.api.Enum;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum BusinessWorkflowKey {
+    经销商管理员审核("经销商管理员审核","Activity_0r2x1es,Activity_0ojajec"),
+    完工登记("完工登记","Activity_1spujef"),
+    施工完成提交("施工完成提交","Activity_0bs6t4g"),
+    并网登记("并网登记","Activity_0bs6t4g"),
+    验收提交("验收提交","Activity_0bs6t4g"),
+    完工自审("完工自审","Activity_16r1828"),
+    片区运营审核("片区运营审核","Activity_1bldcno,Activity_05nlkey,Activity_0edftmv"),
+    设计审核("设计审核","Activity_095if3p,Activity_0k4o46e"),
+    工程审核("工程审核","Activity_1yftt2k,Activity_0k4o46e"),
+    投融审核("投融审核","Activity_1rjn5s1"),
+    法务审核("法务审核","Activity_1rjn5s1"),
+    资产审核("资产审核","Activity_0rbc0gc");
+
+
+    private  String name;
+
+    private  String code;
+
+
+
+
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/FinancingAuditEnum.java

@@ -9,8 +9,8 @@ import lombok.Getter;
 public enum FinancingAuditEnum {
 
     待融资审核("FinancingAudit","待融资审核","/hygf/drzsh"),
-    审核不通过("AuditReject","整改待推送","/hygf/zgdts"),
-    待整改("WaitAbarbeitung","待整改","/hygf/dzg"),
+    审核不通过("AuditReject","审核不通过","/hygf/zgdts"),
+    待整改("WaitAbarbeitung","重新验收","/hygf/dzg"),
     整改待推送("AbarbeitungWaitPush","审核不通过","/hygf/shym"),
     审核通过("AuditPass","审核通过","/hygf/fkym"),
     放款完成("complete","放款完成","");

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/GridStatusEnum.java

@@ -14,12 +14,21 @@ public enum GridStatusEnum {
 
 
     DDJ("待登记", "1"),
-
-    DSH("待审核", "2"),
-
+    JXSGLYDSH("经销商管理员待审核", "2"),
     YWC("已完成", "3"),
+    WTG("未通过", "4"),
+    SJDSH("设计待审核", "5"),
+    ROLESDSH("设计待审核/工程待审核", "6"),
+    PQYYDSH("片区运营待审核", "7"),
+    GCDSH("工程待审核", "8"),
+    ZGDSH("整改待审核", "9"),
+    DZG("待整改", "10"),
+    YSROLESDSH("投融待审核/法务待审核", "11"),
+    TRDSH("投融待审核", "12"),
+    ZCDSH("资产待审核", "13"),
+    FWDSH("法务待审核", "14"),
+    DTJYS("待提交验收", "15");
 
-    WTG("未通过", "4");
 
     /**
      * 名称，描述

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/IcbcEnum.java

+package com.yeejoin.amos.boot.module.hygf.api.Enum;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * 聚富通枚举
+ *
+ * <p>
+ * ProjectName: amos-boot-zx-biz
+ * PackageName: com.yeejoin.amos.boot.module.hygf.api.Enum
+ *
+ * @author yangyang
+ * @version v1.0
+ * @date 2024/7/18 11:51
+ */
+@Data
+public class IcbcEnum {
+
+    /**
+     * 开户状态
+     */
+    @Getter
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static enum OpenAccountState {
+
+        INITIAL("未开户", "00"),
+
+        OPENING("开户中", "01"),
+
+        SUCCESSFULLY("开户成功", "02"),
+
+        FAIL("开户失败", "03");
+
+        /**
+         * 名称，描述
+         */
+        private String name;
+        /**
+         * 编码
+         */
+        private String code;
+
+        public static String getNameByCode(String code, String defaultName) {
+            for (OpenAccountState state : OpenAccountState.values()) {
+                if (state.getCode().equals(code)) {
+                    return state.getName();
+                }
+            }
+            if (StringUtils.isNotEmpty(defaultName)) {
+                return defaultName;
+            }
+            return null;
+        }
+
+    }
+
+    /**
+     * 协议状态, 0-未生效，1-已生效，2-过期，3-作废，4-待短信确认
+     */
+    @Getter
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static enum ProtocolStatus {
+
+        NOT_EFFECTIVE("未生效", "0"),
+
+        EFFECTIVE("已生效", "1"),
+
+        OVERDUE("过期", "2"),
+
+        DISCARD("作废", "3"),
+
+        WAITTING_SMS("待短信确认", "4");
+
+        /**
+         * 名称，描述
+         */
+        private String name;
+        /**
+         * 编码
+         */
+        private String code;
+
+        public static String getNameByCode(String code, String defaultName) {
+            for (ProtocolStatus state : ProtocolStatus.values()) {
+                if (state.getCode().equals(code)) {
+                    return state.getName();
+                }
+            }
+            if (StringUtils.isNotEmpty(defaultName)) {
+                return defaultName;
+            }
+            return null;
+        }
+
+    }
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/RectificationOrderEnum.java

+package com.yeejoin.amos.boot.module.hygf.api.Enum;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum RectificationOrderEnum {
+
+
+    施工("ProcessEngineering", "area,design,engineering"),
+    并网("GridConnected", "bw-area,bw-design,bw-engineering"),
+    验收("AcceptanceCheck", "ys-area,ys-tourong,ys-fawu,ys-zichan");
+
+    /**
+     * 名称，描述
+     */
+    private String name;
+    /**
+     * 编码
+     */
+    private String code;
+
+    public static RectificationOrderEnum getNodeByCode(String code) {
+        RectificationOrderEnum dealerReviewEnum = null;
+        for(RectificationOrderEnum type: RectificationOrderEnum.values()) {
+            if (type.getCode().equals(code)) {
+                dealerReviewEnum = type;
+                break;
+            }
+        }
+        return dealerReviewEnum;
+    }
+
+    public static RectificationOrderEnum getNodeByName(String name) {
+        RectificationOrderEnum dealerReviewEnum = null;
+        for(RectificationOrderEnum type: RectificationOrderEnum.values()) {
+            if (type.getName().equals(name)) {
+                dealerReviewEnum = type;
+                break;
+            }
+        }
+        return dealerReviewEnum;
+    }
+
+
+
+
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/RectificationRoleEnum.java

+package com.yeejoin.amos.boot.module.hygf.api.Enum;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum RectificationRoleEnum {
+
+	片区运营角色("area,bw-area,ys-area"), 设计角色("design,bw-design"), 工程角色("engineering,bw-engineering"), 投融角色("ys-tourong"),
+	法务角色("ys-fawu"),资产角色("ys-zichan");
+
+	/**
+	 * 名称，描述
+	 */
+	private String name;
+
+	public static RectificationRoleEnum getNodeByName(String name) {
+		RectificationRoleEnum dealerReviewEnum = null;
+		for (RectificationRoleEnum type : RectificationRoleEnum.values()) {
+			if (type.getName().contains(name)) {
+				dealerReviewEnum = type;
+				break;
+			}
+		}
+		return dealerReviewEnum;
+	}
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/WorkOrderEnum.java

@@ -24,9 +24,21 @@ public enum WorkOrderEnum {
     审核中("审核中", "审核中"),
 
     待审核("待审核", "待审核"),
+    片区运营待审核("片区运营待审核", "area"),
+    设计待审核("设计待审核", "design"),
+    工程待审核("工程待审核", "engineering"),
 
+    待提交("待提交", "待提交"),
+
+    整改待审核("整改待审核", "整改待审核"),
+    已完成("已完成", "已完成"),
+    已作废("已作废", "已作废"),
+    待整改("待整改", "待整改"),
+
+    整改中("整改中", "整改中"),
 
     未通过("未通过", "未通过"),
+    全部节点("全部节点", "all"),
 
     已完工("已完工", "已完工");
 

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/config/GlobalExceptionHandler.java

@@ -56,6 +56,8 @@ public class GlobalExceptionHandler {
 			String stackTrace = sw.toString();
 			response.setDevMessage(stackTrace);
 			response.setMessage(stackTrace);
+			System.err.println(e.getMessage());
+			log.debug("Exception stack trace (debug mode): {}", stackTrace);
 		} else {
 			response.setDevMessage(e.getMessage());
 			response.setMessage(e.getMessage());

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 并网审核表
+ *
+ * @author system_generator
+ * @date 2024-08-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="AcceptanceCheckAuditingDto", description="并网审核表")
+public class AcceptanceCheckAuditingDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "工作流实例ID")
+    private String instanceId;
+
+    @ApiModelProperty(value = "下一个节点角色权限id")
+    private String nextExecutorIds;
+
+    @ApiModelProperty(value = "任务发起人id")
+    private String promoter;
+
+    @ApiModelProperty(value = "流程下一节点id")
+    private String nextTaskId;
+
+    @ApiModelProperty(value = "下一节点可执行人逗号分割")
+    private String nextExecuteUserIds;
+
+    @ApiModelProperty(value = "工作流发起人id")
+    private String createUserId;
+
+    @ApiModelProperty(value = "下个节点名称")
+    private String nextNodeName;
+
+    @ApiModelProperty(value = "下个节点key")
+    private String nextNodeKey;
+
+    @ApiModelProperty(value = "状态")
+    private String status;
+
+    @ApiModelProperty(value = "验收id")
+    private Long peasantHouseholdId;
+
+    @ApiModelProperty(value = " 待执行节点小程序路由")
+    private String nodeRouting;
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 并网验收节点
+ *
+ * @author system_generator
+ * @date 2024-08-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "AcceptanceCheckDto", description = "并网验收节点")
+public class AcceptanceCheckDto extends BaseDto {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "施工单id")
+	private Long workOrderId;
+
+	@ApiModelProperty(value = "施工电站id")
+	private Long workOrderPowerStationId;
+
+	@ApiModelProperty(value = "农户id")
+	private Long peasantHouseholdId;
+
+	@ApiModelProperty(value = "验收状态")
+	private String acceptanceCheckStatus;
+
+	@ApiModelProperty(value = "节点标识")
+	private String basicGridNode;
+
+	@ApiModelProperty(value = "片区审核")
+	private String powerStationAreaStatus;
+
+	@ApiModelProperty(value = "法务审核")
+	private String powerStationLegalStatus;
+
+	@ApiModelProperty(value = "投融审核")
+	private String powerStationFinancingStatus;
+
+	@ApiModelProperty(value = "资产审核")
+	private String powerStationAssetsStatus;
+
+	@ApiModelProperty(value = "实例id")
+	private String instanceId;
+
+	private String acceptanceTime;
+
+	// 电站编号
+	private String peasantHouseholdNo;
+	// 户主姓名
+	private String ownersName;
+	/// 项目地址
+	private String projectAddressName;
+	// 并网日期
+	private Date gridConnectionTime;
+
+	private String regionalCompaniesName;
+
+	private String serviceAgent;
+
+	// 并网登记id
+
+	private Long fonGridId;
+
+	private String isAudit;
+
+	private String rectificationStatus;
+
+// 电站安装规模
+	private String scale;
+	private String realScale;
+
+	private String province;
+}

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

@@ -73,4 +73,8 @@ public class BasicGridAcceptanceDto extends BaseDto {
     //并网登记id
 
     private Long fonGridId;
+
+//    电站安装规模(kW)
+    private String scale;
+
 }

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 并网审核表
+ *
+ * @author system_generator
+ * @date 2024-08-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="BasicGridAuditingDto", description="并网审核表")
+public class BasicGridAuditingDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "工作流实例ID")
+    private String instanceId;
+
+    @ApiModelProperty(value = "下一个节点角色权限id")
+    private String nextExecutorIds;
+
+    @ApiModelProperty(value = "任务发起人id")
+    private String promoter;
+
+    @ApiModelProperty(value = "流程下一节点id")
+    private String nextTaskId;
+
+    @ApiModelProperty(value = "下一节点可执行人逗号分割")
+    private String nextExecuteUserIds;
+
+    @ApiModelProperty(value = "工作流发起人id")
+    private String createUserId;
+
+    @ApiModelProperty(value = "下个节点名称")
+    private String nextNodeName;
+
+    @ApiModelProperty(value = "下个节点key")
+    private String nextNodeKey;
+
+    @ApiModelProperty(value = "状态")
+    private String status;
+
+    @ApiModelProperty(value = "并网id")
+    private Long peasantHouseholdId;
+
+    @ApiModelProperty(value = " 待执行节点小程序路由")
+    private String nodeRouting;
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 并网验收节点
+ *
+ * @author system_generator
+ * @date 2024-08-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="BasicGridRecordDto", description="并网验收节点")
+public class BasicGridRecordDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "施工单id")
+    private Long workOrderId;
+
+    @ApiModelProperty(value = "施工电站id")
+    private Long workOrderPowerStationId;
+
+    @ApiModelProperty(value = "农户id")
+    private Long peasantHouseholdId;
+
+    @ApiModelProperty(value = "并网状态")
+    private String gridStatus;
+
+    @ApiModelProperty(value = "节点标识")
+    private String basicGridNode;
+
+    @ApiModelProperty(value = "片区审核")
+    private String powerStationAreaStatus;
+
+    @ApiModelProperty(value = "设计审核")
+    private String powerStationDesignStatus;
+
+    @ApiModelProperty(value = "工程审核")
+    private String powerStationEngineeringStatus;
+
+    @ApiModelProperty(value = "实例id")
+    private String instanceId;
+
+    @ApiModelProperty(value = "当前存在的整改单类型")
+    private String rectificationStatus;
+
+ //电站编号
+ private String peasantHouseholdNo;
+ //户主姓名
+ private String ownersName;
+ ///项目地址
+ private String projectAddressName;
+ //并网日期
+ private Date gridConnectionTime;
+
+ private String regionalCompaniesName;
+
+ private String serviceAgent;
+
+
+ //并网登记id
+
+ private Long fonGridId;
+
+
+ private String isAudit;
+
+ private Date gridTime;
+
+ //    电站安装规模(kW)
+ private String scale;
+
+ private String realScale;
+ 
+ private String province;
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 并网操作日志
+ *
+ * @author system_generator
+ * @date 2024-09-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="ConstructionAcceptanceRecordsDto", description="并网操作日志")
+public class ConstructionAcceptanceRecordsDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "操作人")
+    private String operator;
+
+    @ApiModelProperty(value = "操作内容")
+    private String operationContent;
+
+    @ApiModelProperty(value = "操作时间")
+    private Date operationTime;
+
+    @ApiModelProperty(value = "操作结果")
+    private String operationResults;
+
+    @ApiModelProperty(value = "施工单id")
+    private Long acceptanceId;
+
+    @ApiModelProperty(value = "施工电站")
+    private Long workOrderPowerStationId;
+
+    @ApiModelProperty(value = "农户id")
+    private Long peasantHouseholdId;
+
+    @ApiModelProperty(value = "备注")
+    private String notes;
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 并网操作日志
+ *
+ * @author system_generator
+ * @date 2024-09-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="ConstructionGirdRecordsDto", description="并网操作日志")
+public class ConstructionGirdRecordsDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "操作人")
+    private String operator;
+
+    @ApiModelProperty(value = "操作内容")
+    private String operationContent;
+
+    @ApiModelProperty(value = "操作时间")
+    private Date operationTime;
+
+    @ApiModelProperty(value = "操作结果")
+    private String operationResults;
+
+    @ApiModelProperty(value = "施工单id")
+    private Long gridId;
+
+    @ApiModelProperty(value = "施工电站")
+    private Long workOrderPowerStationId;
+
+    @ApiModelProperty(value = "农户id")
+    private Long peasantHouseholdId;
+
+    @ApiModelProperty(value = "备注")
+    private String notes;
+
+}

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

@@ -16,4 +16,10 @@ public class DropDown {
 
     @ApiModelProperty(value = "单位名称")
     private String name;
+
+    @ApiModelProperty(value = "单位名称+单位id")
+    private String text;
+
+    @ApiModelProperty(value = "单位名称+单位id")
+    private String id;
 }

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

 package com.yeejoin.amos.boot.module.hygf.api.dto;
 
+import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.alibaba.fastjson.support.spring.annotation.FastJsonFilter;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
- * 
- *
  * @author system_generator
  * @date 2024-04-01
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="FinancingInfoDto", description="")
+@ApiModel(value = "FinancingInfoDto", description = "")
 public class FinancingInfoDto extends BaseDto {
 
     private static final long serialVersionUID = 1L;
@@ -37,6 +39,9 @@ public class FinancingInfoDto  extends BaseDto {
     @ApiModelProperty(value = "农户id")
     private Long peasantHouseholdId;
 
+    @ApiModelProperty(value = "区域公司Id")
+    private Long regionalCompaniesSeq;
+
     @ApiModelProperty(value = "放款时间")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
     private Date disbursementTime;
@@ -55,7 +60,14 @@ public class FinancingInfoDto  extends BaseDto {
 
     private String instanceId;
 
+    @ApiModelProperty(value = "批次号")
+    private String batchNo;
+
     @ApiModelProperty(value = "附件")
     private List<Object> files;
 
+    @ApiModelProperty(value = "单价")
+    private String unitPrice;
+
+    List<PeasantHousehold> peasantHouseholds;
 }

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 融资机构区域公司绑定表
+ *
+ * @author system_generator
+ * @date 2024-09-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="FinancingRegionalDto", description="融资机构区域公司绑定表")
+public class FinancingRegionalDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "区域公司id")
+    private String regionalCompaniesName;
+
+    @ApiModelProperty(value = "区域公司名称")
+    private String regionalCompaniesSeq;
+
+    @ApiModelProperty(value = "区域公司名称")
+    private String regionalCompaniesCode;
+
+    @ApiModelProperty(value = "融资机构id")
+    private String financingId;
+
+    @ApiModelProperty(value = "融资机构名称")
+    private String financingName;
+
+    private List<String> financing;
+
+    private List<String>  regionalCompanies;
+
+    @ApiModelProperty(value = "省份")
+    private String province;
+
+}

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

@@ -47,4 +47,7 @@ public class HouseholdContractPageDto extends Page<HouseholdContract> {
 
     private String userId;
     private String contractNumber;
+    private String regionalCompaniesName;
+    //省份
+    private String province;
 }

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2024-07-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="HygfContractCallRecordDto", description="")
+public class HygfContractCallRecordDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    private String contractId;
+
+    private String data;
+
+    private String status;
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * (hygf_icbc_record)实体类
+ *
+ * @author yangyang
+ * @description
+ * @since 2024-07-18 11:40:46
+ */
+@Data
+@NoArgsConstructor
+@ApiModel (value = "HygfIcbcRecordDTO", description = "聚富通钱包开户DTO")
+public class HygfIcbcRecordDTO  {
+
+    private static final long serialVersionUID = 1L;
+
+    protected Long sequenceNbr;
+
+    @ApiModelProperty (value = "农户姓名")
+    private String custName;
+    /**
+     * 身份证号
+     */
+    @ApiModelProperty (value = "身份证号")
+    private String idCard;
+    /**
+     * 手机号码
+     */
+    @ApiModelProperty (value = "手机号码")
+    private String phone;
+    /**
+     * 聚富通电子账户账号
+     */
+    @ApiModelProperty (value = "聚富通电子账户账")
+    private String mediumId;
+    /**
+     * 项目编号
+     */
+    @ApiModelProperty (value = "项目编号")
+    private String projectId;
+    /**
+     * 开户状态, 00-初始，01-开户中，02-开户成功，03-开户失败
+     */
+    @ApiModelProperty (value = "开户状态, 00-初始，01-开户中，02-开户成功，03-开户失败")
+    private String openAccountStatus;
+
+    @ApiModelProperty (value = "开户状态Name")
+    private String openAccountStatusName;
+    /**
+     * 协议状态, 0-未生效，1-已生效，2-过期，3-作废，4-待短信确认
+     */
+    @ApiModelProperty (value = "协议状态, 0-未生效，1-已生效，2-过期，3-作废，4-待短信确认")
+    private String protocolStatus;
+
+    @ApiModelProperty (value = "协议状态Name")
+    private String protocolStatusName;
+    /**
+     * 协议开始日期
+     */
+    @ApiModelProperty (value = "协议开始日期")
+    private String protocolStartTime;
+    /**
+     * 协议终止日期
+     */
+    @ApiModelProperty (value = "协议终止日期")
+    private String protocolEndTime;
+    /**
+     * 单笔限额
+     */
+    @ApiModelProperty (value = "单笔限额")
+    private String trxLimitAmount;
+    /**
+     * 日累计限额
+     */
+    @ApiModelProperty (value = "日累计限额")
+    private String dayLimitAmount;
+    /**
+     * 协议总限额
+     */
+    @ApiModelProperty (value = "协议总限额")
+    private String protocolLimitAmount;
+    /**
+     * 合作方 appid
+     */
+    @ApiModelProperty (value = "合作方 appid")
+    private String appId;
+    /**
+     * 外部用户编号
+     */
+    @ApiModelProperty (value = "外部用户编号")
+    private String outUserId;
+    /**
+     * 企业外系统编号
+     */
+    @ApiModelProperty (value = "企业外系统编号")
+    private String outVendorId;
+    /**
+     * signEntrsutPrtlStatus
+     */
+    @ApiModelProperty (value = "signEntrsutPrtlStatus")
+    private String signEntrsutPrtlStatus;
+    /**
+     * 作废申请状态
+     */
+    @ApiModelProperty (value = "作废申请状态")
+    private String discardStatus;
+
+    @ApiModelProperty(value = "农户id")
+    private String amosUserId;
+
+    @ApiModelProperty(value = "电站信息")
+    private List<IcbcPeasantHousehold> peasantHouseholds;
+
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class IcbcPeasantHousehold {
+        /**
+         * 农户信息编号
+         */
+        @ApiModelProperty(value = "农户信息编号")
+        private String peasantHouseholdNo;
+        /**
+         * 项目地址
+         */
+        @ApiModelProperty(value = "项目地址")
+        private List<Integer> projectAddress;
+        /**
+         * 项目地址
+         */
+        @ApiModelProperty(value = "项目地址")
+        private String projectAddressName;
+        /*
+         * 区域公司id
+         * */
+        @ApiModelProperty(value = "区域公司id")
+        private Long regionalCompaniesSeq;
+        /*
+         * 区域公司code
+         * */
+        @ApiModelProperty(value = "区域公司code")
+        private String regionalCompaniesCode;
+        /*
+         * 区域公司名称
+         * */
+        @ApiModelProperty(value = "区域公司名称")
+        private String regionalCompaniesName;
+
+        /*
+         * 商务信息-电站安装规模
+         * */
+        @ApiModelProperty(value = "电站安装规模(kW)")
+        private String scale;
+
+        @ApiModelProperty(value = "实际安装规模(kW)")
+        private String realScale;
+    }
+
+}
\ No newline at end of file

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * <p>
+ * ProjectName: amos-boot-zx-biz
+ * PackageName: com.yeejoin.amos.boot.module.hygf.api.dto
+ *
+ * @author yangyang
+ * @version v1.0
+ * @date 2024/7/18 14:36
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class HygfIcbcRecordQueryDTO {
+
+    @ApiModelProperty (value = "开户状态, 00-初始，01-开户中，02-开户成功，03-开户失败")
+    private String openAccountStatus;
+
+    @ApiModelProperty (value = "农户姓名")
+    private String custName;
+
+    @ApiModelProperty (value = "身份证号")
+    private String idCard;
+
+    @ApiModelProperty (value = "手机号码")
+    private String phone;
+
+    @ApiModelProperty (value = "区域公司")
+    private String regionalCompaniesName;
+
+    @ApiModelProperty (value = "所属地址")
+    private String addressName;
+
+    private Integer current;
+
+    private Integer size;
+
+    private Integer limit;
+
+    private Integer offset;
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 审核单
+ *
+ * @author system_generator
+ * @date 2024-08-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "HygfRectificationOrderDto", description = "审核单")
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class HygfRectificationOrderDto extends BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "农户姓名")
+    private String peasantHouseholeName;
+
+    @ApiModelProperty(value = "农户编号")
+    private String peasantHouseholeCode;
+
+    @ApiModelProperty(value = "农户场站id")
+    private String peasantHouseholeId;
+
+    @ApiModelProperty(value = "整改项")
+    private List<Object> rectificationIdea;
+
+    @ApiModelProperty(value = "农户项目地址")
+    private String projectAddressName;
+
+    @ApiModelProperty(value = "整改附件")
+    private List<Object> rectificationFile;
+
+    @ApiModelProperty(value = "整改结果附件")
+    private List<Object> resultFile;
+
+    @ApiModelProperty(value = "整改结果")
+    private List<Object> rectificationResult;
+
+
+    @ApiModelProperty(value = "审核意见")
+    private String auditIdea;
+
+    @ApiModelProperty(value = "审核结果")
+    private String auditResult;
+
+
+    /**
+     * 整改类型
+     */
+    private String rectificationType;
+
+
+    /**
+     * 整改来源
+     */
+    private String rectificationSource;
+
+
+    /**
+     * 整改历史意见
+     */
+    private List<Object> rectificationHistory;
+    @ApiModelProperty(value = "整改结果-施工信息展示用")
+    private String rectificationResultWeb;
+    @ApiModelProperty(value = "整改历史意见-施工信息展示用")
+    private String rectificationHistoryWeb;
+    @ApiModelProperty(value = "整改项-施工信息展示用")
+    private String rectificationIdeaWeb;
+
+    /**
+     * 负责人
+     */
+    private String projectRegionManager;
+
+}

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

 package com.yeejoin.amos.boot.module.hygf.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 
@@ -25,7 +28,7 @@ public class HygfReplenishmentDto  extends BaseDto {
     private Long preparationMoneyId;
 
     @ApiModelProperty(value = "补货描述")
-    private String desc;
+    private String comment;
 
     @ApiModelProperty(value = "补货文件")
     private String file;

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 施工完工审核表
+ *
+ * @author system_generator
+ * @date 2024-08-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="HygfWorkOrderStationAuditingDto", description="施工完工审核表")
+public class HygfWorkOrderStationAuditingDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "工作流实例ID")
+    private String instanceId;
+
+    @ApiModelProperty(value = "下一个节点角色权限id")
+    private String nextExecutorIds;
+
+    @ApiModelProperty(value = "任务发起人id")
+    private String promoter;
+
+    @ApiModelProperty(value = "流程下一节点id")
+    private String nextTaskId;
+
+    @ApiModelProperty(value = "下一节点可执行人逗号分割")
+    private String nextExecuteUserIds;
+
+    @ApiModelProperty(value = "工作流发起人id")
+    private String createUserId;
+
+    @ApiModelProperty(value = "下个节点名称")
+    private String nextNodeName;
+
+    @ApiModelProperty(value = "下个节点key")
+    private String nextNodeKey;
+
+    @ApiModelProperty(value = "状态")
+    private String status;
+
+    @ApiModelProperty(value = "施工电站id")
+    private Long workOrderPowerStationId;
+
+    @ApiModelProperty(value = " 待执行节点小程序路由")
+    private String nodeRouting;
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+
+
+public class IdsDTO {
+    private List<Long> ids;
+
+    public List<Long> getIds() {
+        return ids;
+    }
+
+    public void setIds(List<Long> ids) {
+        this.ids = ids;
+    }
+}
\ No newline at end of file

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

@@ -5,6 +5,12 @@ import lombok.Data;
 
 @Data
 public class PeasantHouseholdPageDto extends Page<PeasantHouseholdPageDto> {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 	private String nhUserId;
     private String peasantHouseholdNo;
+    private String regionalCompaniesName;
+    private String developerName;
 }

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

@@ -94,4 +94,11 @@ public class PowerStationDto  extends BaseDto {
     
     @ApiModelProperty(value = "合同状态")
     private String status;
+
+    @ApiModelProperty(value = "电站安装规模")
+    private String scale;
+    @ApiModelProperty(value = "电站实际规模")
+    private String realScale;
+    @ApiModelProperty(value = "省份")
+    private String province;
 }

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

@@ -14,11 +14,17 @@ public class PowerStationEngineeringInfoAllDto {
 
     //并网验收审核记录
     LoggerDto loggerDto;
+    //验收审核记录
+    LoggerDto loggerYsDto;
 
     //自审信息
 
     ConstructionRecords constructionRecords;
 
+    ConstructionGirdRecords constructionGirdRecords;
+
+    ConstructionAcceptanceRecords acceptanceRecords;
+
     // 基本信息
     SurveyInformationDto surveyInformation;
 
@@ -58,4 +64,13 @@ public class PowerStationEngineeringInfoAllDto {
     //派工单信息
 
     WorkOrder workOrder;
+    
+    //验收信息
+
+    AcceptanceCheck acceptanceCheck;
+    //保存标识 0 保存 1保存并提交
+    Integer commitFlag;
+
+    //流程类型 0 并网 1是验收
+    Integer flowType;
 }

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

@@ -22,4 +22,5 @@ public class PreparationDto {
     String deliveryTimeStart;
     String deliveryTimeEnd;
     String flag ;
+    String orderStatus;
 }

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

@@ -29,5 +29,6 @@ public class PreparationPageDto extends Page<PreparationMoney> {
     String deliveryTimeStart;
     String deliveryTimeEnd;
     String flag ;
+    String orderStatus;
 
 }

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 施工完工审核表
+ *
+ * @author system_generator
+ * @date 2024-08-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="RectificationOrderAuditingDto", description="施工完工审核表")
+public class RectificationOrderAuditingDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "工作流实例ID")
+    private String instanceId;
+
+    @ApiModelProperty(value = "下一个节点角色权限id")
+    private String nextExecutorIds;
+
+    @ApiModelProperty(value = "任务发起人id")
+    private String promoter;
+
+    @ApiModelProperty(value = "流程下一节点id")
+    private String nextTaskId;
+
+    @ApiModelProperty(value = "下一节点可执行人逗号分割")
+    private String nextExecuteUserIds;
+
+    @ApiModelProperty(value = "工作流发起人id")
+    private String createUserId;
+
+    @ApiModelProperty(value = "下个节点名称")
+    private String nextNodeName;
+
+    @ApiModelProperty(value = "下个节点key")
+    private String nextNodeKey;
+
+    @ApiModelProperty(value = "状态")
+    private String status;
+
+    @ApiModelProperty(value = "施工电站id")
+    private Long rectificationOrder;
+
+    @ApiModelProperty(value = " 待执行节点小程序路由")
+    private String nodeRouting;
+
+}

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

@@ -47,6 +47,9 @@ public class SurveyInfoAllDto {
 
 
     //自审信息
-
     ConstructionRecords constructionRecords;
+    
+    //验收信息
+
+    AcceptanceCheck acceptanceCheck;
 }

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

@@ -29,4 +29,14 @@ public class UserDataJBDto {
     private String nowAddress;
     private String politicalOutlook;
     private String nativePlace;
+    /**
+     * 是否有业务操作
+     */
+    private Boolean hasOperationRecords;
+    /**
+     * 是否允许修改
+     */
+    private String unallowModify;
+
+    private String pageType;
     }

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

@@ -16,4 +16,12 @@ public class UserDataZHDto {
     private String  password;
     private String  rePassword;
     private List<Long> role;
+    /**
+     * 是否有业务操作
+     */
+    private Boolean hasOperationRecords;
+    /**
+     * 是否允许修改
+     */
+    private String unallowModify;
 }

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @description:
@@ -47,6 +48,8 @@ public class WorkOrderPage {
 
     @ApiModelProperty(value = "派工电站id")
     protected Long workOrderPowerStationId;
+    @ApiModelProperty(value = "派工电站节点标识")
+    protected String workOrderPowerStationNode;
 
     @ApiModelProperty(value = "派工单id")
     protected String workOrderId;
@@ -58,9 +61,33 @@ public class WorkOrderPage {
     @ApiModelProperty(value = "平台经销商单位id")
     private Long amosDealerId;
 
-    private String  type ;
-
+    private String  type;
+    @ApiModelProperty(value = "片区审核")
+    private String  powerStationAreaStatus ;
+    @ApiModelProperty(value = "设计审核")
+    private String  powerStationDesignStatus ;
+    @ApiModelProperty(value = "工程审核")
+    private String  powerStationEngineeringStatus ;
+    @ApiModelProperty(value = "判断是否有进行中的整改单数量")
+    private Long  rectificationNum ;
+    @ApiModelProperty(value = "最后一条作废整改单id")
+    private Long  rollbackOrderId ;
     int current;
     int size;
-
+    @ApiModelProperty(value = "数据过滤标识")
+    private List<String> workOrderPowerStationNodes ;
+    @ApiModelProperty(value = "判断是否可以审核,默认不可以")
+    private String  isAudit ;
+
+    @ApiModelProperty(value = "历史审核意见")
+    private String  auditIdea ;
+    @ApiModelProperty(value = "实例id")
+    private String  instanceId ;
+
+    @ApiModelProperty(value = "电站安装规模")
+    private String  scale ;
+    @ApiModelProperty(value = "电站实际规模")
+    private String  realScale ;
+    
+    private String province;
 }

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

+package com.yeejoin.amos.boot.module.hygf.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 并网验收节点
+ *
+ * @author system_generator
+ * @date 2024-08-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("hygf_acceptance_check")
+public class AcceptanceCheck extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 施工单id
+     */
+	@TableField("work_order_id")
+    private Long workOrderId;
+
+    /**
+     * 施工电站id
+     */
+	@TableField("work_order_power_station_id")
+    private Long workOrderPowerStationId;
+
+    /**
+     * 农户id
+     */
+	@TableField("peasant_household_id")
+    private Long peasantHouseholdId;
+
+    /**
+     * 验收状态
+     */
+	@TableField("acceptance_check_status")
+    private String acceptanceCheckStatus;
+
+    /**
+     * 节点标识
+     */
+	@TableField("basic_grid_node")
+    private String basicGridNode;
+
+    /**
+     * 片区审核
+     */
+	@TableField("power_station_area_status")
+    private String powerStationAreaStatus;
+
+    /**
+     * 法务审核
+     */
+	@TableField("power_station_legal_status")
+    private String powerStationLegalStatus;
+
+    /**
+     * 投融审核
+     */
+	@TableField("power_station_financing_status")
+    private String powerStationFinancingStatus;
+	/**
+     * 资产审核
+     */
+	@TableField("power_station_assets_status")
+    private String powerStationAssetsStatus;
+
+    /**
+     * 实例id
+     */
+	@TableField("instance_Id")
+    private String instanceId;
+
+    /**
+     * 整改单状态
+     */
+    @TableField("rectification_status")
+    private String rectificationStatus;
+
+
+    /**
+     * 验收时间
+     */
+    @TableField("acceptance_time")
+    private String acceptanceTime;
+
+    
+    /**
+     * 片区整改单
+     */
+    @TableField(exist = false)
+    private List<HygfRectificationOrder>  areaOrders;
+    
+    /**
+     * 投融整改单
+     */
+    @TableField(exist = false)
+    private List<HygfRectificationOrder>  financeOrders;
+    
+    /**
+     * 法务整改单
+     */
+    @TableField(exist = false)
+    private List<HygfRectificationOrder>  legalOrders;
+
+    /**
+     * 资产整改单
+     */
+    @TableField(exist = false)
+    private List<HygfRectificationOrder>  propertyOrders;
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 并网审核表
+ *
+ * @author system_generator
+ * @date 2024-08-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("hygf_acceptance_check_auditing")
+public class AcceptanceCheckAuditing extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 工作流实例ID
+     */
+	@TableField("instance_id")
+    private String instanceId;
+
+    /**
+     * 下一个节点角色权限id
+     */
+	@TableField("next_executor_ids")
+    private String nextExecutorIds;
+
+    /**
+     * 任务发起人id
+     */
+	@TableField("promoter")
+    private String promoter;
+
+    /**
+     * 流程下一节点id
+     */
+	@TableField("next_task_id")
+    private String nextTaskId;
+
+    /**
+     * 下一节点可执行人逗号分割
+     */
+	@TableField("next_execute_user_ids")
+    private String nextExecuteUserIds;
+
+    /**
+     * 工作流发起人id
+     */
+	@TableField("create_user_id")
+    private String createUserId;
+
+    /**
+     * 下个节点名称
+     */
+	@TableField("next_node_name")
+    private String nextNodeName;
+
+    /**
+     * 下个节点key
+     */
+	@TableField("next_node_key")
+    private String nextNodeKey;
+
+    /**
+     * 状态
+     */
+	@TableField("status")
+    private String status;
+
+    /**
+     * 验收id
+     */
+	@TableField("peasant_household_id")
+    private Long peasantHouseholdId;
+
+    /**
+     *  待执行节点小程序路由
+     */
+	@TableField("node_routing")
+    private String nodeRouting;
+
+}