Skip to content

A
amos-boot-zx-biz
Commit 72ed926c authored by wujiang's avatar wujiang
Browse files
Options

Merge branch 'developer' of http://39.100.92.250:5000/moa/jxdj_zx/amos-boot-zx-biz into developer

# Conflicts: # amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/LargeScreenImpl.java
parents 133c0b67 6637e31f
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2750 additions and 367 deletions
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/dto/BaseDto.java
View file @ 72ed926c
package com.yeejoin.amos.boot.biz.common.dto;
import com.alibaba.excel.annotation.ExcelIgnore;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -13,6 +14,7 @@ import java.util.Date;
*
*/
@Data
@ApiModel(value = "BaseDto",description = "实体类")
public class BaseDto implements Serializable{
/**
*
......@@ -21,23 +23,23 @@ public class BaseDto implements Serializable{
private static final long serialVersionUID = 1L;
@ExcelIgnore
@ApiModelProperty(value = "主键ID")
@ApiModelProperty(value = "主键ID",example = "1779438242769170434")
protected Long sequenceNbr;
@ExcelIgnore
@ApiModelProperty(value = "更新时间")
@ApiModelProperty(value = "更新时间",example = "2024-05-06 09:54:29")
protected Date recDate;
@ExcelIgnore
@ApiModelProperty(value = "更新人id")
@ApiModelProperty(value = "更新人id",example = "6790510")
protected String recUserId;
@ExcelIgnore
@ApiModelProperty(value = "更新人")
@ApiModelProperty(value = "更新人",example = "admin")
protected String recUserName;
@ExcelIgnore
@ApiModelProperty(value = "是否删除")
@ApiModelProperty(value = "是否删除",example = "false")
private Boolean isDelete=false;
......
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/entity/BaseEntity.java
View file @ 72ed926c
......@@ -5,6 +5,8 @@ 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 io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.ibatis.type.BigDecimalTypeHandler;
import org.apache.ibatis.type.BigIntegerTypeHandler;
......@@ -18,25 +20,27 @@ import java.util.Date;
* @author DELL
*/
@Data
@ApiModel(value = "BaseEntity",description = "基础实体类")
public class BaseEntity implements Serializable{
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "主键",example = "1712049025391267842")
@TableId(value = "sequence_nbr", type = IdType.ID_WORKER)
protected Long sequenceNbr;
@ApiModelProperty(value = "创建日期",example = "2023-10-11 18:20:51")
@TableField(value = "rec_date", fill = FieldFill.INSERT_UPDATE)
protected Date recDate;
@ApiModelProperty(value = "创建人ID",example = "5606165")
@TableField(value = "rec_user_id", fill = FieldFill.INSERT_UPDATE)
protected String recUserId;
@ApiModelProperty(value = "创建人",example = "admin")
@TableField(value = "rec_user_name", fill = FieldFill.INSERT_UPDATE)
protected String recUserName;
/**
* 是否删除
*/
@ApiModelProperty(value = "是否删除",example = "false")
@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
View file @ 72ed926c
......@@ -181,11 +181,38 @@ public class DateUtils {
if (StringUtils.isEmpty(pattern)) {
pattern = DateUtils.DATE_PATTERN;
}
if(Objects.isNull(date)){
return null;
}
SimpleDateFormat sdf = new SimpleDateFormat(pattern);
return sdf.format(date);
}
/**
* 时间格式字符串化成标准字符串 2024-05-23T14:19:05.432 => 2024-05-23 14:19:05
*
* @param dateString Date
* @return
* @throws ParseException
*/
public static Object dateStringFormat(Object dateString){
if(Objects.isNull(dateString)){
return null;
}
try {
// 转换为 LocalDateTime
LocalDateTime localDateTime = LocalDateTime.parse(String.valueOf(dateString));
// 转换为 Date
Date date = Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant());
SimpleDateFormat sdf = new SimpleDateFormat(DATE_TIME_PATTERN);
return sdf.format(date);
}catch (Exception e){
return dateString;
}
}
/**
* 暂时不操作原生截取做下转换
*
* @param str
......
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/ExcelUtils.java
View file @ 72ed926c
......@@ -7,7 +7,7 @@ import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.ImportParams;
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.ss.usermodel.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.ObjectUtils;
......@@ -70,6 +70,45 @@ public class ExcelUtils {
* excel 导出
*
* @param list 数据
* @param title 标题
* @param sheetName sheet名称
* @param pojoClass pojo类型
* @param fileName 文件名称
* @param response
*/
public static void exportExcelDefaultGroundColor(List<?> list, String title, String sheetName, Class<?> pojoClass, String fileName,
HttpServletResponse response) {
ExportParams exportParams = new ExportParams(title, sheetName);
Workbook workbook = ExcelExportUtil.exportExcel(exportParams, pojoClass, list);
if (workbook != null) {
// 设置表头样式
Sheet sheet = workbook.getSheetAt(0);
Row headerRow = sheet.getRow(0);
if (headerRow != null) {
CellStyle headerStyle = workbook.createCellStyle();
Font font = workbook.createFont();
font.setBold(true); // 加粗
headerStyle.setFont(font);
headerStyle.setFillForegroundColor(IndexedColors.SKY_BLUE.getIndex()); // 背景色
headerStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND); // 填充模式
// 设置居中对齐
headerStyle.setAlignment(HorizontalAlignment.CENTER);
headerStyle.setVerticalAlignment(VerticalAlignment.CENTER);
// 设置表头每个单元格的样式
for (int i = 0; i < headerRow.getPhysicalNumberOfCells(); i++) {
Cell cell = headerRow.getCell(i);
if (cell != null) {
cell.setCellStyle(headerStyle);
}
}
}
downLoadExcel(fileName, response, workbook);
}
}
/**
* excel 导出
*
* @param list 数据
* @param fileName 文件名称
* @param response
*/
......
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/MyBatisPlusCodeGenerator.java
View file @ 72ed926c
......@@ -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-data/amos-boot-data-equip/src/main/resources/application-kingbase8.properties
View file @ 72ed926c
......@@ -52,7 +52,7 @@ eureka.instance.status-page-url-path=/actuator/info
eureka.instance.metadata-map.management.api-docs=http://localhost:${server.port}${server.servlet.context-path}/doc.html
eureka.instance.hostname= 172.17.3.6
eureka.instance.prefer-ip-address = true
eureka.client.serviceUrl.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@10.20.1.160:10001/eureka/
eureka.client.serviceUrl.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@47.92.234.253:10001/eureka/
spring.security.user.name=admin
spring.security.user.password=a1234560
......
amos-boot-data/amos-boot-data-housepvapi/pom.xml
View file @ 72ed926c
......@@ -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
View file @ 72ed926c
......@@ -4,13 +4,15 @@ import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.http.HttpUtil;
import cn.hutool.log.Log;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
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.houseapi.entity.houseapi.HYGFThirdStationLog;
import com.yeejoin.amos.api.householdapi.face.orm.mapper.houseapi.HousepvapiRecordsMapper;
import com.yeejoin.amos.api.householdapi.face.service.IHYGFThirdStationLogService;
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;
......@@ -24,7 +26,8 @@ public class GolangRequestUtil {
@Autowired
HousepvapiRecordsMapper housepvapiRecordsMapper;
@Autowired
IHYGFThirdStationLogService thirdStationLogService;
/**
* @return HashMap<String, Object> 发送请求前的准备 准备header信息
* @deprecated 根据厂商编码获取厂商的hearer
......@@ -43,6 +46,72 @@ 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));
}
//存储日志
HYGFThirdStationLog hygfThirdStationLog = new HYGFThirdStationLog();
hygfThirdStationLog.setThirdCode(PVProducerInfoEnum.JLY.getCode());
hygfThirdStationLog.setReqMethod(requestMethod);
hygfThirdStationLog.setReqHeaders(headMap.toString());
hygfThirdStationLog.setReqPath(url);
hygfThirdStationLog.setReqBody(requestParmInfo);
hygfThirdStationLog.setResBody(respone);
thirdStationLogService.saveLog(hygfThirdStationLog);
//处理其他页数的数据
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 请求方式
......@@ -71,6 +140,15 @@ public class GolangRequestUtil {
if (!ObjectUtils.isEmpty(jsonArray)) {
result = JSONArray.parseArray(jsonArray.toJSONString(), tClass);
}
//存储日志
HYGFThirdStationLog hygfThirdStationLog = new HYGFThirdStationLog();
hygfThirdStationLog.setThirdCode(PVProducerInfoEnum.JLY.getCode());
hygfThirdStationLog.setReqMethod(requestMethod);
hygfThirdStationLog.setReqHeaders(headMap.toString());
hygfThirdStationLog.setReqPath(url);
hygfThirdStationLog.setReqBody(requestParmInfo);
hygfThirdStationLog.setResBody(respone);
thirdStationLogService.saveLog(hygfThirdStationLog);
} catch (Exception exception) {
return result;
}
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/Utils/GoodWeRequestUtil.java
View file @ 72ed926c
......@@ -6,6 +6,9 @@ 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.face.orm.houseapi.entity.houseapi.HYGFThirdStationLog;
import com.yeejoin.amos.api.householdapi.face.service.IHYGFThirdStationLogService;
import com.yeejoin.amos.openapi.enums.PVProducerInfoEnum;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;
......@@ -18,7 +21,8 @@ public class GoodWeRequestUtil {
@Autowired
private RedisUtils redisUtils;
@Autowired
IHYGFThirdStationLogService thirdStationLogService;
/**
* @return HashMap<String, Object> 发送请求前的准备 准备header信息
* @deprecated 根据厂商编码获取厂商的hearer
......@@ -46,6 +50,64 @@ 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));
}
//存储日志
HYGFThirdStationLog hygfThirdStationLog = new HYGFThirdStationLog();
hygfThirdStationLog.setThirdCode(PVProducerInfoEnum.GDW.getCode());
hygfThirdStationLog.setReqMethod(requestMethod);
hygfThirdStationLog.setReqHeaders(headMap.toString());
hygfThirdStationLog.setReqPath(url);
hygfThirdStationLog.setReqBody(requestParmInfo);
hygfThirdStationLog.setResBody(respone);
thirdStationLogService.saveLog(hygfThirdStationLog);
//处理其他页数的数据
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,10 +128,24 @@ 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);
}
//存储日志
HYGFThirdStationLog hygfThirdStationLog = new HYGFThirdStationLog();
hygfThirdStationLog.setThirdCode(PVProducerInfoEnum.GDW.getCode());
hygfThirdStationLog.setReqMethod(requestMethod);
hygfThirdStationLog.setReqHeaders(headMap.toString());
hygfThirdStationLog.setReqPath(url);
hygfThirdStationLog.setReqBody(requestParmInfo);
hygfThirdStationLog.setResBody(respone);
thirdStationLogService.saveLog(hygfThirdStationLog);
} catch (Exception exception) {
return result;
}
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/Utils/ImasterUtils.java
View file @ 72ed926c
......@@ -10,8 +10,9 @@ import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.api.householdapi.constant.ImasterConstant;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.houseapi.HousepvapiRecords;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.houseapi.HYGFThirdStationLog;
import com.yeejoin.amos.api.householdapi.face.orm.mapper.houseapi.HousepvapiRecordsMapper;
import com.yeejoin.amos.api.householdapi.face.service.impl.GoodWeDataAcquisitionServiceImpl;
import com.yeejoin.amos.api.householdapi.face.service.IHYGFThirdStationLogService;
import com.yeejoin.amos.openapi.enums.PVProducerInfoEnum;
import lombok.extern.slf4j.Slf4j;
......@@ -33,6 +34,8 @@ public class ImasterUtils {
HousepvapiRecordsMapper housepvapiRecordsMapper;
@Autowired
RedisUtils redisUtils;
@Autowired
IHYGFThirdStationLogService thirdStationLogService;
final static Logger logger = LoggerFactory.getLogger(ImasterUtils.class);
......@@ -96,6 +99,15 @@ public class ImasterUtils {
result = JSONArray.parseArray(jsonArray.toJSONString(), tClass);
}
}
//存储日志
HYGFThirdStationLog hygfThirdStationLog = new HYGFThirdStationLog();
hygfThirdStationLog.setThirdCode(PVProducerInfoEnum.HUAWEI.getCode());
hygfThirdStationLog.setReqMethod(requestMethod);
hygfThirdStationLog.setReqHeaders(headMap.toString());
hygfThirdStationLog.setReqPath(url);
hygfThirdStationLog.setReqBody(requestParmInfo);
hygfThirdStationLog.setResBody(respone);
thirdStationLogService.saveLog(hygfThirdStationLog);
} else {
HashMap<String, String> headMap = getHeader();
String url = ImasterConstant.baseurl + apiurl;
......@@ -105,6 +117,15 @@ public class ImasterUtils {
result = JSONArray.parseArray(jsonArray.toJSONString(), tClass);
redisUtils.set(redisKey, headMap.get("XSRF-TOKEN"));
}
//存储日志
HYGFThirdStationLog hygfThirdStationLog = new HYGFThirdStationLog();
hygfThirdStationLog.setThirdCode(PVProducerInfoEnum.HUAWEI.getCode());
hygfThirdStationLog.setReqMethod(requestMethod);
hygfThirdStationLog.setReqHeaders(headMap.toString());
hygfThirdStationLog.setReqPath(url);
hygfThirdStationLog.setReqBody(requestParmInfo);
hygfThirdStationLog.setResBody(respone);
thirdStationLogService.saveLog(hygfThirdStationLog);
}
} catch (Exception exception) {
return result;
......@@ -155,6 +176,15 @@ public class ImasterUtils {
}
}
}
//存储日志
HYGFThirdStationLog hygfThirdStationLog = new HYGFThirdStationLog();
hygfThirdStationLog.setThirdCode(PVProducerInfoEnum.HUAWEI.getCode());
hygfThirdStationLog.setReqMethod(requestMethod);
hygfThirdStationLog.setReqHeaders(headMap.toString());
hygfThirdStationLog.setReqPath(url);
hygfThirdStationLog.setReqBody(requestParmInfo);
hygfThirdStationLog.setResBody(respone);
thirdStationLogService.saveLog(hygfThirdStationLog);
} else {
HashMap<String, String> headMap = getHeader();
String url = ImasterConstant.baseurl + apiurl;
......@@ -164,6 +194,15 @@ public class ImasterUtils {
result = JSONArray.parseArray(jsonArray.toJSONString(), tClass);
redisUtils.set(redisKey, headMap.get("XSRF-TOKEN"));
}
//存储日志
HYGFThirdStationLog hygfThirdStationLog = new HYGFThirdStationLog();
hygfThirdStationLog.setThirdCode(PVProducerInfoEnum.HUAWEI.getCode());
hygfThirdStationLog.setReqMethod(requestMethod);
hygfThirdStationLog.setReqHeaders(headMap.toString());
hygfThirdStationLog.setReqPath(url);
hygfThirdStationLog.setReqBody(requestParmInfo);
hygfThirdStationLog.setResBody(respone);
thirdStationLogService.saveLog(hygfThirdStationLog);
}
} catch (Exception exception) {
exception.printStackTrace();
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/Utils/KsolarRequestUtil.java
View file @ 72ed926c
......@@ -2,16 +2,15 @@ package com.yeejoin.amos.api.householdapi.Utils;
import cn.hutool.core.util.ObjectUtil;
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.GoLangConstant;
import com.yeejoin.amos.api.householdapi.constant.KSolarConstant;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.houseapi.HousepvapiRecords;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.houseapi.HYGFThirdStationLog;
import com.yeejoin.amos.api.householdapi.face.orm.mapper.houseapi.HousepvapiRecordsMapper;
import com.yeejoin.amos.api.householdapi.face.service.IHYGFThirdStationLogService;
import com.yeejoin.amos.openapi.enums.PVProducerInfoEnum;
import lombok.extern.slf4j.Slf4j;
import org.bouncycastle.jcajce.provider.symmetric.AES;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;
......@@ -25,7 +24,8 @@ public class KsolarRequestUtil {
@Autowired
HousepvapiRecordsMapper housepvapiRecordsMapper;
@Autowired
IHYGFThirdStationLogService thirdStationLogService;
/**
* @return HashMap<String, Object> 发送请求前的准备 准备header信息
* @deprecated 根据厂商编码获取厂商的hearer
......@@ -74,6 +74,15 @@ public class KsolarRequestUtil {
if (!ObjectUtils.isEmpty(jsonArray)) {
result = JSONArray.parseArray(jsonArray.toJSONString(), tClass);
}
//存储日志
HYGFThirdStationLog hygfThirdStationLog = new HYGFThirdStationLog();
hygfThirdStationLog.setThirdCode(PVProducerInfoEnum.KSOLAR.getCode());
hygfThirdStationLog.setReqMethod(requestMethod);
hygfThirdStationLog.setReqHeaders(headMap.toString());
hygfThirdStationLog.setReqPath(url);
hygfThirdStationLog.setReqBody(requestParmInfo);
hygfThirdStationLog.setResBody(respone);
thirdStationLogService.saveLog(hygfThirdStationLog);
} catch (Exception exception) {
return result;
}
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/Utils/SofarRequestUtil.java
View file @ 72ed926c
......@@ -5,16 +5,17 @@ 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 com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.houseapi.HYGFThirdStationLog;
import com.yeejoin.amos.api.householdapi.face.service.IHYGFThirdStationLogService;
import com.yeejoin.amos.openapi.enums.PVProducerInfoEnum;
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
......@@ -57,6 +58,8 @@ public class SofarRequestUtil {
@Autowired
private RedisUtils redisUtils;
@Autowired
IHYGFThirdStationLogService thirdStationLogService;
/**
* @return HashMap<String, Object> 发送请求前的准备 准备header信息
......@@ -86,6 +89,63 @@ 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));
}
//存储日志
HYGFThirdStationLog hygfThirdStationLog = new HYGFThirdStationLog();
hygfThirdStationLog.setThirdCode(PVProducerInfoEnum.SH.getCode());
hygfThirdStationLog.setReqMethod(requestMethod);
hygfThirdStationLog.setReqHeaders(headMap.toString());
hygfThirdStationLog.setReqPath(url);
hygfThirdStationLog.setReqBody(requestParmInfo);
hygfThirdStationLog.setResBody(respone);
thirdStationLogService.saveLog(hygfThirdStationLog);
//处理其他页数的数据
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
......@@ -110,8 +170,18 @@ public class SofarRequestUtil {
result = JSONArray.parseArray(fastjson.JSON.toJSONString(jsonObject.get(ResultResolveRule)), tClass);
}
//存储日志
HYGFThirdStationLog hygfThirdStationLog = new HYGFThirdStationLog();
hygfThirdStationLog.setThirdCode(PVProducerInfoEnum.SH.getCode());
hygfThirdStationLog.setReqMethod(requestMethod);
hygfThirdStationLog.setReqHeaders(headMap.toString());
hygfThirdStationLog.setReqPath(url);
hygfThirdStationLog.setReqBody(requestParmInfo);
hygfThirdStationLog.setResBody(respone);
thirdStationLogService.saveLog(hygfThirdStationLog);
} catch (Exception exception) {
exception.printStackTrace();
return result;
}
return result;
}
......@@ -129,6 +199,15 @@ public class SofarRequestUtil {
}else{
jsonObject = JSONObject.parseObject(respone);
}
//存储日志
HYGFThirdStationLog hygfThirdStationLog = new HYGFThirdStationLog();
hygfThirdStationLog.setThirdCode(PVProducerInfoEnum.SH.getCode());
hygfThirdStationLog.setReqMethod(requestMethod);
hygfThirdStationLog.setReqHeaders(headMap.toString());
hygfThirdStationLog.setReqPath(url);
hygfThirdStationLog.setReqBody(requestParmInfo);
hygfThirdStationLog.setResBody(respone);
thirdStationLogService.saveLog(hygfThirdStationLog);
} catch (Exception exception) {
exception.printStackTrace();
}
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/Utils/SunlightUtil.java
View file @ 72ed926c
......@@ -6,23 +6,16 @@ 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.mapper.houseapi.HousepvapiRecordsMapper;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.houseapi.HYGFThirdStationLog;
import com.yeejoin.amos.api.householdapi.face.service.IHYGFThirdStationLogService;
import com.yeejoin.amos.openapi.enums.PVProducerInfoEnum;
import fastjson.JSON;
import lombok.extern.slf4j.Slf4j;
import org.apache.http.HttpEntity;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.HttpClients;
import org.apache.xmlbeans.impl.xb.xsdschema.Public;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import javax.naming.Name;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.HashMap;
import java.util.Map;
......@@ -153,6 +146,8 @@ public class SunlightUtil {
@Autowired
RedisUtils redisUtils;
@Autowired
IHYGFThirdStationLogService thirdStationLogService;
/*
*
......@@ -207,6 +202,69 @@ 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);
}
//存储日志
HYGFThirdStationLog hygfThirdStationLog = new HYGFThirdStationLog();
hygfThirdStationLog.setThirdCode(PVProducerInfoEnum.YG.getCode());
hygfThirdStationLog.setReqMethod(request.getMethod().toString());
hygfThirdStationLog.setReqHeaders(request.headers().toString());
hygfThirdStationLog.setReqPath(dfurl+url);
hygfThirdStationLog.setReqBody(body);
hygfThirdStationLog.setResBody(res);
thirdStationLogService.saveLog(hygfThirdStationLog);
//处理其他页数的数据
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;
}
//获取接口数据
......@@ -236,12 +294,19 @@ public class SunlightUtil {
JSONObject jsonObject = JSONUtil.parseObj(res, true);
JSONObject resultData = JSONUtil.parseObj(jsonObject.get("result_data"), true);
//存储日志
HYGFThirdStationLog hygfThirdStationLog = new HYGFThirdStationLog();
hygfThirdStationLog.setThirdCode(PVProducerInfoEnum.YG.getCode());
hygfThirdStationLog.setReqMethod(request.getMethod().toString());
hygfThirdStationLog.setReqHeaders(request.headers().toString());
hygfThirdStationLog.setReqPath(dfurl+url);
hygfThirdStationLog.setReqBody(body);
hygfThirdStationLog.setResBody(res);
thirdStationLogService.saveLog(hygfThirdStationLog);
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/Utils/TanYinApiUtils.java
View file @ 72ed926c
......@@ -10,9 +10,14 @@ import com.yeejoin.amos.api.householdapi.exception.BusinessException;
import com.yeejoin.amos.api.householdapi.face.dto.TanYinAccessTokenDTO;
import com.yeejoin.amos.api.householdapi.face.dto.TanYinBaseResultDTO;
import com.yeejoin.amos.api.householdapi.face.dto.TanYinPageResultDTO;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.houseapi.HYGFThirdStationLog;
import com.yeejoin.amos.api.householdapi.face.service.IHYGFThirdStationLogService;
import com.yeejoin.amos.openapi.enums.PVProducerInfoEnum;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpMethod;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Component;
......@@ -50,6 +55,9 @@ public class TanYinApiUtils {
@Resource (type = RedisUtils.class)
private RedisUtils redisUtils;
@Autowired
private IHYGFThirdStationLogService thirdStationLogService;
/**
* 获取 accessToken 接口
*
......@@ -118,6 +126,15 @@ public class TanYinApiUtils {
headers.put("Authorization", "Bearer " + getAccessToken(clientKey, clientSecret));
// 发送GET请求并获取响应。
response = HttpUtil.createGet(url).execute();
//存储日志
HYGFThirdStationLog hygfThirdStationLog = new HYGFThirdStationLog();
hygfThirdStationLog.setThirdCode(PVProducerInfoEnum.TANYIN.getCode());
hygfThirdStationLog.setReqMethod(HttpMethod.GET.name());
hygfThirdStationLog.setReqHeaders(headers.toString());
hygfThirdStationLog.setReqPath(url);
hygfThirdStationLog.setReqBody(null);
hygfThirdStationLog.setResBody(response.toString());
thirdStationLogService.saveLog(hygfThirdStationLog);
// 解析响应并返回结果。
return parseResponse(desc, response, resultClass);
} catch (BusinessException businessException) {
......@@ -166,6 +183,15 @@ public class TanYinApiUtils {
try {
// 发送POST请求，带上参数和headers，并执行。
response = HttpUtil.createPost(url).body(paramsJsonStr, MediaType.APPLICATION_JSON_UTF8_VALUE).headerMap(headers, true).execute();
//存储日志
HYGFThirdStationLog hygfThirdStationLog = new HYGFThirdStationLog();
hygfThirdStationLog.setThirdCode(PVProducerInfoEnum.TANYIN.getCode());
hygfThirdStationLog.setReqMethod(HttpMethod.POST.name());
hygfThirdStationLog.setReqHeaders(headers.toString());
hygfThirdStationLog.setReqPath(url);
hygfThirdStationLog.setReqBody(paramsJsonStr);
hygfThirdStationLog.setResBody(response.toString());
thirdStationLogService.saveLog(hygfThirdStationLog);
// 解析响应并返回。
return parseResponse(desc, response, resultClass);
} catch (BusinessException businessException) {
......@@ -218,6 +244,15 @@ public class TanYinApiUtils {
response = HttpUtil.createPost(url).body(paramsJsonStr, MediaType.APPLICATION_JSON_UTF8_VALUE).headerMap(headers, true).execute();
// 记录响应日志
log.info("响应 => 碳银{}接口，参数：{}，httpCode：{}, response：{}", desc, paramsJsonStr, response.getStatus(), response.body());
//存储日志
HYGFThirdStationLog hygfThirdStationLog = new HYGFThirdStationLog();
hygfThirdStationLog.setThirdCode(PVProducerInfoEnum.TANYIN.getCode());
hygfThirdStationLog.setReqMethod(HttpMethod.POST.name());
hygfThirdStationLog.setReqHeaders(headers.toString());
hygfThirdStationLog.setReqPath(url);
hygfThirdStationLog.setReqBody(paramsJsonStr);
hygfThirdStationLog.setResBody(response.toString());
thirdStationLogService.saveLog(hygfThirdStationLog);
// 解析响应，返回分页信息和请求结果
return parsePageResponse(desc, response, resultClass);
} catch (BusinessException businessException) {
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/controller/HouseholdTestController.java
View file @ 72ed926c
......@@ -42,6 +42,8 @@ public class HouseholdTestController {
@Autowired
private SofarDataAcquisitionService sofarDataAcquisitionService;
@Autowired
private SunlightService sunlightService;
......@@ -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();
}
/**
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/controller/StationImportController.java 0 → 100644
View file @ 72ed926c
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/face/orm/houseapi/entity/houseapi/HYGFThirdStationLog.java 0 → 100644
View file @ 72ed926c
package com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.houseapi;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@Data
public class HYGFThirdStationLog implements Serializable {
private String id;
private String thirdCode;
private Date reqTime;
private String reqMethod;
private String reqPath;
private String reqHeaders;
private String reqBody;
private String resBody;
}
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/mapper/houseapi/HYGFThirdStationLogMapper.java 0 → 100644
View file @ 72ed926c
package com.yeejoin.amos.api.householdapi.face.orm.mapper.houseapi;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.houseapi.HYGFThirdStationLog;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
public interface HYGFThirdStationLogMapper extends BaseMapper<HYGFThirdStationLog> {
// 创建新的数据表
@Select("CREATE TABLE IF NOT EXISTS ${tableName} (\n" +
" `id` varchar(256) NOT NULL,\n" +
" `third_code` varchar(30),\n" +
" `req_time` datetime(0),\n" +
" `req_method` varchar(20),\n" +
" `req_path` varchar(1000),\n" +
" `req_headers` varchar(1000),\n" +
" `req_body` longtext,\n" +
" `res_body` longtext,\n" +
" PRIMARY KEY (`id`) USING BTREE\n" +
");")
void createTable(@Param("tableName")String tableName);
// 插入数据到指定表
@Insert("INSERT INTO ${tableName} (`id`,`third_code`,`req_time`,`req_method`,`req_path`,`req_headers`,`req_body`,`res_body`) VALUES (#{thirdStationLog.id},#{thirdStationLog.thirdCode},#{thirdStationLog.reqTime},#{thirdStationLog.reqMethod},#{thirdStationLog.reqPath},#{thirdStationLog.reqHeaders},#{thirdStationLog.reqBody},#{thirdStationLog.resBody})")
void insertData(@Param("tableName") String tableName, @Param("thirdStationLog")HYGFThirdStationLog thirdStationLog);
// 删除超过时间的表
@Select("DROP TABLE IF EXISTS ${tableName}")
void dropTable(@Param("tableName")String tableName);
//获取表数量
@Select("SELECT COUNT(1) FROM information_schema.tables WHERE table_name LIKE #{tableName}")
Integer countTable(@Param("tableName")String tableName);
//获取最老的表名称
@Select("SELECT table_name FROM information_schema.tables WHERE table_name LIKE #{tableName} ORDER BY table_name ASC LIMIT 1")
String getOldestTableName(@Param("tableName")String tableName);
}
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/mapper/hygf/CompanyMapper.java 0 → 100644
View file @ 72ed926c
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/service/IHYGFThirdStationLogService.java 0 → 100644
View file @ 72ed926c
package com.yeejoin.amos.api.householdapi.face.service;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.houseapi.HYGFThirdStationLog;
public interface IHYGFThirdStationLogService {
void saveLog(HYGFThirdStationLog hygfThirdStationLog);
}
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/GoodWeDataAcquisitionServiceImpl.java
View file @ 72ed926c
package com.yeejoin.amos.api.householdapi.face.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
......@@ -35,10 +36,7 @@ import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
import javax.annotation.PostConstruct;
......@@ -109,12 +107,13 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
requestInfo.put("page_index", 1);
requestInfo.put("page_size", 200);
// requestInfo.put("key", "龙虎山北区");
String requstParam = JSON.toJSONString(requestInfo);
String today = DateUtil.today();
String hour = new Date().getHours() + ":00";
List<GoodWeStationMonitorDto> goodWeStationLists = goodWeRequestUtil.getResPonse(
GoodWeConstant.stationListStatusUrl, GoodWeConstant.requestPost, requstParam,
List<GoodWeStationMonitorDto> goodWeStationLists = goodWeRequestUtil.getResPonseList(
GoodWeConstant.stationListStatusUrl, GoodWeConstant.requestPost, requestInfo,
GoodWeConstant.resovleRule_data_list, GoodWeStationMonitorDto.class);
//删除多余的场站
deleteBDWStation(goodWeStationLists);
if (goodWeStationLists.size() > 0) {
goodWeStationLists.forEach(goodWeStationMonitorDto -> {
GoodWeStationMonitorList goodWeStationList = new GoodWeStationMonitorList();
......@@ -296,7 +295,9 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
TdHYGFStationAllGenerate.setYearTime(DateUtil.format(today1, "yyyy"));
TdHYGFStationAllGenerate.setYear(DateUtil.format(today1, "yyyy"));
TdHYGFStationAllGenerate.setGenerate(jpStation.getYearGenerate());
if (ObjectUtils.isNotEmpty(jpStation.getYearGenerate())) {
TdHYGFStationAllGenerate.setFullhour(jpStation.getYearGenerate() / jpStation.getCapacity());
}
TdHYGFStationAllGenerate.setIncome(jpStation.getYearIncome());
// 新加
TdHYGFStationAllGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
......@@ -315,13 +316,37 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
logger.info("-------固德威同步场站和告警结束" + ts + "------- " + sdf.format(new Date()));
}
/**
* 删除多余的场站
* @param goodWeStationLists
*/
private void deleteBDWStation(List<GoodWeStationMonitorDto> goodWeStationLists) {
if(CollectionUtil.isNotEmpty(goodWeStationLists)){
List<String> stationIds = new ArrayList<>();
for (GoodWeStationMonitorDto goodWeStationMonitorDto : goodWeStationLists) {
stationIds.add(goodWeStationMonitorDto.getPowerstation_id());
}
QueryWrapper<JpStation> wrapper = new QueryWrapper<JpStation>().eq("third_code", PVProducerInfoEnum.GDW.getCode());
List<JpStation> jpStations = jpStationMapper.selectList(wrapper);
if(CollectionUtil.isNotEmpty(jpStations)){
for (JpStation jpStation : jpStations) {
if(!stationIds.contains(jpStation.getThirdStationId())){
//删除多余数据
jpStationMapper.deleteById(jpStation.getSequenceNbr());
}
}
}
}
}
@Override
@Scheduled(cron = "${dataRequstScheduled.GoodWe}")
@Async
public void stationDetail() {
long ts = System.currentTimeMillis();
logger.info("-------固德威同步场站详情开始" + ts + "------- " + sdf.format(new Date()));
List<String> stationIds = goodWeStationMonitorListMapper.getStationIds();
// List<String> stationIds = goodWeStationMonitorListMapper.getStationIds();
List<String> stationIds = getStationIds();
stationIds.forEach(stationId -> {
HashMap<String, Object> requestInfo = new HashMap<>();
String requstParam = JSON.toJSONString(requestInfo);
......@@ -352,13 +377,34 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
logger.info("-------固德威同步场站详情结束" + ts + "------- " + sdf.format(new Date()));
}
/**
* 获取场站id
* @return
*/
private List<String> getStationIds() {
HashMap<String, Object> requestInfo = new HashMap<>();
requestInfo.put("page_index", 1);
requestInfo.put("page_size", 200);
List<GoodWeStationMonitorDto> goodWeStationLists = goodWeRequestUtil.getResPonseList(
GoodWeConstant.stationListStatusUrl, GoodWeConstant.requestPost, requestInfo,
GoodWeConstant.resovleRule_data_list, GoodWeStationMonitorDto.class);
List<String> stationIds = new ArrayList<>();
if(CollectionUtil.isNotEmpty(goodWeStationLists)){
for (GoodWeStationMonitorDto goodWeStationMonitorDto : goodWeStationLists) {
stationIds.add(goodWeStationMonitorDto.getPowerstation_id());
}
}
return stationIds;
}
@Override
@Scheduled(cron = "${dataRequstScheduled.GoodWe}")
@Async
public void stationMonthGen() {
long ts = System.currentTimeMillis();
logger.info("-------固德威同步场站月发电量开始" + ts + "------- " + sdf.format(new Date()));
List<String> stationIds = goodWeStationMonitorListMapper.getStationIds();
// List<String> stationIds = goodWeStationMonitorListMapper.getStationIds();
List<String> stationIds = getStationIds();
stationIds.forEach(stationId -> {
String currentMonth = DateUtil.format(new Date(), "yyyyMM");
HashMap<String, Object> requestInfo = new HashMap<>();
......@@ -395,7 +441,8 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
public void stationYearGen() {
long ts = System.currentTimeMillis();
logger.info("-------固德威同步场站年发电量开始" + ts + "------- " + sdf.format(new Date()));
List<String> stationIds = goodWeStationMonitorListMapper.getStationIds();
// List<String> stationIds = goodWeStationMonitorListMapper.getStationIds();
List<String> stationIds = getStationIds();
stationIds.forEach(stationId -> {
String currentYear = DateUtil.format(new Date(), "yyyy");
HashMap<String, Object> requestInfo = new HashMap<>();
......@@ -438,7 +485,10 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
public void inverterList() {
long ts = System.currentTimeMillis();
logger.info("-------固德威同步逆变器开始" + ts + "------- " + sdf.format(new Date()));
List<String> stationIds = goodWeStationMonitorListMapper.getStationIds();
// List<String> stationIds = goodWeStationMonitorListMapper.getStationIds();
List<String> stationIds = getStationIds();
//删除多余的逆变器
deleteGDWInverter(stationIds);
stationIds.stream().forEach(stationId -> {
HashMap<String, Object> requestInfo = new HashMap<>();
requestInfo.put("page_index", 1);
......@@ -446,9 +496,8 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
requestInfo.put("pw_id", stationId);
JpStation jpStation = jpStationMapper.selectOne(
new QueryWrapper<JpStation>().eq("third_station_id", stationId).orderByDesc("create_time"));
String requstParam = JSON.toJSONString(requestInfo);
List<GoodWeINverterDetailDto> inverterDetailDtoList = goodWeRequestUtil.getResPonse(
GoodWeConstant.queryInventerUrl, GoodWeConstant.requestPost, requstParam,
List<GoodWeINverterDetailDto> inverterDetailDtoList = goodWeRequestUtil.getResPonseList(
GoodWeConstant.queryInventerUrl, GoodWeConstant.requestPost, requestInfo,
GoodWeConstant.resovleRule_data_list, GoodWeINverterDetailDto.class);
inverterDetailDtoList.forEach(goodWeINverterDetailDto -> {
// System.out.println(goodWeINverterDetailDto.getIt_sn());
......@@ -480,6 +529,23 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
logger.info("-------固德威同步逆变器结束" + ts + "------- " + sdf.format(new Date()));
}
/**
* 删除多余的逆变器
* @param stationIds
*/
private void deleteGDWInverter(List<String> stationIds) {
QueryWrapper<JpInverter> wrapper = new QueryWrapper<JpInverter>().eq("third_code", PVProducerInfoEnum.GDW.getCode());
List<JpInverter> jpInverters = jpInverterMapper.selectList(wrapper);
if(CollectionUtil.isNotEmpty(jpInverters)){
for (JpInverter jpInverter : jpInverters) {
if(!stationIds.contains(jpInverter.getThirdStationId())){
//删除多余数据
jpInverterMapper.deleteById(jpInverter.getSequenceNbr());
}
}
}
}
@Override
@Scheduled(cron = "${dataRequstScheduled.GoodWe}")
@Async
......@@ -847,9 +913,8 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
requestInfo.put("endtime", today + " 23:59:59");
requestInfo.put("stationid", stationid);
// requestInfo.put("status", 2);
String requstParam = JSON.toJSONString(requestInfo);
List<GoodWeAlarmDto> alarmList = goodWeRequestUtil.getResPonse(GoodWeConstant.alarmListUrl,
GoodWeConstant.requestPost, requstParam, GoodWeConstant.resovleRule_data_list, GoodWeAlarmDto.class);
List<GoodWeAlarmDto> alarmList = goodWeRequestUtil.getResPonseList(GoodWeConstant.alarmListUrl,
GoodWeConstant.requestPost, requestInfo, GoodWeConstant.resovleRule_data_list, GoodWeAlarmDto.class);
alarmList.forEach(goodWeAlarmDto -> {
if (!ObjectUtils.isEmpty(goodWeAlarmDto.getDevicesn())) {
HYGFJPInverterWarn hygfjpInverterWarn = hygfjpInverterWarnMapper
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/HYGFThirdStationLogServiceImpl.java 0 → 100644
View file @ 72ed926c
package com.yeejoin.amos.api.householdapi.face.service.impl;
import cn.hutool.core.lang.UUID;
import com.baomidou.mybatisplus.core.toolkit.Sequence;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.houseapi.HYGFThirdStationLog;
import com.yeejoin.amos.api.householdapi.face.orm.mapper.houseapi.HYGFThirdStationLogMapper;
import com.yeejoin.amos.api.householdapi.face.service.IHYGFThirdStationLogService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Objects;
@Service
@Slf4j
public class HYGFThirdStationLogServiceImpl implements IHYGFThirdStationLogService {
private final String TABLE_NAME = "hygf_third_station_log";
@Autowired
private HYGFThirdStationLogMapper hygfThirdStationLogMapper;
@Value("${hygf.third.station.log.reserve.day:7}")
private Integer reserveDay;
@Override
public void saveLog(HYGFThirdStationLog hygfThirdStationLog) {
try {
// 获取今天的表名
String tableName = TABLE_NAME + "_" + getCurrentDate();
// 校验并创建新表
checkAndCreateNewTable(tableName);
//插入数据
insertLogData(tableName,hygfThirdStationLog);
} catch (Exception e) {
log.error(e.getMessage(), e);
}
}
private void insertLogData(String tableName,HYGFThirdStationLog hygfThirdStationLog) {
if (Objects.nonNull(hygfThirdStationLog)) {
hygfThirdStationLog.setId(UUID.randomUUID().toString());
hygfThirdStationLog.setReqTime(new Date());
hygfThirdStationLogMapper.insertData(tableName, hygfThirdStationLog);
}
}
private void checkAndCreateNewTable(String tableName) {
// 查询当前表的数量
Integer countTable = hygfThirdStationLogMapper.countTable(TABLE_NAME);
// 如果表超过7个，删除最旧的表
if (countTable >= reserveDay) {
String oldestTableName = hygfThirdStationLogMapper.getOldestTableName(TABLE_NAME);
hygfThirdStationLogMapper.dropTable(oldestTableName);
}
// 创建新表
hygfThirdStationLogMapper.createTable(tableName);
}
// 获取当前日期（格式为 yyyyMMdd）
private String getCurrentDate() {
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
return sdf.format(new Date());
}
}
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/SofarDataAcquisitionServiceImpl.java
View file @ 72ed926c
......@@ -12,8 +12,7 @@ import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.annotation.PostConstruct;
import cn.hutool.core.collection.CollectionUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -118,18 +117,65 @@ public class SofarDataAcquisitionServiceImpl implements SofarDataAcquisitionServ
Map<String, Object> requestInfo = new HashMap<>();
requestInfo.put("page", 1);
requestInfo.put("size", 1000);
String param = JSON.toJSONString(requestInfo);
List<SofarStationList> jsonObject = requestUtil.getResPonse(SoFarConstant.stationListUrl,
SoFarConstant.requestPost, param, SoFarConstant.resovleRule_data, SofarStationList.class);
List<SofarStationList> jsonObject = requestUtil.getResPonseList(SoFarConstant.stationListUrl,
SoFarConstant.requestPost, requestInfo, SoFarConstant.resovleRule_data, SofarStationList.class);
// 新增td电站
for (SofarStationList sunlight : jsonObject) {
sunlight.setCreatedTime(System.currentTimeMillis());
sofarStationListMapper.insert(sunlight);
}
//删除多余的信息
deleteSHMessage(jsonObject);
// mysql电站信息
this.stationDetail(jsonObject);
}
/**
* 删除多余的首航场站
* @param sofarStationLists
*/
private void deleteSHMessage(List<SofarStationList> sofarStationLists) {
if(CollectionUtil.isNotEmpty(sofarStationLists)){
List<String> stationIds = new ArrayList<>();
for (SofarStationList sofarStationList : sofarStationLists) {
stationIds.add(sofarStationList.getId().toString());
}
//场站
QueryWrapper<JpStation> wrapper = new QueryWrapper<JpStation>().eq("third_code", PVProducerInfoEnum.SH.getCode());
List<JpStation> jpStations = jpStationMapper.selectList(wrapper);
if(CollectionUtil.isNotEmpty(jpStations)){
for (JpStation jpStation : jpStations) {
if(!stationIds.contains(jpStation.getThirdStationId())){
//删除多余数据
jpStationMapper.deleteById(jpStation.getSequenceNbr());
}
}
}
//采集器
QueryWrapper<JpCollector> wrapper1 = new QueryWrapper<JpCollector>().eq("third_code", PVProducerInfoEnum.SH.getCode());
List<JpCollector> jpCollectors = jpCollectorMapper.selectList(wrapper1);
if(CollectionUtil.isNotEmpty(jpCollectors)){
for (JpCollector jpCollector : jpCollectors) {
if(!stationIds.contains(jpCollector.getThirdStationId())){
//删除多余数据
jpCollectorMapper.deleteById(jpCollector.getSequenceNbr());
}
}
}
//逆变器
QueryWrapper<JpInverter> wrapper2 = new QueryWrapper<JpInverter>().eq("third_code", PVProducerInfoEnum.SH.getCode());
List<JpInverter> jpInverters = jpInverterMapper.selectList(wrapper2);
if(CollectionUtil.isNotEmpty(jpInverters)){
for (JpInverter jpInverter : jpInverters) {
if(!stationIds.contains(jpInverter.getThirdStationId())){
//删除多余数据
jpInverterMapper.deleteById(jpInverter.getSequenceNbr());
}
}
}
}
}
@Override
public void stationDetail(List<SofarStationList> list) {
......@@ -1212,8 +1258,7 @@ public class SofarDataAcquisitionServiceImpl implements SofarDataAcquisitionServ
// if (jpStation.getThirdStationId().equals("517021808701218816")){
// System.out.println("6666666666666666666666666");
// }
String param = JSON.toJSONString(requestInfo);
List<SofarWarm> jsonObject2 = requestUtil.getResPonse(SoFarConstant.alert, SoFarConstant.requestPost, param,
List<SofarWarm> jsonObject2 = requestUtil.getResPonseList(SoFarConstant.alert, SoFarConstant.requestPost, requestInfo,
SoFarConstant.stationAlertItems, SofarWarm.class);
// if (jsonObject2 != null && jsonObject2.size() > 0) {
// System.out.println("88888888888888888888888");
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/SunlightServiceImpl.java
View file @ 72ed926c
package com.yeejoin.amos.api.householdapi.face.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import cn.hutool.json.JSONObject;
......@@ -7,13 +8,8 @@ import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.gson.JsonObject;
import com.qiniu.util.Json;
import com.yeejoin.amos.api.householdapi.Utils.SunlightUtil;
import com.yeejoin.amos.api.householdapi.constant.ImasterConstant;
import com.yeejoin.amos.api.householdapi.constant.KSolarConstant;
import com.yeejoin.amos.api.householdapi.face.dto.Device;
import com.yeejoin.amos.api.householdapi.face.dto.KsolarAlarmDto;
import com.yeejoin.amos.api.householdapi.face.dto.SunlightDto;
import com.yeejoin.amos.api.householdapi.face.dto.SunlightWarm;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.hygf.JpCollector;
......@@ -37,7 +33,6 @@ import org.springframework.context.ApplicationContext;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
import java.text.SimpleDateFormat;
......@@ -46,8 +41,6 @@ import java.util.concurrent.TimeUnit;
import java.util.function.Function;
import java.util.stream.Collectors;
import javax.annotation.PostConstruct;
/**
* @description:
* @author: tw
......@@ -113,8 +106,10 @@ public class SunlightServiceImpl implements SunlightService {
bodyparam.put("ps_type", "1,3,4,5,6,7,8");
bodyparam.put("size", 3000);
bodyparam.put("curPage", 1);
JSONObject data = SunlightUtil.getdata(SunlightUtil.getPowerStationList, bodyparam);
JSONObject data = SunlightUtil.getDataList(SunlightUtil.getPowerStationList, bodyparam);
List<Sunlight> list = JSONArray.parseArray(JSON.toJSONString(data.get("pageList")), Sunlight.class);
//删除多余的场站
deleteYGMessage(data);
this.stationDetail(data);
for (Sunlight sunlight : list) {
......@@ -124,6 +119,54 @@ public class SunlightServiceImpl implements SunlightService {
logger.info("-------阳光同步电站/逆变器/采集器结束" + ts + "------- " + sdf.format(new Date()));
}
/**
* 删除多余的阳光场站
* @param data
*/
private void deleteYGMessage(JSONObject data) {
// 所有场站信息
List<SunlightDto> sunlightDtos = JSONArray.parseArray(JSON.toJSONString(data.get("pageList")), SunlightDto.class);
if(CollectionUtil.isNotEmpty(sunlightDtos)){
List<String> stationIds = new ArrayList<>();
for (SunlightDto sunlightDto : sunlightDtos) {
stationIds.add(sunlightDto.getPs_id().toString());
}
//场站
QueryWrapper<JpStation> wrapper = new QueryWrapper<JpStation>().eq("third_code", PVProducerInfoEnum.YG.getCode());
List<JpStation> jpStations = jpStationMapper.selectList(wrapper);
if(CollectionUtil.isNotEmpty(jpStations)){
for (JpStation jpStation : jpStations) {
if(!stationIds.contains(jpStation.getThirdStationId())){
//删除多余数据
jpStationMapper.deleteById(jpStation.getSequenceNbr());
}
}
}
//采集器
QueryWrapper<JpCollector> wrapper1 = new QueryWrapper<JpCollector>().eq("third_code", PVProducerInfoEnum.YG.getCode());
List<JpCollector> jpCollectors = jpCollectorMapper.selectList(wrapper1);
if(CollectionUtil.isNotEmpty(jpCollectors)){
for (JpCollector jpCollector : jpCollectors) {
if(!stationIds.contains(jpCollector.getThirdStationId())){
//删除多余数据
jpCollectorMapper.deleteById(jpCollector.getSequenceNbr());
}
}
}
//逆变器
QueryWrapper<JpInverter> wrapper2 = new QueryWrapper<JpInverter>().eq("third_code", PVProducerInfoEnum.YG.getCode());
List<JpInverter> jpInverters = jpInverterMapper.selectList(wrapper2);
if(CollectionUtil.isNotEmpty(jpInverters)){
for (JpInverter jpInverter : jpInverters) {
if(!stationIds.contains(jpInverter.getThirdStationId())){
//删除多余数据
jpInverterMapper.deleteById(jpInverter.getSequenceNbr());
}
}
}
}
}
// 电站数据如库，电站统计数据入库
public void stationDetail(JSONObject data) {
// 所有场站信息
......@@ -271,7 +314,7 @@ public class SunlightServiceImpl implements SunlightService {
bodyparamjp11.put("size", 3000);
bodyparamjp11.put("curPage", 1);
bodyparamjp11.put("device_type_list", lif11);
JSONObject jsonObject1data11 = SunlightUtil.getdata(SunlightUtil.getDeviceList, bodyparamjp11);
JSONObject jsonObject1data11 = SunlightUtil.getDataList(SunlightUtil.getDeviceList, bodyparamjp11);
List<Device> listdtx = JSONArray.parseArray(JSON.toJSONString(jsonObject1data11.get("pageList")),
Device.class);
// 获取电站下逆变器
......@@ -282,7 +325,7 @@ public class SunlightServiceImpl implements SunlightService {
bodyparamjp.put("size", 3000);
bodyparamjp.put("curPage", 1);
bodyparamjp.put("device_type_list", lif);
JSONObject jsonObject1data = SunlightUtil.getdata(SunlightUtil.getDeviceList, bodyparamjp);
JSONObject jsonObject1data = SunlightUtil.getDataList(SunlightUtil.getDeviceList, bodyparamjp);
List<Device> listd = JSONArray.parseArray(JSON.toJSONString(jsonObject1data.get("pageList")), Device.class);
// 获取电站，月发电量
......@@ -422,7 +465,7 @@ public class SunlightServiceImpl implements SunlightService {
}
if (listd != null) {
this.collectorDetail(listd, jpStation);
this.collectorDetail(listdtx, jpStation);
}
// 电站报表
......@@ -582,6 +625,8 @@ public class SunlightServiceImpl implements SunlightService {
jpInverter.setModel(device.getDevice_model_code());
jpInverter.setCapacity(jpStation.getCapacity());
jpInverter.setCurrentPower(jpStation.getRealTimePower());
jpInverter.setRatedPower(jpStation.getRatedPower());
jpInverter.setFisTimeStr(device.getGrid_connection_date());
if (devicestx != null) {
......@@ -956,7 +1001,7 @@ public class SunlightServiceImpl implements SunlightService {
// 出场日期
// jpCollector.setDischargeDate(new Date(collectorDetailDto.getFactoryTime()));
// //生产日期
// jpCollector.setProductDate(new Date(collectorDetailDto.getFactoryTime()));
// jpCollector.setProductDate(new Date(collectorDetailDto.getFactordyTime()));
// //数据上传间隔
// jpCollector.setDataPeriod(collectorDetailDto.getDataUploadCycle());
// //本次上电时间
......@@ -1000,7 +1045,7 @@ public class SunlightServiceImpl implements SunlightService {
Map<String, Object> bodyparamf = new HashMap<>();
bodyparamf.put("size", 1000);
bodyparamf.put("curPage", 1);
JSONObject jsonObject = SunlightUtil.getdata(SunlightUtil.getFaultAlarmInfo, bodyparamf);
JSONObject jsonObject = SunlightUtil.getDataList(SunlightUtil.getFaultAlarmInfo, bodyparamf);
List<SunlightWarm> listd = jsonObject.get("pageList") != null
? JSONArray.parseArray(JSON.toJSONString(jsonObject.get("pageList")), SunlightWarm.class)
: null;
......@@ -1014,7 +1059,7 @@ public class SunlightServiceImpl implements SunlightService {
Map<String, HYGFJPInverterWarn> bodyparam = new HashMap<>();
if (hygfjpInverterWarnlist != null && hygfjpInverterWarnlist.size() > 0) {
bodyparam = hygfjpInverterWarnlist.stream()
.collect(Collectors.toMap(HYGFJPInverterWarn::getWarnId, Function.identity()));
.collect(Collectors.toMap(HYGFJPInverterWarn::getWarnId, Function.identity(),(value1, value2) -> value1));
}
// 获取所有逆变器
List<JpInverter> jpInverter = jpInverterMapper
......@@ -1022,7 +1067,7 @@ public class SunlightServiceImpl implements SunlightService {
Map<String, String> jpInverterbodyparam = new HashMap<>();
if (jpInverter != null && jpInverter.size() > 0) {
jpInverterbodyparam = jpInverter.stream()
.collect(Collectors.toMap(JpInverter::getId, JpInverter::getSnCode));
.collect(Collectors.toMap(JpInverter::getId, JpInverter::getSnCode,(value1, value2) -> value1));
}
if (listd != null && !listd.isEmpty()) {
for (SunlightWarm sunlightWarm : listd) {
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/TanYinDataAcquisitionServiceImpl.java
View file @ 72ed926c
......@@ -67,10 +67,7 @@ import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
......@@ -566,6 +563,10 @@ public class TanYinDataAcquisitionServiceImpl implements TanYinDataAcquisitionSe
for (TanYinInveterInfo tanYinInveterInfo : tanYinInveterInfos) {
// region 逆变器信息
JSONObject tanYinInveterInfoResultJson = tanYinInveterInfoResultMap.getJSONObject(tanYinInveterInfo.getSn());
//处理空指针问题
if(Objects.isNull(tanYinInveterInfoResultJson)){
continue;
}
TanYinInveterInfo tanYinInveterInfoDTO = tanYinInveterInfoResultJson.toJavaObject(TanYinInveterInfo.class);
tanYinInveterInfoDTO.setProjectNo(tanYinInveterInfo.getProjectNo());
tanYinInveterInfoDTO.setDeviceName(tanYinInveterInfo.getDeviceName());
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/config/SchedulerConfig.java 0 → 100644
View file @ 72ed926c
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/resources/application-dev.properties
View file @ 72ed926c
......@@ -65,18 +65,19 @@ biz.lxyd.lift.url=http://39.106.181.149:8088/elevatorapi
# ??????????
dataRequstScheduled.jinlangyun=0 0/50 * * * *
dataRequstScheduled.huawei=0 0/50 * * * *
dataRequstScheduled.keshida=0 0/50 * * * *
dataRequstScheduled.jinlangyun=0 0/40 * * * *
dataRequstScheduled.huawei=0 0/40 * * * *
dataRequstScheduled.keshida=0 0/40 * * * *
dataRequstScheduled.Sunlight=0 0/50 * * * *
dataRequstScheduled.GoodWe=0 0/3 * * * *
dataRequstScheduled.Sunlight=0 0/40 * * * *
dataRequstScheduled.GoodWe=0 0/40 * * * *
dataRequstScheduled.Sofar=0 0/50 * * * *
dataRequstScheduled.Sofar=0 0/40 * * * *
# 碳银
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
dataRequestScheduled.tanYin=0 0/40 * * * *
dataRequestScheduled.tanYin.warn=0 0/40 * * * *
hygf.third.station.log.reserve.day=3
\ No newline at end of file
amos-boot-data/amos-boot-data-housepvapi/src/main/resources/application-kingbase8.properties
View file @ 72ed926c
## DB properties hygf
## db1-production database
spring.db1.datasource.type: com.alibaba.druid.pool.DruidDataSource
spring.db1.datasource.url=jdbc:kingbase8://10.20.1.176:54321/amos_openapi?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8&currentSchema=root
spring.db1.datasource.url=jdbc:kingbase8://192.168.0.68:54321/amos_openapi?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8&currentSchema=root
spring.db1.datasource.username=root
spring.db1.datasource.password=Yeejoin@2020
spring.db1.datasource.driver-class-name=com.kingbase8.Driver
## db2-sync_data
spring.db2.datasource.type: com.alibaba.druid.pool.DruidDataSource
spring.db2.datasource.url=jdbc:kingbase8://10.20.1.176:54321/amos_project?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8&currentSchema=root
spring.db2.datasource.url=jdbc:kingbase8://192.168.0.68:54321/amos_project?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8&currentSchema=root
spring.db2.datasource.username=root
spring.db2.datasource.password=Yeejoin@2020
spring.db2.datasource.driver-class-name=com.kingbase8.Driver
......@@ -70,7 +70,7 @@ 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 * * * *
......@@ -78,5 +78,5 @@ dataRequstScheduled.Sofar=0 0/50 * * * *
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
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/mapper/hygf/CompanyMapper.xml 0 → 100644
View file @ 72ed926c
<?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-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/ArrivalStateeEnum.java
View file @ 72ed926c
......@@ -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/BusinessTypeEnum.java
View file @ 72ed926c
......@@ -13,7 +13,14 @@ public enum BusinessTypeEnum {
HYGF_JXS_SH("JXS_SH", "经销商审核"),
HYGF_DZ_SH("hygf_10001", "电站审核"),
HYGF_BWYS("hygf_bwys", "并网验收"),
HYGF_DZTRRZ("StationFinancing", "电站投融资流程");
HYGF_DZTRRZ("StationFinancing", "电站投融资流程"),
HYGF_FHGL("DeliveryManagement", "发货管理"),
HYGF_ZGDSHLC("RectificationAudit", "整改单审核流程"),
HYGF_YSLC("AcceptanceCheck", "验收流程"),
HYGF_BWLC("GridConnected", "并网流程"),
HYGF_SGLCSH("ProcessEngineering", "施工流程审核"),
HYGF_REPAY("hygf_repayment", "还款"),
;
private final String code;
private final String name;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/BusinessWorkflowKey.java 0 → 100644
View file @ 72ed926c
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/CommonEnum.java 0 → 100644
View file @ 72ed926c
package com.yeejoin.amos.boot.module.hygf.api.Enum;
import lombok.AllArgsConstructor;
import lombok.Getter;
import org.springframework.util.StringUtils;
import java.util.List;
@Getter
@AllArgsConstructor
public enum CommonEnum {
居民("居民","jm","业主类型"),
非居民("非居民","fjm","业主类型"),
自建资产("自建资产","zx","电站类型"),
经销商代建("经销商代建","fzx","电站类型"),
平顶屋("平顶屋","pdw","屋顶类型"),
斜顶屋("斜顶屋","xdw","屋顶类型"),
庭院("庭院","ty","屋顶类型"),
别墅("别墅","bs","房屋整体情况"),
普通民房("普通民房","pymf","房屋整体情况"),
单门独院("单门独院","dmdy","房屋整体情况"),
一栋多户("一栋多户","yddh","房屋整体情况"),
一户一表("一户一表","yhyb","电表位置"),
集中电表("集中电表","jzdb","电表位置"),
南偏东("南偏东","npd","房屋偏向"),
南偏西("南偏西","npx","房屋偏向"),
正南("正南","zn","房屋偏向"),
移除遮挡物("移除遮挡物","yczdw","解决措施"),
设计规避("设计规避","sjgb","解决措施"),
公共共有("公共共有","gy","房屋产权情况"),
按份共有("按份共有","br","房屋产权情况"),
单独所有("单独所有","dy","房屋产权情况"),
高树("高树","gs","周边障碍物"),
建筑物("建筑物","jzw","周边障碍物"),
电线杆("电线杆","dxg","周边障碍物"),
带电线路("带电线路","ddxl","周边障碍物"),
变压器("变压器","byq","周边障碍物"),
阳台("阳台","yt","上至屋顶通道"),
孔洞("孔洞","kd","上至屋顶通道"),
楼梯间("楼梯间","ltj","上至屋顶通道"),
女儿墙("女儿墙","nrq","屋面遮挡物"),
热水器("热水器","rsq","屋面遮挡物"),
烟囱("烟囱","yc","屋面遮挡物"),
老虎窗("老虎窗","lhc","屋面遮挡物"),
水箱("水箱","sx","屋面遮挡物"),
无("无","wu","屋面遮挡物"),
无需防滑雪措施("无需防滑雪措施","wxfhxcs","防滑雪措施"),
预留防滑雪缓冲通道("预留防滑雪缓冲通道","ylfhxhctd","防滑雪措施"),
安装挡雪夹具("安装挡雪夹具","azdxjj","防滑雪措施"),
自然人("自然人","zrr","商务类型"),
非自然人("非自然人","fzrr","商务类型"),
宅基地农户屋顶("宅基地农户屋顶","zjdnhw","法务类型"),
法人私有的宅基地建筑屋顶("法人私有的宅基地建筑屋顶","frsydzjd","法务类型"),
单晶("单晶","danjing","组件类型"),
多晶("多晶","duojing","组件类型"),
不限("不限","bx","逆变器系列"),
全额上网("全额上网","qesw","上网模式"),
余电上网("余电上网","ydsw","上网模式"),
单相("单相","dx","相位"),
三相("三相","ydsw","相位"),
SMC("SMC","smc","材质"),
不锈钢("不锈钢","bxg","材质"),
钢板喷塑("钢板喷塑","gbps","材质"),
单面("单面","dm","组件类型"),
双面("双面","sm","组件类型"),
其他("其他","other","公用");
/**
* 名称，描述
*/
private String name;
/**
* 编码
*/
private String code;
/**
* 编码
*/
private String type;
public static String getNameByCode(String code) {
String name = "";
for(CommonEnum obj: CommonEnum.values()) {
if (obj.getCode().equals(code)) {
name = obj.getName();
break;
}
}
return StringUtils.isEmpty(name)?code:name;
}
public static String getNameByCodeList(List<String> codes) {
String name = null;
for (String code : codes) {
for(CommonEnum obj: CommonEnum.values()) {
if (obj.getCode().equals(code)) {
name = name == null?obj.getName(): name +","+obj.getName() ;
}
}
}
return StringUtils.isEmpty(name)? String.valueOf(codes) :name;
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/FinancingAuditEnum.java
View file @ 72ed926c
......@@ -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/FlowKeyTodoEnum.java 0 → 100644
View file @ 72ed926c
package com.yeejoin.amos.boot.module.hygf.api.Enum;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* 此处是为了待办提供的流程状态 提供流程Key对应此时流程的状态名称
*/
@Getter
@AllArgsConstructor
public enum FlowKeyTodoEnum {
TSRZ(1001, "待推送", "AbarbeitungWaitPush", "推送融资"),
JXSZG(1002, "待整改", "WaitAbarbeitung", "经销商整改"),
RZSH(1003, "待审核", "FinancingAudit", "融资审核"),
XXFK(1004, "待放款", "AuditPass", "线下放款"),
JXSGLYSH(1005, "待经销商管理员审核", "hygf_02", "经销商确认"),
SJSH(1006, "待设计审核", "hygf_03", "设计审核"),
TRSH(1007, "待投融审核", "hygf_05", "投融审核"),
FWSH(1008, "待法务审核", "hygf_07", "法务审核"),
SJSCDXTK(1009, "待设计上传典型图库", "hygf_09", "设计上传典型图库"),
JXSSJRYSC(1010, "待经销商设计人员上传设计图", "hygf_10", "经销商设计人员上传设计图"),
SJTZSH(1011, "待设计图纸审核", "hygf_11", "设计图纸审核"),
BWDJTJ(1012, "待并网登记提交", "hygf_bw1", "并网登记提交"),
BWGLDGCSH(1013, "待并网管理端工程审核", "hygf_bw2", "并网管理端工程审核"),
JXSGCTJYS(1014, "待经销商工程提交验收", "hygf_ys1", "经销商工程提交验收"),
GLDTRSH(1015, "待管理端投融审核", "hygf_ys2", "管理端投融审核"),
ZGD(1016, "待整改单", "hygf_zg_tr", "整改单"),
GLDFWSH(1017, "待管理端法务审核", "hygf_ys3", "管理端法务审核"),
ZGD_FW(1018, "待整改单", "hygf_zg_fw", "整改单"),
GLDGCSH(1019, "待管理端工程审核", "hygf_ys4", "管理端工程审核"),
ZGD_GC(1020, "待整改单", "hygf_zg_gc", "整改单"),
GLDGCYX(1021, "待管理端工程是否线下", "hygf_ys5", "管理端工程是否线下"),
GLDGCXY(1022, "待管理端工程线下验", "hygf_ys6", "管理端工程线下验"),
ZGD_XX(1023, "待整改单", "hygf_zg_xx", "整改单"),
;
private final int code;
private final String dealName;
private final String flowNodeKey;
private final String flowNodeName;
public static FlowKeyTodoEnum getEumByFlowNodeKey(String flowNodeKey) {
for (FlowKeyTodoEnum statusEnum : FlowKeyTodoEnum.values()) {
if (statusEnum.getFlowNodeKey().equals(flowNodeKey)) {
return statusEnum;
}
}
return null;
}
}
\ 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/Enum/GridStatusEnum.java
View file @ 72ed926c
......@@ -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/PowerStationProcessStateEnum.java
View file @ 72ed926c
......@@ -11,6 +11,12 @@ import lombok.Getter;
@AllArgsConstructor
public enum PowerStationProcessStateEnum {
进行中("进行中", "0", "progress"),
设计待审核("设计待审核", "5", "design"),
投融待审核("投融待审核", "6", "tourong"),
法务待审核("法务待审核", "7", "fawu"),
典设图纸待上传("典设图纸待上传", "8", "dst"),
施工图纸待上传("施工图纸待上传", "9", "sgt"),
图纸待审校("图纸待审校", "10", "tzdsj"),
通过("通过", "1", "0"),
不通过("不通过", "2", "1"),
完成("完成", "3", "complete"),
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/RectificationOrderEnum.java
View file @ 72ed926c
......@@ -8,7 +8,9 @@ import lombok.Getter;
public enum RectificationOrderEnum {
施工("ProcessEngineering", "area,design,engineering");
施工("ProcessEngineering", "area,design,engineering"),
并网("GridConnected", "bw-area,bw-design,bw-engineering"),
验收("AcceptanceCheck", "ys-area,ys-tourong,ys-fawu,ys-zichan");
/**
* 名称，描述
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/RectificationRoleEnum.java 0 → 100644
View file @ 72ed926c
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/RepaymentCronSendStateEnum.java 0 → 100644
View file @ 72ed926c
package com.yeejoin.amos.boot.module.hygf.api.Enum;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* @description:还款消息状态枚举
* @author: hzz
* @createDate: 2023/12/13
*/
@Getter
@AllArgsConstructor
public enum RepaymentCronSendStateEnum {
UN_SEND(0,"不执行定时任务"),
SEND(1,"执行定时任务");
/**
* 编码
*/
private Integer code;
/**
* 名称，描述
*/
private String remark;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/RepaymentMessageStateEnum.java 0 → 100644
View file @ 72ed926c
package com.yeejoin.amos.boot.module.hygf.api.Enum;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* @description:还款消息状态枚举
* @author: hzz
* @createDate: 2023/12/13
*/
@Getter
@AllArgsConstructor
public enum RepaymentMessageStateEnum {
UN_CONFIRM(0,"待确认"),
CONFIRM(1,"已确认");
/**
* 编码
*/
private Integer code;
/**
* 名称，描述
*/
private String remark;
public static RepaymentMessageStateEnum getByCode(Integer code) {
RepaymentMessageStateEnum anEnum = null;
for (RepaymentMessageStateEnum type : RepaymentMessageStateEnum.values()) {
if (type.getCode() == code) {
anEnum = type;
break;
}
}
return anEnum;
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/RepaymentRepayStateEnum.java 0 → 100644
View file @ 72ed926c
package com.yeejoin.amos.boot.module.hygf.api.Enum;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* @description:还款消息状态枚举
* @author: hzz
* @createDate: 2023/12/13
*/
@Getter
@AllArgsConstructor
public enum RepaymentRepayStateEnum {
UN_REPAY(0, "待还款"),
REPAY(1, "已还款");
/**
* 编码
*/
private Integer code;
/**
* 名称，描述
*/
private String remark;
public static RepaymentRepayStateEnum getByCode(Integer code) {
RepaymentRepayStateEnum anEnum = null;
for (RepaymentRepayStateEnum type : RepaymentRepayStateEnum.values()) {
if (type.getCode() == code) {
anEnum = type;
break;
}
}
return anEnum;
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/StatisicsHomePageEnum.java 0 → 100644
View file @ 72ed926c
package com.yeejoin.amos.boot.module.hygf.api.Enum;
import lombok.AllArgsConstructor;
import lombok.Getter;
import org.springframework.util.StringUtils;
import java.util.List;
@Getter
@AllArgsConstructor
public enum StatisicsHomePageEnum {
序号("xh",0),
省份("sf",1),
项目公司("regionalCompaniesName",2),
代理商("developerName",3),
实际建设容量("realScale",4),
未勘察("wkc",5),
勘察未通过("kcwtg",6),
勘察未通过容量("kcwtgrl",7),
勘察进行中("kcjxz",8),
勘察进行中容量("kcjxzrl",9),
勘察已完成("kcywc",10),
勘察已完成容量("kcywcrl",11),
备货未通过("bhwtg",12),
备货未通过容量("bhwtgrl",13),
备货进行中("bhjxz",14),
备货进行中容量("bhjxzrl",15),
备货已完成("bhywc",16),
备货已完成容量("bhywcrl",17),
施工未通过("sgwtg",18),
施工未通过容量("sgwtgrl",19),
施工进行中("sgjxz",20),
施工进行中容量("sgjxzrl",21),
施工已完成("sgywc",22),
施工已完成容量("sgywcrl",23),
并网未通过("bwwtg",24),
并网未通过容量("bwwtgrl",25),
并网进行中("bwjxz",26),
并网进行中容量("bwjxzrl",27),
并网已完成("bwywc",28),
并网已完成容量("bwywcrl",29),
验收未通过("yswtg",30),
验收未通过容量("yswtgrl",31),
验收进行中("ysjxz",32),
验收进行中容量("ysjxzrl",33),
验收已完成("ysywc",34),
验收已完成容量("ysywcrl",35),
融资公司("rzgs",36),
融资户数("rzhs",37),
融资容量("rzrl",38),
融资单价("rzdj",39),
放款金额("fkje",40);
/**
* 名称，描述
*/
private String name;
/**
* 编码
*/
private int code;
public static Integer getCodeByName(String name) {
for(StatisicsHomePageEnum obj: StatisicsHomePageEnum.values()) {
if (obj.getName().equals(name)) {
return obj.getCode();
}
}
return null;
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/TaskTypeStationEnum.java
View file @ 72ed926c
......@@ -9,7 +9,8 @@ public enum TaskTypeStationEnum {
电站审核("电站审核", "电站审核"),
合同填报("合同填报", "合同填报"),
重置密码("重置密码", "重置密码"),
设置管理员("设置管理员", "设置管理员");
设置管理员("设置管理员", "设置管理员"),
还款("还款", "还款");
/**
* 名称，描述
*/
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/WorkOrderEnum.java
View file @ 72ed926c
......@@ -24,6 +24,7 @@ public enum WorkOrderEnum {
审核中("审核中", "审核中"),
待审核("待审核", "待审核"),
经销商工程待审核("经销商工程待审核", "经销商工程待审核"),
片区运营待审核("片区运营待审核", "area"),
设计待审核("设计待审核", "design"),
工程待审核("工程待审核", "engineering"),
......@@ -51,9 +52,9 @@ public enum WorkOrderEnum {
*/
private String code;
public static ContractStatusEnum getNodeByCode(String code) {
ContractStatusEnum dealerReviewEnum = null;
for(ContractStatusEnum type: ContractStatusEnum.values()) {
public static WorkOrderEnum getNodeByCode(String code) {
WorkOrderEnum dealerReviewEnum = null;
for(WorkOrderEnum type: WorkOrderEnum.values()) {
if (type.getCode().equals(code)) {
dealerReviewEnum = type;
break;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/config/GlobalExceptionHandler.java
View file @ 72ed926c
......@@ -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/config/SchedulerConfig.java 0 → 100644
View file @ 72ed926c
package com.yeejoin.amos.boot.module.hygf.api.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-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/AcceptanceCheckAuditingDto.java 0 → 100644
View file @ 72ed926c
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 0 → 100644
View file @ 72ed926c
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",example = "1833548546665448235")
private Long workOrderId;
@ApiModelProperty(value = "施工电站id",example = "1705897487172267582")
private Long workOrderPowerStationId;
@ApiModelProperty(value = "农户id",example = "1703932123172255534")
private Long peasantHouseholdId;
@ApiModelProperty(value = "验收状态",example = "3")
private String acceptanceCheckStatus;
@ApiModelProperty(value = "节点标识",example = "jxsAdmin")
private String basicGridNode;
@ApiModelProperty(value = "片区审核",example = "通过")
private String powerStationAreaStatus;
@ApiModelProperty(value = "法务审核",example = "通过")
private String powerStationLegalStatus;
@ApiModelProperty(value = "投融审核",example = "通过")
private String powerStationFinancingStatus;
@ApiModelProperty(value = "资产审核",example = "通过")
private String powerStationAssetsStatus;
@ApiModelProperty(value = "实例id",example = "126883")
private String instanceId;
@ApiModelProperty(value = "验收时间",example = "2024-09-29 16:47:20")
private String acceptanceTime;
// 电站编号
@ApiModelProperty(value = "电站编号",example = "NH016HNLG202404167732")
private String peasantHouseholdNo;
// 户主姓名
@ApiModelProperty(value = "户主姓名",example = "陈召")
private String ownersName;
/// 项目地址
@ApiModelProperty(value = "项目地址",example = "内蒙古自治区/呼和浩特市/清水河县")
private String projectAddressName;
// 并网日期
@ApiModelProperty(value = "并网日期",example = "2024-06-02")
private Date gridConnectionTime;
@ApiModelProperty(value = "区域公司名称",example = "团风县建电新能源科技有限公司")
private String regionalCompaniesName;
@ApiModelProperty(value = "服务代理商",example="团风县建电新能源科技有限公司")
private String serviceAgent;
@ApiModelProperty(value = "并网登记id",example = "1703932123172255534")
private Long fonGridId;
@ApiModelProperty(value = "判断登陆人是否有审核权限字段 无需传值",example = "true")
private String isAudit;
@ApiModelProperty(value = "整改状态")
private String rectificationStatus;
@ApiModelProperty(value = "电站安装规模",example = "7.23")
private String scale;
@ApiModelProperty(value = "电站实际规模",example = "6.23")
private String realScale;
@ApiModelProperty(value = "省份",example = "山西省")
private String province;
@ApiModelProperty(value = "第一次提交日期",example = "2021-11-19 13:23:45")
private String firstSubmitDate;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/AllPowerDto.java
View file @ 72ed926c
......@@ -17,13 +17,13 @@ public class AllPowerDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "第三方电站id")
@ApiModelProperty(value = "第三方电站id",example = "1299184320438816565")
private String thirdStationId;
@ApiModelProperty(value = "年")
@ApiModelProperty(value = "年",example = "2024")
private String year;
@ApiModelProperty(value = "平均功率")
@ApiModelProperty(value = "平均功率",example = "5.55")
private Double power;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/BasicGridAcceptanceDto.java
View file @ 72ed926c
......@@ -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 0 → 100644
View file @ 72ed926c
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 0 → 100644
View file @ 72ed926c
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;
private String firstSubmitDate;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/BusinessFieldDto.java 0 → 100644
View file @ 72ed926c
package com.yeejoin.amos.boot.module.hygf.api.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "BusinessFieldDto", description = "业务字段Dto")
public class BusinessFieldDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "字段名称")
private String fieldName;
@ApiModelProperty(value = "字段标识")
private String fieldFlag;
@ApiModelProperty(value = "业务类型")
private String businessType;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/CommerceInfoDto.java
View file @ 72ed926c
......@@ -20,28 +20,28 @@ public class CommerceInfoDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "统一信用代码")
@ApiModelProperty(value = "统一信用代码",example = "91340100MA2NF88491")
private String creditCode;
@ApiModelProperty(value = "营业执照")
@ApiModelProperty(value = "营业执照",example = "/upload/jxiop/amos_studio/487908BEACF744B7F32D2594A33169.jpg")
private String businessLicensePhoto;
@ApiModelProperty(value = "法人名字")
@ApiModelProperty(value = "法人名字",example = "范友湖")
private String legalPersonName;
@ApiModelProperty(value = "法人身份证号")
@ApiModelProperty(value = "法人身份证号",example = "360121199401064612")
private String legalPersonIdNumber;
@ApiModelProperty(value = "法人身份证照片正面")
@ApiModelProperty(value = "法人身份证照片正面",example = "/upload/jxiop/amos_studio/3F5E55BFAD13E3DFE6B0CA2666A7F66.png")
private String legalPersonCardPhotoFront;
@ApiModelProperty(value = "法人身份证照片反面")
@ApiModelProperty(value = "法人身份证照片反面",example = "/upload/jxiop/amos_studio/3F5E55BFAD13E3DFE6B0CA2666A7F66.png")
private String legalPersonCardPhotoBack;
@ApiModelProperty(value = "法人联系方式")
@ApiModelProperty(value = "法人联系方式",example = "15115722666")
private String legalPersonPhone;
@ApiModelProperty(value = "单位id")
@ApiModelProperty(value = "单位id",example = "1724369413567680513")
private Long unitSeq;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/CommercialDto.java
View file @ 72ed926c
......@@ -24,113 +24,113 @@ public class CommercialDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "商务类型")
@ApiModelProperty(value = "商务类型",example = "zrr")
private String type;
@ApiModelProperty(value = "申请人")
@ApiModelProperty(value = "申请人",example = "admin")
private String applicant;
@ApiModelProperty(value = "身份证号")
@ApiModelProperty(value = "身份证号",example = "610481199402245014")
private String idCard;
@ApiModelProperty(value = "申请人联系电话")
@ApiModelProperty(value = "申请人联系电话",example = "13022982292")
private String telephone;
@ApiModelProperty(value = "省市区")
@ApiModelProperty(value = "省市区",example = "[110000, 110100, 110101]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Integer> projectAddress;
@ApiModelProperty(value = "省市区名称")
@ApiModelProperty(value = "省市区名称",example = "北京市/北京城区/东城区")
private String projectAddressName;
@ApiModelProperty(value = "省市区文字集合")
@ApiModelProperty(value = "省市区文字集合",example = "[\"北京市\", \"北京城区\", \"东城区\"]")
private List<String> projectAddressText;
@ApiModelProperty(value = "设备信息")
@ApiModelProperty(value = "设备信息",example = "设备信息")
private String device;
@ApiModelProperty(value = "电子系统造价")
@ApiModelProperty(value = "电子系统造价",example = "12.55")
private Float cost;
@ApiModelProperty(value = "安装规模")
@ApiModelProperty(value = "安装规模",example = "23.52")
private String scale;
@ApiModelProperty(value = "法务类型")
@ApiModelProperty(value = "法务类型",example = "zjdnhw")
private String legalType;
@ApiModelProperty(value = "有效联系电话")
@ApiModelProperty(value = "有效联系电话",example = "13022982292")
private String legalContactTelephone;
@ApiModelProperty(value = "紧急联系人")
@ApiModelProperty(value = "紧急联系人",example = "13022982292")
private String legalEmergentTelephone;
@ApiModelProperty(value = "结婚证文件标识")
@ApiModelProperty(value = "结婚证文件标识",example = "[{\"url\": \"/upload/common/BABC7F938A4FF56B5CAFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> marriageCredit;
@ApiModelProperty(value = "房产证文件标识")
@ApiModelProperty(value = "房产证文件标识",example = "[{\"url\": \"/upload/common/BABC7F938A125CAFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> realEstateCredit;
@ApiModelProperty(value = "身份证正反面文件标识")
@ApiModelProperty(value = "身份证正反面文件标识",example = "[{\"url\": \"/upload/common/BABC7F938A4213CAFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> idCardCredit;
@ApiModelProperty(value = "户口本文件标识")
@ApiModelProperty(value = "户口本文件标识",example = "[{\"url\": \"/upload/common/BABC7F938A4FF53213AFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> householdBookCredit;
@ApiModelProperty(value = "手持身份证文件标识")
@ApiModelProperty(value = "手持身份证文件标识",example = "[{\"url\": \"/upload/common/BABC7F9321356B5CAFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> handIdCardCredit;
@ApiModelProperty(value = "踏勘照片文件标识")
@ApiModelProperty(value = "踏勘照片文件标识",example = "[{\"uid\": \"0.qcyinzogdcd\", \"url\": \"/upload/common/4CE66E78D6367C67CB4B71C03C7F30.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> surveyPhotosWeb;
@ApiModelProperty(value = "组件平面图与组串连线图文件标识")
@ApiModelProperty(value = "组件平面图与组串连线图文件标识",example = "[{\"url\": \"/upload/common/B234234FF56B5CAFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> formationWeb;
@ApiModelProperty(value = "房屋所有权继承说明文件标识")
@ApiModelProperty(value = "房屋所有权继承说明文件标识",example = "[{\"url\": \"/upload/common/BABC7F938A4FF32423D9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> inheritWeb;
@ApiModelProperty(value = "户用光伏电站项目合作协议文件标识")
@ApiModelProperty(value = "户用光伏电站项目合作协议文件标识",example = "[{\"url\": \"/upload/common/BAB423423AFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> agreementWeb;
@ApiModelProperty(value = "用户手持身份证照片文件标识")
@ApiModelProperty(value = "用户手持身份证照片文件标识",example = "[{\"url\": \"/upload/common/BABC42342FD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> handIdCardLegal;
@ApiModelProperty(value = "法人营业执照文件标识")
@ApiModelProperty(value = "法人营业执照文件标识",example = "[{\"url\": \"/upload/common/BABC7F9382423AFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> licenseLegal;
@ApiModelProperty(value = "法定代理人身份证文件标识")
@ApiModelProperty(value = "法定代理人身份证文件标识",example = "[{\"url\": \"/upload/common/BABC7F938A4423423B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> agentLegal;
@ApiModelProperty(value = "房产证明文件或乡镇街道土管部门房屋产权证明文件文件标识")
@ApiModelProperty(value = "房产证明文件或乡镇街道土管部门房屋产权证明文件文件标识",example = "[{\"url\": \"/upload/common/BABC7F938Aads5CAFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> realEstateLegal;
@ApiModelProperty(value = "房屋屋顶租赁协议/户用光伏共建开发协议文件标识")
@ApiModelProperty(value = "房屋屋顶租赁协议/户用光伏共建开发协议文件标识",example = "[{\"url\": \"/upload/common/BABrwerF56B5CAFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> houseAgreementLegal;
@ApiModelProperty(value = "法人的企业征信报告、工商内档文件标识")
@ApiModelProperty(value = "法人的企业征信报告、工商内档文件标识",example = "[{\"url\": \"/upload/common/BABC7F938A4Fwqeqw9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> creditReportLegal;
@ApiModelProperty(value = "项目备案证文件标识")
@ApiModelProperty(value = "项目备案证文件标识",example = "[{\"url\": \"/upload/common/BABdDsdadasdwrfAFSDSArf9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> filingsLegal;
@ApiModelProperty(value = " 省市区详细地址")
@ApiModelProperty(value = " 省市区详细地址",example = "北京市/北京城区/东城区")
private String projectAddressDetail;
@ApiModelProperty(value = "勘察表id")
@ApiModelProperty(value = "勘察表id",example = "1854346995112611841")
private Long surveyInformationId;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/ConstructionAcceptanceRecordsDto.java 0 → 100644
View file @ 72ed926c
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 0 → 100644
View file @ 72ed926c
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/DataDto.java
View file @ 72ed926c
......@@ -12,5 +12,7 @@ import java.util.List;
@Data
public class DataDto {
String time;
String name;
List<String> snCodes;
String regionalCompaniesCode;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/DayGenerateEX.java
View file @ 72ed926c
......@@ -17,12 +17,15 @@ public class DayGenerateEX {
@ExcelProperty(value = "电站名称", index = 1)
@ApiModelProperty(value = "电站名称")
private String name;
@ExcelProperty(value = "时间", index = 2)
@ExcelProperty(value = "项目公司名称", index = 2)
@ApiModelProperty(value = "项目公司名称")
private String regionalCompaniesName;
@ExcelProperty(value = "时间", index = 3)
String timeDate;
@ExcelProperty(value = "业主姓名", index = 3)
@ExcelProperty(value = "业主姓名", index = 4)
@ApiModelProperty(value = "业主姓名")
private String userName;
@ExcelProperty(value = "电站联系人", index = 4)
@ExcelProperty(value = "电站联系人", index = 5)
@ApiModelProperty(value = "电站联系人")
private String stationContact;
......@@ -32,28 +35,28 @@ public class DayGenerateEX {
* 满发小时数
*
* */
@ExcelProperty(value = "满发小时数(h)", index = 5)
@ExcelProperty(value = "满发小时数(h)", index = 6)
private Double fullhour;
@ExcelProperty(value = "日发电量(kWh)", index = 6)
@ExcelProperty(value = "日发电量(kWh)", index = 7)
// 日发电量
private Double dayGenerate;
@ExcelProperty(value = "日收益(元)", index = 7)
@ExcelProperty(value = "日收益(元)", index = 8)
// 日收益
private Double dayIncome;
/**
* 累计发电量
*/
@ExcelProperty(value = "累计发电量（MWh）", index = 8)
@ExcelProperty(value = "累计发电量（MWh）", index = 9)
private Double accumulatedPower;
/**
* 状态
*/
@ExcelProperty(value = "状态", index = 9)
@ExcelProperty(value = "状态", index = 10)
private String state;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/DesignInformationDto.java
View file @ 72ed926c
......@@ -24,102 +24,102 @@ public class DesignInformationDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "典型设计图信息")
@ApiModelProperty(value = "典型设计图信息",example = "[{\"uid\": \"0.2fcslywd2ry\", \"name\": \"11.dws\", \"url\": \"/upload/common/74FD9327D410951E60319A3215641DDE.dws\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> typicalDiagram;
/**
* 典型设计图信息
*/
@ApiModelProperty(value = "典型设计图信息")
@ApiModelProperty(value = "典型设计图信息",example = "[{\"uid\": \"0.qbiq6dutwl\", \"name\": \"11.dwg\", \"url\": \"/upload/common/4B4C1D996B21A1F4CBBD9B72A92AFBA0.dwg\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> engineering;
@ApiModelProperty(value = "组件排布图")
@ApiModelProperty(value = "组件排布图",example = "[{\"uid\": \"0.9bn4t1r35hf\", \"name\": \"11.dwg\", \"url\": \"/upload/common/E42849CBDE341C85870262917024A.dwg\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> componentLayout;
@ApiModelProperty(value = "组件支架图")
@ApiModelProperty(value = "组件支架图",example = "[{\"uid\": \"0.26j7x3whyx8\", \"name\": \"11.dws\", \"url\": \"/upload/common/D9B23BWADAWDAWD931251F9C1A257.dws\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> componentBracket;
@ApiModelProperty(value = "组串接线图")
@ApiModelProperty(value = "组串接线图",example = "[{\"uid\": \"0.36j7x3whyx8\", \"name\": \"11.dws\", \"url\": \"/upload/common/D9B23B3407AWADAWF9C1A257.dws\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> connectionLine;
@ApiModelProperty(value = "一次接线图")
@ApiModelProperty(value = "一次接线图",example = "[{\"uid\": \"0.46j7x3whyx8\", \"name\": \"11.dws\", \"url\": \"/upload/common/D9B23B3DWAD51F9C1A257.dws\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> onceLine;
@ApiModelProperty(value = "组件")
@ApiModelProperty(value = "组件",example = "[{\"gl\":\"245W\",\"wlbm\":\"1\",\"pzsl\":\"1\",\"bk\":\"30b\",\"Symbol_key\":\"11750F96-B831-4D1F-87F0-5EB18A0C0301\",\"wlmc\":\"1\",\"lx\":\"danjing\",\"dcpgg\":\"1\",\"zgl\":1,\"dsm\":\"dm\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> assembly;
@ApiModelProperty(value = "逆变器")
@ApiModelProperty(value = "逆变器",example = "[{\"xl\":\"bx\",\"gl\":1,\"wlbm\":\"1\",\"pzsl\":\"1\",\"Symbol_key\":\"0665F5B8-19E6-470B-BADC-C94A5C4081E0\",\"wlmc\":\"1\",\"xw\":\"dx\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> inverter;
@ApiModelProperty(value = "电表箱")
@ApiModelProperty(value = "电表箱",example = "[{\"wlbm\":\"1\",\"cz\":\"smc\",\"gn\":\"dz\",\"pzsl\":\"1\",\"Symbol_key\":\"49CE32B8-F22B-4007-B4A3-315A55BE7AEA\",\"wlmc\":\"1\",\"swms\":\"qesw\",\"xw\":\"dx\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> electricityMeter;
@ApiModelProperty(value = "电缆")
@ApiModelProperty(value = "电缆",example = "[{\"xh\":\"ZR-YJV22\",\"gg\":\"3×50+1×25\",\"wlbm\":\"的非官方的功夫格斗\",\"pzsl\":55,\"Symbol_key\":\"BD49C438-C85F-4A88-B105-2757F0EC454A\",\"wlmc\":\"554545\"},{\"xh\":\"ZR-YJV22\",\"gg\":\"3×50+1×25\",\"wlbm\":\"的非官方的功夫格斗\",\"pzsl\":55,\"Symbol_key\":\"ED62C48A-0E32-459C-B02C-ED4C7475E508\",\"wlmc\":\"554545\"},{\"xh\":\"ZR-YJV22\",\"gg\":\"3×50+1×25\",\"wlbm\":\"的非官方的功夫格斗\",\"pzsl\":55,\"Symbol_key\":\"14EF658D-446A-4D80-AE99-AF62898A43D2\",\"wlmc\":\"554545\"},{\"xh\":\"ZR-YJV22\",\"gg\":\"3×50+1×25\",\"wlbm\":\"的非官方的功夫格斗\",\"pzsl\":55,\"Symbol_key\":\"6E8A3BEE-9D6B-489C-9339-0362B8892660\",\"wlmc\":\"554545\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> cable;
@ApiModelProperty(value = "支架")
@ApiModelProperty(value = "支架",example = "[{\"xh\":\"ZR-YJV22\",\"gg\":\"3×50+1×25\",\"wlbm\":\"的非官方的功夫格斗\",\"pzsl\":55,\"Symbol_key\":\"BD49C438-C85F-4A88-B105-2757F0EC454A\",\"wlmc\":\"554545\"},{\"xh\":\"ZR-YJV22\",\"gg\":\"3×50+1×25\",\"wlbm\":\"的非官方的功夫格斗\",\"pzsl\":55,\"Symbol_key\":\"ED62C48A-0E32-459C-B02C-ED4C7475E508\",\"wlmc\":\"554545\"},{\"xh\":\"ZR-YJV22\",\"gg\":\"3×50+1×25\",\"wlbm\":\"的非官方的功夫格斗\",\"pzsl\":55,\"Symbol_key\":\"14EF658D-446A-4D80-AE99-AF62898A43D2\",\"wlmc\":\"554545\"},{\"xh\":\"ZR-YJV22\",\"gg\":\"3×50+1×25\",\"wlbm\":\"的非官方的功夫格斗\",\"pzsl\":55,\"Symbol_key\":\"6E8A3BEE-9D6B-489C-9339-0362B8892660\",\"wlmc\":\"554545\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> support;
@ApiModelProperty(value = " 防滑雪措施")
@ApiModelProperty(value = " 防滑雪措施",example = "wxfhxcs")
private String antiSkiing;
@ApiModelProperty(value = " 防滑雪措施备注")
@ApiModelProperty(value = " 防滑雪措施备注",example = "防滑雪措施备注")
private String antiSkiingNotes;
@ApiModelProperty(value = " 抽检")
@ApiModelProperty(value = " 抽检",example = "f")
private String spotCheck;
@ApiModelProperty(value = " 抽检意见")
@ApiModelProperty(value = " 抽检意见",example = "抽检意见")
private String spotCheckOpinion;
@ApiModelProperty(value = "是否定制")
@ApiModelProperty(value = "是否定制",example = "f")
private String isokCustomized;
@ApiModelProperty(value = "是否加固")
@ApiModelProperty(value = "是否加固",example = "f")
private String windResistant;
@ApiModelProperty(value = "试点方案")
@ApiModelProperty(value = "试点方案",example = "bsd")
private String pilotProgram;
@ApiModelProperty(value = " s试点物料")
@ApiModelProperty(value = " 试点物料",example = "bsd")
private String pilotMaterials;
@ApiModelProperty(value = "方位角")
@ApiModelProperty(value = "方位角",example = "1")
private String azimuth;
@ApiModelProperty(value = "倾角")
@ApiModelProperty(value = "倾角",example = "1")
private String dipAngle;
@ApiModelProperty(value = " 应用场景")
@ApiModelProperty(value = " 应用场景",example = "应用场景")
private String applicationScenario;
@ApiModelProperty(value = "应用场景数量")
@ApiModelProperty(value = "应用场景数量",example = "11")
private Integer applicationScenarioNum;
@ApiModelProperty(value = "支架方案")
@ApiModelProperty(value = "支架方案",example = "支架方案")
private String supportScheme;
@ApiModelProperty(value = "支架方案数量")
@ApiModelProperty(value = "支架方案数量",example = "11")
private Integer supportSchemeNum;
@ApiModelProperty(value = "特殊方案")
@ApiModelProperty(value = "特殊方案",example = "特殊方案")
private String specialPlan;
@ApiModelProperty(value = "特殊方案数量")
@ApiModelProperty(value = "特殊方案数量",example = "111")
private Integer specialPlanNum;
@ApiModelProperty(value = "农户id")
@ApiModelProperty(value = "农户id",example = "1854346995242635266")
private String peasantHouseholdId;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/DropDown.java
View file @ 72ed926c
......@@ -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/ExtendedInformationDto.java
View file @ 72ed926c
......@@ -24,14 +24,14 @@ public class ExtendedInformationDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "订单说明")
@ApiModelProperty(value = "订单说明",example = "订单说明")
private String orderDescription;
@ApiModelProperty(value = "联系人")
@ApiModelProperty(value = "联系人",example = "[{\"qq\":\"11\",\"mailbox\":\"11\",\"wechat\":\"11\",\"telephone\":\"11\",\"userName\":\"11\",\"relation\":\"11\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> contacts;
@ApiModelProperty(value = "勘察表id")
@ApiModelProperty(value = "勘察表id",example = "1854346995112611841")
private Long surveyInformationId;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/FinancingInfoDto.java
View file @ 72ed926c
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.baomidou.mybatisplus.annotation.TableField;
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;
@ApiModelProperty(value = "所属融资公司id")
@ApiModelProperty(value = "所属融资公司id",example = "1844212763006627841")
private Long financingCompaniesSeq;
@ApiModelProperty(value = "所属融资公司名称")
@ApiModelProperty(value = "所属融资公司名称",example = "江苏金融租赁股份有限公司")
private String financingCompaniesName;
@ApiModelProperty(value = "所属融资公司code")
@ApiModelProperty(value = "所属融资公司code",example = "86*355*714*908")
private String financingCompaniesCode;
@ApiModelProperty(value = "农户id")
@ApiModelProperty(value = "农户id",example = "1826216671409369089")
private Long peasantHouseholdId;
@ApiModelProperty(value = "放款时间")
@ApiModelProperty(value = "区域公司Id",example = "1703949560172277762")
private Long regionalCompaniesSeq;
@ApiModelProperty(value = "放款时间",example = "2024-04-11")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
private Date disbursementTime;
@ApiModelProperty(value = "元")
@ApiModelProperty(value = "元",example ="500")
private Double disbursementMoney;
@ApiModelProperty(value = "附件")
private String file;
@ApiModelProperty(value = "状态")
@ApiModelProperty(value = "状态",example = "待推送")
private String status;
@ApiModelProperty(value = "农户id")
@ApiModelProperty(value = "批量推送时使用",example = "[1703949560172277762,1703949560172277762,1703949560172277762]")
private String peasantHouseholdIds;
@ApiModelProperty(value = "工作流示例id",example ="187314")
private String instanceId;
@ApiModelProperty(value = "批次号",example = "1729584315664")
private String batchNo;
@ApiModelProperty(value = "附件")
private List<Object> files;
@ApiModelProperty(value = "单价",example = "0.65")
private String unitPrice;
@ApiModelProperty(value = "投融创建时间",example = "2024-11-19")
private Date trCreateTime;
@ApiModelProperty(value = "批量放款录入使用",example = "[1703949560172277762,1703949560172277762,1703949560172277762]")
List<PeasantHousehold> peasantHouseholds;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/FinancingInfoHistoryDto.java 0 → 100644
View file @ 72ed926c
package com.yeejoin.amos.boot.module.hygf.api.dto;
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.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
* 投融信息
*
* @author system_generator
* @date 2024-10-22
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="FinancingInfoHistoryDto", description="投融信息")
public class FinancingInfoHistoryDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "所属融资公司id")
private Long financingCompaniesSeq;
@ApiModelProperty(value = "所属融资公司名称")
private String financingCompaniesName;
@ApiModelProperty(value = "所属融资公司code")
private String financingCompaniesCode;
@ApiModelProperty(value = "农户id")
private Long peasantHouseholdId;
@ApiModelProperty(value = "放款时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
private Date disbursementTime;
@ApiModelProperty(value = "元")
private BigDecimal disbursementMoney;
@ApiModelProperty(value = "附件")
private String file;
@ApiModelProperty(value = "状态")
private String status;
@ApiModelProperty(value = "放款单价")
private String unitPrice;
@ApiModelProperty(value = "批次号")
private String bacthNo;
private Long regionalCompaniesSeq;
@ApiModelProperty(value = "附件")
private List<Object> files;
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 0 → 100644
View file @ 72ed926c
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/HYGFMaintenanceTicketsDto.java
View file @ 72ed926c
......@@ -144,4 +144,7 @@ public class HYGFMaintenanceTicketsDto extends BaseDto {
private Date taskEndTime;
//创建人id
private String creatorUserId;
private String content;
private String address;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/HistoryPeasantHouseholdDto.java 0 → 100644
View file @ 72ed926c
package com.yeejoin.amos.boot.module.hygf.api.dto;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
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;
/**
* 存量合同电站
*
* @author system_generator
* @date 2024-10-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "HistoryPeasantHouseholdDto", description = "存量合同电站")
public class HistoryPeasantHouseholdDto extends BaseDto {
@ExcelIgnore
private static final long serialVersionUID = 1L;
@ExcelProperty(value = "农户姓名", index = 0)
@ApiModelProperty(value = "农户姓名")
private String ownersName;
@ExcelProperty(value = "身份证号", index = 1)
@ApiModelProperty(value = "身份证号")
private String idCard;
@ExcelProperty(value = "联系方式", index = 2)
@ApiModelProperty(value = "联系方式")
private String telephone;
@ExcelProperty(value = "省份", index = 3)
@ApiModelProperty(value = "省份")
private String province;
@ExcelProperty(value = "房屋地址", index = 4)
@ApiModelProperty(value = "房屋地址")
private String houseAddress;
@ExcelProperty(value = "并网容量(kW)", index = 5)
@ApiModelProperty(value = "并网容量")
private String basicGridCapacity;
@ExcelProperty(value = "并网日期", index = 6)
@ApiModelProperty(value = "并网日期")
private String basicGridDate;
@ExcelProperty(value = "农户编号", index = 7)
@ApiModelProperty(value = "农户编号")
private String peasantHouseholdNo;
@ExcelProperty(value = "购电合同", index = 8)
@ApiModelProperty(value = "购电合同")
private String powerPurchaseContract;
@ExcelProperty(value = "租赁合同", index = 9)
@ApiModelProperty(value = "租赁合同")
private String leaseContract;
@ExcelIgnore
private String files;
/**
* 状态
*/
@ExcelIgnore
private String status;
/**
* 附件地址
*/
@ExcelIgnore
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> fileUrl;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/HouseholdContractPageDto.java
View file @ 72ed926c
......@@ -11,8 +11,9 @@ import lombok.Data;
* @createDate: 2023/8/21
*/
@Data
public class HouseholdContractPageDto extends Page<HouseholdContract> {
public class HouseholdContractPageDto{
private int size;
private int current;
String orderBy;
Boolean isASC;
//合同名称
......@@ -23,6 +24,13 @@ public class HouseholdContractPageDto extends Page<HouseholdContract> {
private String initiateStatus;
/**
* 签署状态
*/
private String status;
private String projectAddress;
/**
* 农户id
*/
private Long peasantHouseholdId;
......@@ -30,6 +38,7 @@ public class HouseholdContractPageDto extends Page<HouseholdContract> {
* 经销商id
*/
private Long dealerId;
private String dealerName;
/**
* 勘察状态
*/
......@@ -48,4 +57,8 @@ public class HouseholdContractPageDto extends Page<HouseholdContract> {
private String userId;
private String contractNumber;
private String regionalCompaniesName;
//省份
private String province;
private String startTime;
private String endTime;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/HygfIcbcRecordDTO.java
View file @ 72ed926c
......@@ -158,6 +158,15 @@ public class HygfIcbcRecordDTO {
* */
@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/IdsDTO.java 0 → 100644
View file @ 72ed926c
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/InformationDto.java
View file @ 72ed926c
......@@ -24,21 +24,21 @@ public class InformationDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "文件编号")
@ApiModelProperty(value = "文件编号",example = "WJ002JXSRYG202411073299")
private String fileNumber;
@ApiModelProperty(value = "档案编号")
@ApiModelProperty(value = "档案编号",example = "DA002JXSRYG202411073242")
private String archivesNumber;
@ApiModelProperty(value = "身份证文件标识")
@ApiModelProperty(value = "身份证文件标识",example = "[{\"url\": \"/upload/common/B1893353D7C528EE4F68EE2245959D8.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> cardFile;
@ApiModelProperty(value = " 房产证文件标识")
@ApiModelProperty(value = " 房产证文件标识",example = "[{\"url\": \"/upload/common/BABC7F938A4FF56B5CAFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> houseProve;
@ApiModelProperty(value = "勘察表id")
@ApiModelProperty(value = "勘察表id",example = "1854346995112611841")
private Long surveyInformationId;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/JpCollectorDto.java
View file @ 72ed926c
......@@ -24,74 +24,75 @@ public class JpCollectorDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "sn编码")
@ApiModelProperty(value = "sn编码", example = "6T2289013652")
private String snCode;
@ApiModelProperty(value = "状态")
@ApiModelProperty(value = "状态", example = "在线")
private String state;
@ApiModelProperty(value = "类型")
@ApiModelProperty(value = "类型", example = "家庭户用")
private String type;
@ApiModelProperty(value = "sim卡号")
@ApiModelProperty(value = "sim卡号", example = "6384762146")
private String simCode;
@ApiModelProperty(value = "数据来源")
@ApiModelProperty(value = "数据来源", example = "锦浪云")
private String dataSource;
@ApiModelProperty(value = "更新时间")
@ApiModelProperty(value = "更新时间", example = "2024-09-18 16:15:53")
private Date updateTime;
@ApiModelProperty(value = "采集器版本")
@ApiModelProperty(value = "采集器版本", example = "Ver10.3.2.0")
private String version;
@ApiModelProperty(value = "出场日期")
@ApiModelProperty(value = "出场日期", example = "1970-01-21")
private Date dischargeDate;
@ApiModelProperty(value = "生产日期")
@ApiModelProperty(value = "生产日期", example = "1970-01-21")
private Date productDate;
@ApiModelProperty(value = "数据上传间隔")
@ApiModelProperty(value = "数据上传间隔", example = "300.00")
private Double dataPeriod;
@ApiModelProperty(value = "本次上电工作时间")
@ApiModelProperty(value = "本次上电工作时间", example = "1970-01-01 08:00:35")
private Date thisWorkTime;
@ApiModelProperty(value = "累计工作时间")
@ApiModelProperty(value = "累计工作时间", example = "1970-01-01 08:53:30")
private Date totalWorkTime;
@ApiModelProperty(value = "第三方电站id")
@ApiModelProperty(value = "第三方电站id", example = "1299184320439241717")
private String thirdStationId;
@ApiModelProperty(value = "第三方厂商标识")
@ApiModelProperty(value = "第三方厂商标识", example = "JLY")
private String thirdCode;
@ApiModelProperty(value = "所属电站")
@ApiModelProperty(value = "所属电站", example = "灵山县-杨芝美")
private String stationName;
@ApiModelProperty(value = "电站地址")
@ApiModelProperty(value = "电站地址", example = "荔香大道靠近山水荔城")
private String addr;
@ApiModelProperty(value = "采集器列表")
private List<JpInverter> jpInverters;
@ApiModelProperty(value = "场站ID", example = "[\"530740893628768256\",\"535020418541821952\"]")
private List<String> stationIds;
@ApiModelProperty(value = "采集器名称")
@ApiModelProperty(value = "采集器名称", example = "通信模块1")
private String name;
@ApiModelProperty(value = "类型")
@ApiModelProperty(value = "类型", example = "通信模块")
private String collectorType;
@ApiModelProperty(value = "信号强度")
@ApiModelProperty(value = "信号强度", example = "5")
private String signalStrength;
@ApiModelProperty(value = "所属项目公司")
@ApiModelProperty(value = "所属项目公司", example = "余干县赣德新能源科技有限公司")
private String companyName;
@ApiModelProperty(value = "流量到期时间")
@ApiModelProperty(value = "流量到期时间", example = "2036-12-31 23:59:59")
private String contractTimeStr;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/JpStationDto.java
View file @ 72ed926c
......@@ -87,6 +87,9 @@ public class JpStationDto extends BaseDto {
@ExcelIgnore
@ApiModelProperty(value = "第三方厂商标识")
private String thirdCode;
@ExcelIgnore
@ApiModelProperty(value = "逆变器SN")
private String nbqSnCode;
/**
* 实时功率
*/
......@@ -167,7 +170,7 @@ public class JpStationDto extends BaseDto {
private Double ratedPower;
@ExcelIgnore
private String regionalCompaniesCode;
@ExcelIgnore
@ExcelProperty(value = "项目公司名称", index = 8)
private String regionalCompaniesName;
@ExcelIgnore
......@@ -185,7 +188,6 @@ public class JpStationDto extends BaseDto {
@ExcelProperty(value = "满发小时数（h）", index = 5)
private Double fullhour;
/**
*
* 实时功率比/
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/LoggerDto.java
View file @ 72ed926c
package com.yeejoin.amos.boot.module.hygf.api.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.LinkedHashMap;
......@@ -14,5 +15,6 @@ import java.util.List;
@ApiModel(value="LoggerDto", description="审核日志")
public class LoggerDto {
//订单跟踪
@ApiModelProperty(value = "订单跟踪")
List<LinkedHashMap> logger;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/MonthGenerateEX.java
View file @ 72ed926c
......@@ -20,12 +20,15 @@ public class MonthGenerateEX {
@ExcelProperty(value = "电站名称", index = 1)
@ApiModelProperty(value = "电站名称")
private String name;
@ExcelProperty(value = "时间", index = 2)
@ExcelProperty(value = "项目公司名称", index = 2)
@ApiModelProperty(value = "项目公司名称")
private String regionalCompaniesName;
@ExcelProperty(value = "时间", index = 3)
String timeDate;
@ExcelProperty(value = "业主姓名", index = 3)
@ExcelProperty(value = "业主姓名", index = 4)
@ApiModelProperty(value = "业主姓名")
private String userName;
@ExcelProperty(value = "电站联系人", index = 4)
@ExcelProperty(value = "电站联系人", index = 5)
@ApiModelProperty(value = "电站联系人")
private String stationContact;
......@@ -35,7 +38,7 @@ public class MonthGenerateEX {
* 满发小时数
*
* */
@ExcelProperty(value = "满发小时数(h)", index = 5)
@ExcelProperty(value = "满发小时数(h)", index = 6)
private Double fullhour;
......@@ -43,15 +46,15 @@ public class MonthGenerateEX {
// 月发电量
@ExcelProperty(value = "月发电量(kWh)", index = 6)
@ExcelProperty(value = "月发电量(kWh)", index = 7)
private Double monthGenerate;
// 月收益
@ExcelProperty(value = "月收益(元)", index = 7)
@ExcelProperty(value = "月收益(元)", index = 8)
private Double monthIncome;
/**
* 累计发电量
*/
@ExcelProperty(value = "累计发电量（MWh）", index = 8)
@ExcelProperty(value = "累计发电量（MWh）", index = 9)
private Double accumulatedPower;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/PeasantHouseholdPageDto.java
View file @ 72ed926c
......@@ -5,6 +5,10 @@ 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;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/PowerStationDto.java
View file @ 72ed926c
......@@ -94,4 +94,13 @@ 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;
@ApiModelProperty(value = "经销商首次确认时间")
private String firstSubmitDate;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/PowerStationEngineeringInfoAllDto.java
View file @ 72ed926c
package com.yeejoin.amos.boot.module.hygf.api.dto;
import com.yeejoin.amos.boot.module.hygf.api.entity.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
......@@ -9,53 +11,84 @@ import lombok.Data;
* @createDate: 2024/1/12
*/
@Data
@ApiModel(value = "PowerStationEngineeringInfoAllDto",description = "施工工程信息")
public class PowerStationEngineeringInfoAllDto {
//并网验收审核记录
@ApiModelProperty(value = "并网验收审核记录")
LoggerDto loggerDto;
//验收审核记录
@ApiModelProperty(value = "验收审核记录")
LoggerDto loggerYsDto;
//自审信息
@ApiModelProperty(value = "自审信息")
ConstructionRecords constructionRecords;
@ApiModelProperty(value = "并网操作日志")
ConstructionGirdRecords constructionGirdRecords;
@ApiModelProperty(value = "验收操作日志")
ConstructionAcceptanceRecords acceptanceRecords;
// 基本信息
@ApiModelProperty(value = "基本信息")
SurveyInformationDto surveyInformation;
@ApiModelProperty(value = "施工派工单Id",example = "1813102468939149314")
Long workOrderPowerStationId;
// 资料归档
@ApiModelProperty(value = "资料归档")
InformationDto information;
// 勘察信息详情
@ApiModelProperty(value = "勘察信息详情")
SurveyDetailsDto surveyDetails;
// 扩展信息
@ApiModelProperty(value = "扩展信息")
ExtendedInformationDto extendedInformation;
// 商务信息
@ApiModelProperty(value = "商务信息")
CommercialDto commercial;
//设计信息
@ApiModelProperty(value = "订单跟踪")
DesignInformationDto designInformation;
//订单跟踪
@ApiModelProperty(value = "订单跟踪")
LoggerDto orderTracking;
//工程信息
@ApiModelProperty(value = "工程信息")
PowerStationEngineeringInfo powerStationEngineeringInfo;
//施工信息
@ApiModelProperty(value = "施工信息")
PowerStationConstructionData powerStationConstructionData;
//并网信息
@ApiModelProperty(value = "并网信息")
HygfOnGrid hygfOnGrid;
//派工单信息
@ApiModelProperty(value = "派工单信息")
WorkOrder workOrder;
//验收信息
@ApiModelProperty(value = "验收信息")
AcceptanceCheck acceptanceCheck;
@ApiModelProperty(value = "保存标识",example = "0")
//保存标识 0 保存 1保存并提交
Integer commitFlag;
@ApiModelProperty(value = "流程类型",example = "0")
//流程类型 0 并网 1是验收
Integer flowType;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/PowerStationTimeStatisticsBatchDto.java 0 → 100644
View file @ 72ed926c
package com.yeejoin.amos.boot.module.hygf.api.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
import java.util.Map;
@Data
@ApiModel("电站时间批量处理Dto")
public class PowerStationTimeStatisticsBatchDto {
@ApiModelProperty("主键Id")
private List<String> sequenceNbrList;
@ApiModelProperty("过滤字段")
private Map<String, Object> filters;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/PowerStationTimeStatisticsDto.java 0 → 100644
View file @ 72ed926c
package com.yeejoin.amos.boot.module.hygf.api.dto;
import com.alibaba.excel.annotation.ExcelIgnore;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 电站时间统计DTO
*/
@Data
@ApiModel(value="PowerStationTimeStatisticsDto", description="电站时间统计")
public class PowerStationTimeStatisticsDto implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "主键ID")
private Long sequenceNbr;
@ApiModelProperty(value = "电站编号")
private String peasantHouseholdNo;
@ApiModelProperty(value = "电站名称")
private String ownersName;
@ApiModelProperty(value = "电站安装规模")
private String scale;
@ApiModelProperty(value = "电站实际规模")
private String realScale;
@ApiModelProperty(value = "省份")
private String province;
@ApiModelProperty(value = "区域公司")
private String regionalCompaniesName;
@ApiModelProperty(value = "经销商")
private String serviceAgent;
@ApiModelProperty(value = "勘察开始时间")
private Date kcCreateTime;
@ApiModelProperty(value = "勘察结束时间")
private Date kcEndTime;
@ApiModelProperty(value = "勘察停留时间")
private String kcStopTime;
@ApiModelProperty(value = "电子合同签约开始时间")
private Date dzhtqyCreateTime;
@ApiModelProperty(value = "电子合同签约结束时间")
private Date dzhtqyEndTime;
@ApiModelProperty(value = "电子合同签约停留时间")
private String dzhtqyStopTime;
@ApiModelProperty(value = "设计开始时间")
private Date sjCreateTime;
@ApiModelProperty(value = "设计结束时间")
private Date sjEndTime;
@ApiModelProperty(value = "设计停留时间")
private String sjStopTime;
@ApiModelProperty(value = "发货备货开始时间")
private Date fhbhCreateTime;
@ApiModelProperty(value = "发货备货结束时间")
private Date fhbhEndTime;
@ApiModelProperty(value = "发货备货停留时间")
private String fhbhStopTime;
@ApiModelProperty(value = "施工开始时间")
private Date sgCreateTime;
@ApiModelProperty(value = "施工结束时间")
private Date sgEndTime;
@ApiModelProperty(value = "施工停留时间")
private String sgStopTime;
@ApiModelProperty(value = "并网开始时间")
private Date bwCreateTime;
@ApiModelProperty(value = "并网结束时间")
private Date bwEndTime;
@ApiModelProperty(value = "并网停留时间")
private String bwStopTime;
@ApiModelProperty(value = "验收开始时间")
private Date ysCreateTime;
@ApiModelProperty(value = "验收结束时间")
private Date ysEndTime;
@ApiModelProperty(value = "验收停留时间")
private String ysStopTime;
@ApiModelProperty(value = "投融开始时间")
private Date trCreateTime;
@ApiModelProperty(value = "投融结束时间")
private Date trEndTime;
@ApiModelProperty(value = "投融停留时间")
private String trStopTime;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/PreparationMoneyDto.java
View file @ 72ed926c
......@@ -2,12 +2,14 @@ package com.yeejoin.amos.boot.module.hygf.api.dto;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import com.yeejoin.amos.boot.module.hygf.api.entity.PreparationMoneyLog;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* 发货单
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/RepaymentBatchDto.java 0 → 100644
View file @ 72ed926c
package com.yeejoin.amos.boot.module.hygf.api.dto;
import lombok.Data;
import java.util.List;
@Data
public class RepaymentBatchDto {
private List<String> sequenceNbrList;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/RepaymentDto.java 0 → 100644
View file @ 72ed926c
package com.yeejoin.amos.boot.module.hygf.api.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.time.LocalDate;
import java.util.Date;
/**
*
*
* @author hzz
* @date 2024-09-26
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "RepaymentDto", description = "还款Dto实体类")
public class RepaymentDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "公司名称")
private String companyName;
@ApiModelProperty(value = "公司CODE")
private String regionalCompaniesCode;
@ApiModelProperty(value = "公司ID")
private Long companyId;
@ApiModelProperty(value = "期次")
private String period;
@ApiModelProperty(value = "还款时间")
private LocalDate repayDate;
@ApiModelProperty(value = "租金")
private Double rent;
@ApiModelProperty(value = "利息")
private Double interest;
@ApiModelProperty(value = "本金")
private Double principal;
@ApiModelProperty(value = "放款批次")
private String loanPeriod;
@ApiModelProperty(value = "消息状态0未确认1已确认")
private Integer messageState;
@ApiModelProperty(value = "消息状态")
private String messageStateStr;
@ApiModelProperty(value = "还款状态0未还款1已还款")
private Integer repayState;
@ApiModelProperty(value = "还款状态")
private String repayStateStr;
@ApiModelProperty(value = "定时发送状态")
private Integer cronSendState;
@ApiModelProperty(value = "创建时间")
private Date createTime;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/ReviewDto.java
View file @ 72ed926c
......@@ -31,7 +31,7 @@ public class ReviewDto {
private String planInstanceId;
private String adminUserId;
private String regionalCompaniesName;
private String unitInfoId;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/StationFieldDto.java 0 → 100644
View file @ 72ed926c
package com.yeejoin.amos.boot.module.hygf.api.dto;
import com.yeejoin.amos.boot.module.hygf.api.entity.HygfBusinessField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
import java.util.Map;
@Data
@ApiModel(value = "StationFieldDto", description = "电站字段Dto")
public class StationFieldDto {
@ApiModelProperty(value = "电站ID",example = "[1851456410051678210]")
private List<String> stationIdList;
@ApiModelProperty(value = "业务字段主键",example = "[\"4\", \"3\"]")
private List<String> businessIdList;
@ApiModelProperty(value = "业务字段")
private List<HygfBusinessField> businessFieldList;
@ApiModelProperty(value = "导出页面Code",example = "2")
private String exportPageCode;
@ApiModelProperty(value = "过滤条件",example = "{\n" +
" \"powerStationCode\": \"2\",\n" +
" \"ownersName\": \"cz\",\n" +
" \"serviceAgent\": \"XXXg公司\",\n" +
" \"province\": 610000,\n" +
" \"regionalCompaniesName\": \"XXXg公司\",\n" +
" \"projectAddress\": \"xx市\",\n" +
" \"status\": \"未签署\",\n" +
" \"startTime\": null,\n" +
" \"endTime\": \"2024-11-28 17:59:38\"\n" +
"}")
private Map<String, Object> filters;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/SurveyInfoAllDto.java
View file @ 72ed926c
......@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.hygf.api.dto;
import com.yeejoin.amos.boot.module.hygf.api.entity.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
......@@ -9,44 +10,57 @@ import lombok.Data;
public class SurveyInfoAllDto {
// 资料归档
@ApiModelProperty(value = "资料归档")
InformationDto information;
// 勘察信息详情
@ApiModelProperty(value = "勘察信息详情")
SurveyDetailsDto surveyDetails;
// 勘察信息
@ApiModelProperty(value = "勘察信息")
SurveyInformationDto surveyInformation;
// 扩展信息
@ApiModelProperty(value = "扩展信息")
ExtendedInformationDto extendedInformation;
// 商务信息
@ApiModelProperty(value = "商务信息")
CommercialDto commercial;
//设计信息
@ApiModelProperty(value = "设计信息")
DesignInformationDto designInformation;
//订单跟踪
@ApiModelProperty(value = "订单跟踪")
LoggerDto orderTracking;
//工程信息
@ApiModelProperty(value = "工程信息")
PowerStationEngineeringInfo powerStationEngineeringInfo;
//施工信息
@ApiModelProperty(value = "施工信息")
PowerStationConstructionData powerStationConstructionData;
//并网信息
@ApiModelProperty(value = "并网信息")
HygfOnGrid hygfOnGrid;
//派工单信息
@ApiModelProperty(value = "派工单信息")
WorkOrder workOrder;
//自审信息
@ApiModelProperty(value = "自审信息")
ConstructionRecords constructionRecords;
//验收信息
@ApiModelProperty(value = "验收信息")
AcceptanceCheck acceptanceCheck;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/SurveyInformationDto.java
View file @ 72ed926c
......@@ -9,6 +9,8 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
......@@ -21,89 +23,105 @@ import java.util.List;
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="SurveyInformationDto", description="勘察信息")
@ApiModel(value = "SurveyInformationDto", description = "勘察信息")
public class SurveyInformationDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "勘察编号")
@ApiModelProperty(value = "勘察编号",example = "KC002JXSRYG202411071202")
private String surveyNumber;
@ApiModelProperty(value = "电站类型")
@ApiModelProperty(value = "电站类型",example = "zx")
private String powerStationType;
@ApiModelProperty(value = "开发方名称")
@ApiModelProperty(value = "开发方名称",example = "MYSQL兼容经销商")
private String developerName;
@ApiModelProperty(value = "开发方code")
@ApiModelProperty(value = "开发方code",example = "86*355*443*883")
private String developerCode;
@ApiModelProperty(value = "开发方平台id")
@ApiModelProperty(value = "开发方平台id",example = "1815743601213181953")
private Long developerId;
@ApiModelProperty(value = " 业务员id")
@ApiModelProperty(value = " 业务员id",example = "1815743601213181953")
private String salesmanId;
@ApiModelProperty(value = "业务员名称")
@ApiModelProperty(value = "业务员名称",example = "admin")
private String salesman;
@ApiModelProperty(value = "制单人")
@ApiModelProperty(value = "制单人",example = "开发")
private String creator;
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "制单时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "制单时间",example = "2024-11-07 13:51:17")
private Date creatorTime;
@ApiModelProperty(value = "业主类型")
@ApiModelProperty(value = "业主类型",example = "jm")
private String ownerType;
@ApiModelProperty(value = " 审核状态 0未审核,1审核中，2审核结束")
@ApiModelProperty(value = " 审核状态 0未审核,1审核中，2审核结束",example = "0")
private Integer review;
@ApiModelProperty(value = "来源农户编号")
@ApiModelProperty(value = "来源农户编号",example = "NH002JXSRYG20241107121128")
private String peasantHouseholdNo;
@ApiModelProperty(value = "业主姓名")
@ApiModelProperty(value = "业主姓名",example = "admin")
private String ownersName;
@ApiModelProperty(value = "联系电话")
@ApiModelProperty(value = "联系电话",example = "13022982292")
private String telephone;
@ApiModelProperty(value = "身份证号")
@ApiModelProperty(value = "身份证号",example = "610481199402245014")
private String idCard;
@ApiModelProperty(value = "邮箱")
@ApiModelProperty(value = "邮箱",example = "212da@163.com")
private String mailbox;
@ApiModelProperty(value = "项目详细地址")
@ApiModelProperty(value = "项目详细地址",example = "北京市/北京城区/东城区")
private String projectAddressDetail;
@ApiModelProperty(value = "常住详细地址")
@ApiModelProperty(value = "常住详细地址",example = "北京市/北京城区/东城区")
private String permanentAddressDetail;
@ApiModelProperty(value = "项目地址code")
@ApiModelProperty(value = "项目地址code",example = "[110000, 110100, 110101]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Integer> projectAddress;
@ApiModelProperty(value = "项目地址文字")
@ApiModelProperty(value = "项目地址文字",example = "[\"北京市\", \"北京城区\", \"东城区\"]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<String> projectAddressText;
@ApiModelProperty(value = "项目地址")
@ApiModelProperty(value = "项目地址",example = "北京市/北京城区/东城区")
private String projectAddressName;
@ApiModelProperty(value = "常住地址code")
@ApiModelProperty(value = "常住地址",example = "北京市/北京城区/东城区")
private String permanentAddressName;
@ApiModelProperty(value = "常住地址code",example = "[110000, 110100, 110101]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Integer> permanentAddress;
@ApiModelProperty(value = "常住地址文字")
@ApiModelProperty(value = "常住地址文字",example = "北京市/北京城区/东城区")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<String> permanentAddressText;
@ApiModelProperty(value = "常住是否相同")
@ApiModelProperty(value = "常住是否相同",example = "相同")
private String isPermanent;
@ApiModelProperty(value = "定金")
@ApiModelProperty(value = "定金",example = "12.23")
private Float deposit;
@ApiModelProperty(value = "区域公司id",example = "1702215275253886977")
@NotNull(message = "区域公司id不能为空")
private Long regionalCompaniesSeq;
@ApiModelProperty(value = "农户id",example = "1854346995112611841")
private Long peasantHouseholdId;
@ApiModelProperty(value = "身份证正面",example = "[{\"url\": \"/upload/common/F0DC9029F692D5D88F18CDAF8E45561.jpg\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> idCardFront;
@ApiModelProperty(value = "身份证反面",example = "[{\"url\": \"/upload/common/2F7BD22F5A557469FC484C5E3E62B56D.jpg\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> idCardOpposite;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/UserMessageDto.java
View file @ 72ed926c
......@@ -22,22 +22,22 @@ public class UserMessageDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "任务类型")
@ApiModelProperty(value = "任务类型",example = "经销商审核")
private String type;
@ApiModelProperty(value = "业务id")
@ApiModelProperty(value = "业务id",example = "1706869110685569025")
private Long businessId;
@ApiModelProperty(value = "用户id")
@ApiModelProperty(value = "用户id",example = "5214012")
private String amosUserId;
@ApiModelProperty(value = " 消息创建时间")
@ApiModelProperty(value = " 消息创建时间",example = "2023-09-27 11:11:23")
private Date creationTime;
@ApiModelProperty(value = "消息内容")
@ApiModelProperty(value = "消息内容",example = "经销商四川锦绣天地建筑工程有限公司南昌分公司待经销商审核待完成")
private String taskName;
@ApiModelProperty(value = "经销商orgCode")
@ApiModelProperty(value = "经销商orgCode",example = "86*355*443*479")
private String amosOrgCode;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/UserMessagePageDto.java
View file @ 72ed926c
......@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.hygf.api.dto;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.hygf.api.entity.UserMessage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
......@@ -13,6 +15,7 @@ import java.util.Date;
* @createDate: 2023/8/21
*/
@Data
@ApiModel(value = "UserMessagePageDto",description = "人员消息分页")
public class UserMessagePageDto extends Page<UserMessage> {
......@@ -20,22 +23,26 @@ public class UserMessagePageDto extends Page<UserMessage> {
/**
* 任务类型
*/
@ApiModelProperty(value = "任务类型",example = "经销商审核")
private String type;
/**
* 用户id
*/
@ApiModelProperty(value = "用户id",example = "5214012")
private String amosUserId;
/**
* 消息创建时间
*/
@ApiModelProperty(value = " 消息创建时间",example = "2023-09-27 11:11:23")
private Date creationTime;
/**
* 消息内容
*/
@ApiModelProperty(value = "消息内容",example = "经销商四川锦绣天地建筑工程有限公司南昌分公司待经销商审核待完成")
private String taskName;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/WorkOrderPage.java
View file @ 72ed926c
package com.yeejoin.amos.boot.module.hygf.api.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -14,73 +15,97 @@ import java.util.List;
*/
@Data
@ApiModel(value = "WorkOrderPage",description = "派工单分页")
public class WorkOrderPage {
@ApiModelProperty(value = "农户id")
@ApiModelProperty(value = "农户id",example = "1712049025391267842")
protected Long sequenceNbr;
@ApiModelProperty(value = "农户信息编号")
@ApiModelProperty(value = "农户信息编号",example = "NH004GXZZZZYLBL202405164277")
private String peasantHouseholdNo;
@ApiModelProperty(value = "派工单编号")
@ApiModelProperty(value = "开发商",example = "admin")
private String developerName;
@ApiModelProperty(value = "区域公司",example = "户用光伏测试有限公司")
private String regionalCompaniesName;
@ApiModelProperty(value = "派工单编号",example = "PG060HBWHXZ202404149953")
private String workOrderNum;
@ApiModelProperty(value = "业主姓名")
@ApiModelProperty(value = "业主姓名",example = "admin")
private String ownersName;
@ApiModelProperty(value = "工程负责人")
@ApiModelProperty(value = "工程负责人",example = "admin")
private String projectRegionManager;
@ApiModelProperty(value = "施工负责人")
@ApiModelProperty(value = "施工负责人",example = "admin")
private String constructionRegionManager;
@JsonFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "完工时间")
@ApiModelProperty(value = "完工时间",example = "2024-10-25")
private Date completionDate;
@ApiModelProperty(value = "项目地址")
@ApiModelProperty(value = "项目地址",example = "北京市/北京城区/东城")
private String projectAddressName;
@ApiModelProperty(value = "电站施工状态")
@ApiModelProperty(value = "电站施工状态",example = "已完工")
private String powerStationConstructionStatus;
@ApiModelProperty(value = "派工电站id")
@ApiModelProperty(value = "派工电站id",example = "1712049025391267842")
protected Long workOrderPowerStationId;
@ApiModelProperty(value = "派工电站节点标识")
@ApiModelProperty(value = "派工电站节点标识",example = "1712049025391267842")
protected String workOrderPowerStationNode;
@ApiModelProperty(value = "派工单id")
@ApiModelProperty(value = "派工单id",example = "1712049025391267842")
protected String workOrderId;
/**
* 区域公司id
*/
@ApiModelProperty(value = "区域公司id",example = "1703949560172277762")
private Long regionCompanyId;
@ApiModelProperty(value = "平台经销商单位id")
@ApiModelProperty(value = "平台经销商单位id",example = "1761919380884582402")
private Long amosDealerId;
@ApiModelProperty(value = "类型",example = "2")
private String type;
@ApiModelProperty(value = "片区审核")
@ApiModelProperty(value = "片区审核",example = "通过")
private String powerStationAreaStatus ;
@ApiModelProperty(value = "设计审核")
@ApiModelProperty(value = "设计审核",example = "通过")
private String powerStationDesignStatus ;
@ApiModelProperty(value = "工程审核")
@ApiModelProperty(value = "工程审核",example = "通过")
private String powerStationEngineeringStatus ;
@ApiModelProperty(value = "判断是否有进行中的整改单数量")
@ApiModelProperty(value = "判断是否有进行中的整改单数量",example = "33")
private Long rectificationNum ;
@ApiModelProperty(value = "最后一条作废整改单id")
@ApiModelProperty(value = "最后一条作废整改单id",example = "1720655712712945666")
private Long rollbackOrderId ;
@ApiModelProperty(value = "页码",example = "1")
int current;
@ApiModelProperty(value = "大小",example = "20")
int size;
@ApiModelProperty(value = "数据过滤标识")
@ApiModelProperty(value = "数据过滤标识",example = "[\"yseq\",\"tet\"]")
private List<String> workOrderPowerStationNodes ;
@ApiModelProperty(value = "判断是否可以审核,默认不可以")
@ApiModelProperty(value = "判断是否可以审核,默认不可以",example = "不可以")
private String isAudit ;
@ApiModelProperty(value = "历史审核意见")
@ApiModelProperty(value = "历史审核意见",example = "不通过")
private String auditIdea ;
@ApiModelProperty(value = "实例id")
@ApiModelProperty(value = "实例id",example = "8dbc3974-a160-11ef-aa06-02420a1c0010")
private String instanceId ;
@ApiModelProperty(value = "电站安装规模",example = "245.55")
private String scale ;
@ApiModelProperty(value = "电站实际规模",example = "245.75")
private String realScale ;
@ApiModelProperty(value = "省份",example = "陕西省")
private String province;
@ApiModelProperty(value = "首次编辑施工资料日期",example = "2024-10-14 10:12:31")
private String firstConstructionDate;
@ApiModelProperty(value = "开始时间",example = "2024-10-14 10:12:31")
private String startTime;
@ApiModelProperty(value = "结束时间",example = "2024-10-15 10:12:31")
private String endTime;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/WorkOrderPowerStationDto.java
View file @ 72ed926c
......@@ -19,15 +19,16 @@ public class WorkOrderPowerStationDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "施工电站Id",example = "1779359620159008770")
private Long workOrderId;
@ApiModelProperty(value = "农户ID",example = "177935963124219008770")
private Long peasantHouseholdId;
@ApiModelProperty(value = "电站施工状态")
@ApiModelProperty(value = "电站施工状态",example = "已完工")
private String powerStationConstructionStatus;
@ApiModelProperty(value = "完工审核意见")
@ApiModelProperty(value = "完工审核意见",example = "通过")
private String completionAuditOpinion;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/WorkflowResultDto.java
View file @ 72ed926c
......@@ -2,6 +2,8 @@ package com.yeejoin.amos.boot.module.hygf.api.dto;
import lombok.Data;
import java.util.Date;
@Data
public class WorkflowResultDto {
......@@ -11,11 +13,6 @@ public class WorkflowResultDto {
*/
String instanceId;
// /**
// * 执行人角色
// */
// String nextExecutorIds;
String executorId;
......@@ -49,4 +46,22 @@ public class WorkflowResultDto {
String nextNodeKey;
/**
* 任务发起人id 不变 第一次提交的人
* 从业务表中 created_uesr_id
*/
private String startUserId;
/**
* 任务发起人名称 不变
* 名字
*/
private String startUser;
/**
* 任务发起人所在单位 不变
*/
private String startUserCompanyName;
/**
* 任务发起人发起时间 不变
*/
private Date startDate;
}
pom.xml
View file @ 72ed926c
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment