Skip to content

A
amos-boot-biz
Commit 0996f163 authored by chenzhao's avatar chenzhao
Browse files
Options

Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

parents c73ff423 26220b21
Hide whitespace changes
Inline Side-by-side
Showing with 1283 additions and 111 deletions
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/Utils/GolangRequestUtil.java
View file @ 0996f163
......@@ -45,7 +45,7 @@ public class GolangRequestUtil {
/**
* @return String 请求返回的response字符串
*/
public <T> String getResPonse(String apiurl,String requestMethod,String requestParmInfo,String ResultResolveRule,Class <T> tClass) {
public <T> List<T> getResPonse(String apiurl,String requestMethod,String requestParmInfo,String ResultResolveRule,Class <T> tClass) {
String respone = "";
String params = "";
JSONArray jsonArray = null;
......@@ -59,12 +59,7 @@ public class GolangRequestUtil {
respone = sendRequest(requestMethod, url,requestParmInfo, headMap);
jsonArray = handlerResponseByResultResolverule(ResultResolveRule, respone);
List<T> result = JSONArray.parseArray(jsonArray.toJSONString(),tClass);
for (int i = 0; i < result.size(); i++) {
GolangStationList golangStationList =(GolangStationList) result.get(i);
golangStationList.setCreatedTime(new Date());
golangStationMapper.insert(golangStationList);
}
return respone;
return result;
}
/**
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/constant/GoLangConstant.java
View file @ 0996f163
......@@ -2,10 +2,33 @@ package com.yeejoin.amos.api.householdapi.constant;
import org.apache.xmlbeans.impl.xb.xsdschema.Public;
import java.util.HashMap;
public class GoLangConstant {
public static final HashMap<String, String> stationStaus = new HashMap<String, String>() {
{
put("1", "在线");
put("2", "离线");
put("3", "报警");
}
};
public static final HashMap<String, String> intoNetWorkStatus = new HashMap<String, String>() {
{
put("0", "普通并网");
put("1", "储能电站");
put("2", "AC无逆变器电站");
put("3", "EPM电站");
put("4", "内置电表");
put("5", "外置电表");
}
};
public static String baseurl = "https://api.ginlong.com:13333";
public static String tokenurl = "";
public static String prodcerappid = "1300386381676732593";
public static String prodcerappsecret= "9659623b4ebe432fae5d26bdc8a10217";
public static String prodcerappsecret = "9659623b4ebe432fae5d26bdc8a10217";
public static String stationListUrl = "/v1/api/userStationList";
public static String stationDetailUrl = "/v1/api/stationDetail";
public static String resovleRule_data_page_records = "data,page,records";
public static String resovleRule_data = "data";
public static String requestPost = "POST";
}
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/controller/HouseholdTestController.java
View file @ 0996f163
......@@ -4,6 +4,7 @@ import com.yeejoin.amos.api.householdapi.Utils.GolangRequestUtil;
import com.yeejoin.amos.api.householdapi.Utils.HouseholdPvUtils;
import com.yeejoin.amos.api.householdapi.constant.GoLangConstant;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.GolangStationList;
import com.yeejoin.amos.api.householdapi.face.service.GoLangDataAcquisitionService;
import fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -31,7 +32,7 @@ public class HouseholdTestController {
@Autowired
private HouseholdPvUtils householdPvUtils;
@Autowired
GolangRequestUtil golangRequestUtil;
private GoLangDataAcquisitionService goLangDataAcquisitionService;
/**
......@@ -53,10 +54,8 @@ public class HouseholdTestController {
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@PostMapping(value = "/golangnew")
@ApiOperation(httpMethod = "POST", value = "锦浪云", notes = "锦浪云")
public String golangnew() throws IOException {
HashMap<String,Object> requestInfo= new HashMap<>();
requestInfo.put("pageNo",1);
requestInfo.put("pageSize",100);
return golangRequestUtil.getResPonse(GoLangConstant.stationListUrl,"POST",JSON.toJSONString(requestInfo),"data,page,records", GolangStationList.class);
public void golangnew() throws IOException {
// goLangDataAcquisitionService.stationList();
goLangDataAcquisitionService.stationDetail();
}
}
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/hygf/JpCollector.java 0 → 100644
View file @ 0996f163
package com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.hygf;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
/**
* 户用光伏监盘采集器表
*
* @author system_generator
* @date 2023-09-19
*/
@Data
@Accessors(chain = true)
@TableName("hygf_jp_collector")
public class JpCollector implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 是否删除
*/
@TableField(value = "is_delete")
public Boolean isDelete = false;
@TableId(value = "sequence_nbr", type = IdType.ID_WORKER)
protected Long sequenceNbr;
@TableField(value = "rec_date", fill = FieldFill.INSERT_UPDATE)
protected Date recDate;
@TableField(value = "rec_user_id", fill = FieldFill.INSERT_UPDATE)
protected String recUserId;
@TableField(value = "rec_user_name", fill = FieldFill.INSERT_UPDATE)
protected String recUserName;
/**
* sn编码
*/
@TableField("sn_code")
private String snCode;
/**
* 状态
*/
@TableField("state")
private String state;
/**
* 类型
*/
@TableField("type")
private String type;
/**
* sim卡号
*/
@TableField("sim_code")
private String simCode;
/**
* 数据来源
*/
@TableField("data_source")
private String dataSource;
/**
* 更新时间
*/
@TableField("update_time")
private Date updateTime;
/**
* 采集器版本
*/
@TableField("version")
private String version;
/**
* 出场日期
*/
@TableField("discharge_date")
private Date dischargeDate;
/**
* 生产日期
*/
@TableField("product_date")
private Date productDate;
/**
* 数据上传间隔
*/
@TableField("data_period")
private Double dataPeriod;
/**
* 本次上电工作时间
*/
@TableField("this_work_time")
private Date thisWorkTime;
/**
* 累计工作时间
*/
@TableField("total_work_time")
private Date totalWorkTime;
/**
* 第三方电站id
*/
@TableField("third_station_id")
private String thirdStationId;
/**
* 第三方厂商标识
*/
@TableField("third_code")
private String thirdCode;
}
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/hygf/JpInverter.java 0 → 100644
View file @ 0996f163
package com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.hygf;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
/**
* 户用光伏监盘逆变器表
*
* @author system_generator
* @date 2023-09-19
*/
@Data
@Accessors(chain = true)
@TableName("hygf_jp_inverter")
public class JpInverter implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "sequence_nbr", type = IdType.ID_WORKER)
protected Long sequenceNbr;
@TableField(value = "rec_date", fill = FieldFill.INSERT_UPDATE)
protected Date recDate;
@TableField(value = "rec_user_id", fill = FieldFill.INSERT_UPDATE)
protected String recUserId;
@TableField(value = "rec_user_name", fill = FieldFill.INSERT_UPDATE)
protected String recUserName;
/**
* 是否删除
*/
@TableField(value = "is_delete")
public Boolean isDelete=false;
/**
* sn编码
*/
@TableField("sn_code")
private String snCode;
/**
* 状态
*/
@TableField("state")
private String state;
/**
* 额定功率
*/
@TableField("rated_power")
private Double ratedPower;
/**
* 采集器id
*/
@TableField("collector_id")
private Long collectorId;
/**
* 采集器sn编码
*/
@TableField("collector_sn_code")
private String collectorSnCode;
/**
* 更新时间
*/
@TableField("update_time")
private Date updateTime;
/**
* 实时功率
*/
@TableField("current_power")
private Double currentPower;
/**
* 日发电量
*/
@TableField("day_power_generation")
private Double dayPowerGeneration;
/**
* 月发电量
*/
@TableField("month_power_generation")
private Double monthPowerGeneration;
/**
* 年发电量
*/
@TableField("year_power_generation")
private Double yearPowerGeneration;
/**
* 品牌
*/
@TableField("brand")
private String brand;
/**
* 型号
*/
@TableField("model")
private String model;
/**
* 国标
*/
@TableField("national_standard")
private String nationalStandard;
/**
* 版本号
*/
@TableField("version")
private String version;
/**
* 满发小时数
*/
@TableField("generation_hours")
private String generationHours;
/**
* 质保期
*/
@TableField("warranty_period")
private String warrantyPeriod;
/**
* IGBT温度
*/
@TableField("IGBT_temperature")
private String igbtTemperature;
/**
* AFCI方案
*/
@TableField("AFCI_programme")
private String afciProgramme;
/**
* AFCI版本
*/
@TableField("AFCI_version")
private String afciVersion;
/**
* ID
*/
@TableField("ID")
private Long id;
/**
* 第三方电站id
*/
@TableField("third_station_id")
private String thirdStationId;
/**
* 装机容量
*/
@TableField("capacity")
private Integer capacity;
/**
* 累计发电量
*/
@TableField("total_power_generation")
private Double totalPowerGeneration;
/**
* 日用电量
*/
@TableField("day_power_use")
private Double dayPowerUse;
/**
* 月用电量
*/
@TableField("month_power_use")
private Double monthPowerUse;
/**
* 年用电量
*/
@TableField("year_power_use")
private Double yearPowerUse;
}
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/hygf/JpInverterElectricity.java 0 → 100644
View file @ 0996f163
package com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.hygf;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
/**
* 户用光伏监盘逆变器电能表
*
* @author system_generator
* @date 2023-09-19
*/
@Data
@Accessors(chain = true)
@TableName("hygf_jp_inverter_electricity")
public class JpInverterElectricity implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "sequence_nbr", type = IdType.ID_WORKER)
protected Long sequenceNbr;
@TableField(value = "rec_date", fill = FieldFill.INSERT_UPDATE)
protected Date recDate;
@TableField(value = "rec_user_id", fill = FieldFill.INSERT_UPDATE)
protected String recUserId;
@TableField(value = "rec_user_name", fill = FieldFill.INSERT_UPDATE)
protected String recUserName;
/**
* 是否删除
*/
@TableField(value = "is_delete")
public Boolean isDelete=false;
/**
* 逆变器id
*/
@TableField("inverter_id")
private Long inverterId;
/**
* sn编码
*/
@TableField("sn_code")
private String snCode;
/**
* 电能名称
*/
@TableField("name")
private String name;
/**
* 电能类型(直流/交流)
*/
@TableField("type")
private String type;
/**
* 电压
*/
@TableField("voltage")
private Double voltage;
/**
* 电流
*/
@TableField("current")
private Double current;
/**
* 功率
*/
@TableField("power")
private Double power;
/**
* 频率
*/
@TableField("frequency")
private Double frequency;
/**
* 第三方电站id
*/
@TableField("third_station_id")
private String thirdStationId;
/**
* 第三方厂商标识
*/
@TableField("third_code")
private String thirdCode;
}
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/hygf/JpStation.java 0 → 100644
View file @ 0996f163
package com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.hygf;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
/**
* 第三方场站
*
* @author system_generator
* @date 2023-09-19
*/
@Data
@Accessors(chain = true)
@TableName("hygf_jp_station")
public class JpStation implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "sequence_nbr", type = IdType.ID_WORKER)
protected Long sequenceNbr;
@TableField(value = "rec_date", fill = FieldFill.INSERT_UPDATE)
protected Date recDate;
@TableField(value = "rec_user_id", fill = FieldFill.INSERT_UPDATE)
protected String recUserId;
@TableField(value = "rec_user_name", fill = FieldFill.INSERT_UPDATE)
protected String recUserName;
/**
* 是否删除
*/
@TableField(value = "is_delete")
public Boolean isDelete=false;
/**
* sn编码
*/
@TableField("sn_code")
private String snCode;
/**
* 装机容量
*/
@TableField("capacity")
private Double capacity;
/**
* 电站名称
*/
@TableField("name")
private String name;
/**
* 电站编码
*/
@TableField("code")
private String code;
/**
* 组织编码
*/
@TableField("system_code")
private String systemCode;
/**
* 接入平台时间
*/
@TableField("access_time")
private Date accessTime;
/**
* 创建时间
*/
@TableField("create_time")
private Date createTime;
/**
* 地址
*/
@TableField("address")
private String address;
/**
* 经度
*/
@TableField("longitude")
private String longitude;
/**
* 维度
*/
@TableField("latitude")
private String latitude;
/**
* 上网电价
*/
@TableField("price")
private Double price;
/**
* 业主姓名
*/
@TableField("user_name")
private String userName;
/**
* 业主电话
*/
@TableField("user_phone")
private String userPhone;
/**
* 电站联系人
*/
@TableField("station_contact")
private String stationContact;
/**
* 组件数量
*/
@TableField("module_count")
private Integer moduleCount;
/**
* 并网类型
*/
@TableField("on_grid_type")
private String onGridType;
/**
* 并网时间
*/
@TableField("on_grid_time")
private Date onGridTime;
/**
* 第三方电站id
*/
@TableField("third_station_id")
private String thirdStationId;
/**
* 电站id
*/
@TableField("station_id")
private Long stationId;
/**
* 第三方厂商标识
*/
@TableField("third_code")
private String thirdCode;
/**
* 实时功率
*/
@TableField("real_time_power")
private Double realTimePower;
/**
* 累计发电量
*/
@TableField("accumulated_power")
private Double accumulatedPower;
/**
* 状态
*/
@TableField("state")
private String state;
/**
* 电站类型
*/
@TableField("type")
private String type ;
/**
* 组织编码
*/
@TableField("organizational_code")
private String organizationalCode;
//日发电量
@TableField("day_generate")
private Double dayGenerate;
//月发电量
@TableField("month_generate")
private Double monthGenerate;
//年发电量
@TableField("year_generate")
private Double yearGenerate;
//日收益
@TableField("day_income")
private Double dayIncome;
//月收益
@TableField("month_income")
private Double monthIncome;
// 年收益
@TableField("year_income")
private Double yearIncome;
//地区
@TableField("area")
private String area;
//累计收益
@TableField("cumulative_income")
private Double cumulativeIncome;
@TableField("day_power_use")
private Double dayPowerUse; // 日用电量
@TableField("month_power_use")
private Double monthPowerPse; // 月用电量
@TableField("year_power_use")
private Double yearPowerUse; // 年用电量
}
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/tdeingine/GolangStationDetail.java 0 → 100644
View file @ 0996f163
package com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.models.auth.In;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@Data
@TableName(value = "golang_station_detail", autoResultMap = true)
public class GolangStationDetail implements Serializable {
private Date createdTime;
private Long id;
private String stationname;
private String addr;
private Long userid;
private String username;
private Long usermobile;
private String useremail;
private String capacity;
private String capacitystr;
private Double dayenergy;
private String dayenergystr;
private Double batterytotaldischargeenergy;
private Double batterytotalchargeenergy;
private Double gridpurchasedtotalenergy;
private Double gridselltotalenergy;
private Double homeloadtotalenergy;
private Double oneself;
private Double batterytodaydischargeenergy;
private Double batterytodaychargeenergy;
private Double gridpurchasedtodayenergy;
private Double gridselltodayenergy;
private Double homeloadtodayenergy;
private String money;
private Long fispowertime;
private Long fisgeneratetime;
private String remark1;
private String remark2;
private String remark3;
private Integer state;
private Long datatimestamp;
private String inverterpower;
private String nmicode;
private Double monthenergy;
private String monthenergystr;
private Double yearenergy;
private String yearenergystr;
private Double allenergy;
private String allenergystr;
private Double dayincome;
private String dayincomeunit;
private Double monthincome;
private String monthincomeunit;
private Double yearincome;
private String yearincomeunit;
private Double allincome;
private String allincomeunit;
private Double fullhour;
private String picname;
private Double power;
private String powerstr;
private String latitude;
private String longitude;
private Double dip;
private Double azimuth;
private String price;
private String brand;
private String condtxtn;
private String condtxtd;
private String tmpmax;
private String tmpmin;
private String tmpunit;
private String sr;
private String ss;
private String windspd;
private String winddir;
private String powerstationnumtree;
private String powerstationnumtreeunit;
private String powerstationavoidedco2;
private String powerstationavoidedco2unit;
private Long module;
private Long mobile;
private String installeremail;
private Long installermobile;
private Double batterypower;
private String batterypowerstr;
private Double batterypowerpec;
private Double batterydischargeenergy;
private String batterydischargeenergystr;
private Double batterychargeenergy;
private String batterychargeenergystr;
private Double batterypercent;
private Double batterydischargemonthenergy;
private String batterydischargemonthenergystr;
private Double batterydischargeyearenergy;
private String batterydischargeyearenergystr;
private Double batterydischargetotalenergy;
private String batterydischargetotalenergystr;
private Double batterychargemonthenergy;
private String batterychargemonthenergystr;
private Double batterychargeyearenergy;
private String batterychargeyearenergystr;
private Double batterychargetotalenergy;
private String batterychargetotalenergystr;
private Double psum;
private String psumstr;
private Double psumpec;
private Double gridpurchaseddayenergy;
private String gridpurchaseddayenergystr;
private Double gridpurchasedmonthenergy;
private String gridpurchasedmonthenergystr;
private Double gridpurchasedyearenergy;
private String gridpurchasedyearenergystr;
private String gridpurchasedtotalenergystr;
private Double gridselldayenergy;
private String gridselldayenergystr;
private Double gridsellmonthenergy;
private String gridsellmonthenergystr;
private Double gridsellyearenergy;
private String gridsellyearenergystr;
private String gridselltotalenergystr;
private Double familyloadpower;
private String familyloadpowerstr;
private Double familyloadpowerpec;
private Double homeloadenergy;
private String homeloadenergystr;
private Double homeloadmonthenergy;
private String homeloadmonthenergystr;
private Double homeloadyearenergy;
private String homeloadyearenergystr;
private String homeloadtotalenergystr;
private Integer country;
private String countrystr;
private Integer region;
private String regionstr;
private Integer city;
private String citystr;
private Integer county;
private String countystr;
private Double timezone;
private String timezonename;
private String timezonestr;
private Long timezoneid;
private Double daylight;
private Long createdate;
private Integer stationtypenew;
}
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/mapper/hygf/JpCollectorMapper.java 0 → 100644
View file @ 0996f163
package com.yeejoin.amos.api.householdapi.face.orm.mapper.hygf;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.hygf.JpCollector;
public interface JpCollectorMapper extends BaseMapper<JpCollector> {
}
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/mapper/hygf/JpInverterElectricityMapper.java 0 → 100644
View file @ 0996f163
package com.yeejoin.amos.api.householdapi.face.orm.mapper.hygf;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.hygf.JpInverterElectricity;
public interface JpInverterElectricityMapper extends BaseMapper<JpInverterElectricity> {
}
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/mapper/hygf/JpInverterMapper.java 0 → 100644
View file @ 0996f163
package com.yeejoin.amos.api.householdapi.face.orm.mapper.hygf;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.hygf.JpInverter;
public interface JpInverterMapper extends BaseMapper<JpInverter> {
}
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/mapper/hygf/JpStationMapper.java 0 → 100644
View file @ 0996f163
package com.yeejoin.amos.api.householdapi.face.orm.mapper.hygf;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.hygf.JpStation;
public interface JpStationMapper extends BaseMapper<JpStation> {
}
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/mapper/tdengine/GolangStationDetailMapper.java 0 → 100644
View file @ 0996f163
package com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.GolangStationDetail;
public interface GolangStationDetailMapper extends BaseMapper<GolangStationDetail> {
}
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/mapper/tdengine/GolangStationMapper.java
View file @ 0996f163
......@@ -2,6 +2,9 @@ package com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.GolangStationList;
import org.apache.ibatis.annotations.Select;
import java.util.List;
/**
* 户用光伏-厂商API haders Mapper 接口
......@@ -10,5 +13,6 @@ import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.Gola
* @date 2023-06-07
*/
public interface GolangStationMapper extends BaseMapper<GolangStationList> {
@Select("select id from golang_station_list group by id")
List<String> getStationIds();
}
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/GoLangDataAcquisitionService.java 0 → 100644
View file @ 0996f163
package com.yeejoin.amos.api.householdapi.face.service;
public interface GoLangDataAcquisitionService {
void stationList();
void stationDetail();
}
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/GoLangDataAcquisitionServiceImpl.java 0 → 100644
View file @ 0996f163
package com.yeejoin.amos.api.householdapi.face.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yeejoin.amos.api.householdapi.Utils.GolangRequestUtil;
import com.yeejoin.amos.api.householdapi.constant.GoLangConstant;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.hygf.JpStation;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.GolangStationDetail;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.GolangStationList;
import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.GolangStationDetailMapper;
import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.GolangStationMapper;
import com.yeejoin.amos.api.householdapi.face.service.GoLangDataAcquisitionService;
import com.yeejoin.amos.api.householdapi.face.orm.mapper.hygf.JpStationMapper;
import com.yeejoin.amos.openapi.enums.PVProducerInfoEnum;
import fastjson.JSON;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.concurrent.TimeUnit;
@Service
public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionService {
@Autowired
private GolangRequestUtil golangRequestUtil;
@Autowired
private GolangStationMapper golangStationMapper;
@Autowired
private JpStationMapper jpStationMapper;
@Autowired
private GolangStationDetailMapper golangStationDetailMapper;
@Override
public void stationList() {
HashMap<String, Object> requestInfo = new HashMap<>();
requestInfo.put("pageNo", 1);
requestInfo.put("pageSize", 100);
String requestParaminfo = JSON.toJSONString(requestInfo);
List<GolangStationList> result = golangRequestUtil.getResPonse(GoLangConstant.stationListUrl,
GoLangConstant.requestPost,
requestParaminfo,
GoLangConstant.resovleRule_data_page_records,
GolangStationList.class
);
for (int i = 0; i < result.size(); i++) {
GolangStationList golangStationList = result.get(i);
golangStationList.setCreatedTime(new Date());
golangStationMapper.insert(golangStationList);
}
}
@Override
public void stationDetail() {
List<String> stationIds = golangStationMapper.getStationIds();
for (int i = 0; i < stationIds.size(); i++) {
try {
TimeUnit.SECONDS.sleep(1);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
HashMap<String, Object> requestInfo = new HashMap<>();
requestInfo.put("id", Long.valueOf(stationIds.get(i)));
String requestParaminfo = JSON.toJSONString(requestInfo);
List<GolangStationDetail> result = golangRequestUtil.getResPonse(GoLangConstant.stationDetailUrl,
GoLangConstant.requestPost,
requestParaminfo,
GoLangConstant.resovleRule_data,
GolangStationDetail.class
);
for (int j = 0; j < result.size(); j++) {
GolangStationDetail golangStationDetail = result.get(j);
golangStationDetail.setCreatedTime(new Date());
JpStation jpStation = jpStationMapper.selectOne(new QueryWrapper<JpStation>().eq("third_code", PVProducerInfoEnum.JLY.getCode()).eq("third_station_id", stationIds.get(i)));
//给户用光伏存储的数据赋值
if (ObjectUtils.isEmpty(jpStation)) {
jpStation = new JpStation();
}
jpStation.setSnCode(golangStationDetail.getNmicode());
jpStation.setCapacity(Double.valueOf(golangStationDetail.getCapacity()));
jpStation.setName(golangStationDetail.getStationname());
jpStation.setPrice(Double.valueOf(golangStationDetail.getPrice()));
jpStation.setAddress(golangStationDetail.getAddr());
jpStation.setLongitude(golangStationDetail.getLongitude());
jpStation.setLatitude(golangStationDetail.getLatitude());
jpStation.setUserName(golangStationDetail.getUsername());
jpStation.setUserPhone(String.valueOf(golangStationDetail.getUsermobile()));
jpStation.setStationContact(String.valueOf(golangStationDetail.getMobile()));
jpStation.setModuleCount(Math.toIntExact(golangStationDetail.getModule()));
//并网类型
jpStation.setOnGridType(GoLangConstant.stationStaus.get(String.valueOf(golangStationDetail.getState())));
jpStation.setThirdStationId(String.valueOf(golangStationDetail.getId()));
jpStation.setThirdCode(PVProducerInfoEnum.JLY.getCode());
jpStation.setRealTimePower(golangStationDetail.getPower());
jpStation.setState(GoLangConstant.intoNetWorkStatus.get(String.valueOf(golangStationDetail.getStationtypenew())));
jpStation.setDayGenerate(golangStationDetail.getDayenergy());
jpStation.setMonthGenerate(golangStationDetail.getMonthenergy());
jpStation.setYearGenerate(golangStationDetail.getYearenergy());
jpStation.setDayIncome(golangStationDetail.getDayincome());
jpStation.setMonthIncome(golangStationDetail.getMonthincome());
jpStation.setYearIncome(golangStationDetail.getYearincome());
jpStation.setCumulativeIncome(golangStationDetail.getAllincome());
jpStation.setArea(golangStationDetail.getRegionstr());
if (!ObjectUtils.isEmpty(jpStation.getSequenceNbr())) {
jpStationMapper.updateById(jpStation);
} else {
jpStationMapper.insert(jpStation);
}
golangStationDetailMapper.insert(golangStationDetail);
}
}
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/pom.xml
View file @ 0996f163
......@@ -22,7 +22,7 @@
<dependency>
<groupId>com.taosdata.jdbc</groupId>
<artifactId>taos-jdbcdriver</artifactId>
<version>2.0.30</version>
<version>3.2.4</version>
</dependency>
</dependencies>
</project>
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/JpInverterDto.java
View file @ 0996f163
......@@ -91,13 +91,4 @@ public class JpInverterDto extends BaseDto {
@ApiModelProperty(value = "累计发电量")
private Double totalPowerGeneration;
@ApiModelProperty(value = "日用电量")
private Double dayPowerUse;
@ApiModelProperty(value = "月用电量")
private Double monthPowerUse;
@ApiModelProperty(value = "年用电量")
private Double yearPowerUse;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/JpPersonStationDto.java
View file @ 0996f163
......@@ -16,23 +16,22 @@ import java.util.Date;
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="JpPersonStationDto", description="户用光伏监盘人员场站关系表")
public class JpPersonStationDto extends BaseDto {
@ApiModel(value = "JpPersonStationDto", description = "户用光伏监盘人员场站关系表")
public class JpPersonStationDto extends BaseDto {
private static final long serialVersionUID = 1L;
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "人员id")
private String personId;
@ApiModelProperty(value = "人员id")
private String personId;
@ApiModelProperty(value = "场站id")
private String stationId;
@ApiModelProperty(value = "场站id")
private Long stationId;
@ApiModelProperty(value = "场站名称")
private String stationName;
/**
* 业主名称
*/
@ApiModelProperty(value = "场站名称")
private String stationName;
/**
* 业主名称
*/
private String owner;
private String owner;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/JpStationDto.java
View file @ 0996f163
package com.yeejoin.amos.boot.module.hygf.api.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.yeejoin.amos.boot.module.hygf.api.entity.JpCollector;
import com.yeejoin.amos.boot.module.hygf.api.entity.JpInverter;
import com.yeejoin.amos.boot.module.hygf.api.entity.JpPersonStation;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -132,4 +135,10 @@ public class JpStationDto extends BaseDto {
private int countBuiltNum;//已建设场站数量
private int countNBuiltNum;//未建设场站数量
List<JpInverter> jpInverter;
List<JpCollector> JpCollector;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/TdHygfJpInverterWarnDto.java
View file @ 0996f163
......@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import java.util.List;
/**
* 户用光伏监盘逆变器报警表
......@@ -47,9 +48,11 @@ public class TdHygfJpInverterWarnDto {
private String thirdCode;
@ApiModelProperty(value = "状态")
private int state;
private String state;
@ApiModelProperty(value = "时间")
private Long time;
private List<String> stationIds;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/JpInverter.java
View file @ 0996f163
......@@ -160,22 +160,4 @@ public class JpInverter extends BaseEntity {
@TableField("total_power_generation")
private Double totalPowerGeneration;
/**
* 日用电量
*/
@TableField("day_power_use")
private Double dayPowerUse;
/**
* 月用电量
*/
@TableField("month_power_use")
private Double monthPowerUse;
/**
* 年用电量
*/
@TableField("year_power_use")
private Double yearPowerUse;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/JpPersonStation.java
View file @ 0996f163
......@@ -32,7 +32,7 @@ public class JpPersonStation extends BaseEntity {
* 场站id
*/
@TableField("station_id")
private Long stationId;
private String stationId;
/**
* 场站名称
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/TdHygfJpInverterWarn.java
View file @ 0996f163
......@@ -87,7 +87,7 @@ public class TdHygfJpInverterWarn {
* 状态
*/
@TableField("state")
private int state;
private String state;
/**
* 时间
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/JpCollectorMapper.java
View file @ 0996f163
......@@ -15,5 +15,5 @@ import java.util.Map;
* @date 2023-09-19
*/
public interface JpCollectorMapper extends BaseMapper<JpCollector> {
List<Map<String,Object>> queryCountStatus(@Param("dto") JpStationDto reviewDto);
List<Map<String,Object>> queryCollectorCountStatus(@Param("dto") JpStationDto reviewDto);
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/JpInverterMapper.java
View file @ 0996f163
......@@ -16,5 +16,5 @@ import java.util.Map;
*/
public interface JpInverterMapper extends BaseMapper<JpInverter> {
List<Map<String,Object>> queryCountStatus(@Param("dto") JpStationDto reviewDto);
List<Map<String,Object>> queryInverterCountStatus(@Param("dto") JpStationDto reviewDto);
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/JpStationMapper.java
View file @ 0996f163
......@@ -18,6 +18,6 @@ import java.util.Map;
public interface JpStationMapper extends BaseMapper<JpStation> {
List<JpStationDto> queryForDealerReviewPage(@Param("dto") JpStationDto reviewDto);
JpStationDto queryCount(@Param("dto") JpStationDto reviewDto);
Map<String,Object> countState(@Param("dto") JpStationDto reviewDto);
List<Map<String,Object>> countState(@Param("dto") JpStationDto reviewDto);
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/tdenginemapper/TdHygfJpInverterWarnMapper.java
View file @ 0996f163
package com.yeejoin.amos.boot.module.hygf.api.tdenginemapper;
import com.yeejoin.amos.boot.module.hygf.api.dto.JpStationDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.TdHygfJpInverterWarnDto;
import com.yeejoin.amos.boot.module.hygf.api.entity.JpStation;
import com.yeejoin.amos.boot.module.hygf.api.entity.TdHygfJpInverterWarn;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
* 户用光伏监盘逆变器报警表 Mapper 接口
......@@ -11,4 +21,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface TdHygfJpInverterWarnMapper extends BaseMapper<TdHygfJpInverterWarn> {
List<Map<String, Object>> getCountTdHygfJpInverterWarn(@Param("dto") List<JpStation> dto);
List<TdHygfJpInverterWarnDto> list(@Param("param") TdHygfJpInverterWarnDto tdHygfJpInverterWarnDto);
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpCollectorMapper.xml
View file @ 0996f163
<?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.boot.module.hygf.api.mapper.JpCollectorMapper">
<select id="queryCountStatus" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.JpStationDto">
<select id="queryCollectorCountStatus" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.JpStationDto">
select
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpInverterMapper.xml
View file @ 0996f163
<?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.boot.module.hygf.api.mapper.JpInverterMapper">
<select id="queryCountStatus" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.JpStationDto">
<select id="queryInverterCountStatus" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.JpStationDto">
select
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpStationMapper.xml
View file @ 0996f163
......@@ -10,8 +10,8 @@
<if test="dto.name!=null">
and hygf_jp_station.name like concat(concat("%",#{dto.name}),"%")
</if>
<if test="dto.nauserNameme!=null">
and hygf_jp_station.user_name like concat(concat("%",#{dto.nauserNameme}),"%")
<if test="dto.userName!=null">
and hygf_jp_station.user_name like concat(concat("%",#{dto.userName}),"%")
</if>
<if test="dto.address!=null">
and hygf_jp_station.address like concat(concat("%",#{dto.address}),"%")
......@@ -53,7 +53,7 @@
count(*) countBuiltNum
from hygf_jp_station
<where>
<if test="dto.nauserNameme!=null">
<if test="dto.userName!=null">
and hygf_jp_station.user_name like concat(concat("%",#{dto.userName}),"%")
</if>
<if test="dto.area!=null">
......@@ -83,7 +83,7 @@
<if test="dto.name!=null">
and hygf_jp_station.name like concat(concat("%",#{dto.name}),"%")
</if>
<if test="dto.nauserNameme!=null">
<if test="dto.userName!=null">
and hygf_jp_station.user_name like concat(concat("%",#{dto.userName}),"%")
</if>
<if test="dto.statioId!=null">
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/TdHygfJpInverterWarnMapper.xml
View file @ 0996f163
......@@ -2,4 +2,28 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.TdHygfJpInverterWarnMapper">
<select id="getCountTdHygfJpInverterWarn" resultType="map">
SELECT `state`,count(`state`) num
FROM house_pv_data.td_hygf_jp_inverter_warn
<where>
<if test="dto!=null">
third_station_id in
<foreach collection="dto" item="item" index="index" open="(" separator="," close=")">
#{item.stationId}
</foreach>
</if>
</where>
GROUP BY `state`
</select>
<select id="list" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.TdHygfJpInverterWarnDto">
SELECT * FROM house_pv_data.td_hygf_jp_inverter_warn
<where>
<if test="param.state!=null">
`state` = #{param.state}
</if>
</where>
</select>
</mapper>
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/TdHygfJpInvertorElecHistoryMapper.xml
View file @ 0996f163
<?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.boot.module.hygf.api.tdenginemapper.TdHygfJpInvertorElecHistoryMapper">
<select id="list" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.TdHygfJpInverterWarnDto">
SELECT * FROM house_pv_data.td_hygf_jp_inverter_warn
<where>
<if test="param.state!=null">
`state` = #{param.state}
</if>
</where>
</select>
</mapper>
amos-boot-system-jxiop/amos-boot-module-hygf-biz/pom.xml
View file @ 0996f163
......@@ -49,7 +49,7 @@
<dependency>
<groupId>com.qiyuesuo.sdk</groupId>
<artifactId>sdk-java</artifactId>
<version>3.0.0</version>
<version>3.6.3</version>
</dependency>
</dependencies>
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/AmosHygfApplication.java
View file @ 0996f163
......@@ -47,7 +47,7 @@ import java.net.InetAddress;
@EnableScheduling
@MapperScan({ "org.typroject.tyboot.demo.face.orm.dao*", "org.typroject.tyboot.face.*.orm.dao*",
"org.typroject.tyboot.core.auth.face.orm.dao*", "org.typroject.tyboot.component.*.face.orm.dao*",
"com.yeejoin.amos.boot.module.**.api.mapper", "com.yeejoin.amos.boot.biz.common.dao.mapper","com.yeejoin.amos.boot.module.common.biz.*" })
"com.yeejoin.amos.boot.module.**.api.tdenginemapper","com.yeejoin.amos.boot.module.**.api.mapper", "com.yeejoin.amos.boot.biz.common.dao.mapper","com.yeejoin.amos.boot.module.common.biz.*" })
@ComponentScan(basePackages = { "org.typroject", "com.yeejoin.amos" })
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, DataSourceTransactionManagerAutoConfiguration.class, MybatisAutoConfiguration.class})
public class AmosHygfApplication {
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/config/TDengineServerConfig.java
View file @ 0996f163
......@@ -25,7 +25,7 @@ import java.util.Properties;
* @createDate: 2023/9/19
*/
@Configuration
@MapperScan(basePackages = "com.xiaotian.datatrans.mapper.tdenginemapper", sqlSessionTemplateRef = "tdengineSqlSessionTemplate")
@MapperScan(basePackages = "com.yeejoin.amos.boot.module.hygf.api.tdenginemapper", sqlSessionTemplateRef = "tdengineSqlSessionTemplate")
public class TDengineServerConfig {
......@@ -74,7 +74,6 @@ public class TDengineServerConfig {
@Bean
public PaginationInterceptor paginationInterceptor() {
PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
paginationInterceptor.setDialectType("mysql");
return paginationInterceptor;
}
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpStationController.java
View file @ 0996f163
......@@ -2,6 +2,8 @@ package com.yeejoin.amos.boot.module.hygf.biz.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.yeejoin.amos.boot.module.hygf.api.dto.ReviewDto;
import com.yeejoin.amos.boot.module.hygf.api.entity.JpCollector;
import com.yeejoin.amos.boot.module.hygf.api.entity.JpInverter;
import com.yeejoin.amos.boot.module.hygf.api.entity.JpPersonStation;
import com.yeejoin.amos.boot.module.hygf.api.entity.PersonnelBusiness;
import com.yeejoin.amos.boot.module.hygf.api.mapper.JpCollectorMapper;
......@@ -100,7 +102,16 @@ public class JpStationController extends BaseController {
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个第三方场站", notes = "根据sequenceNbr查询单个第三方场站")
public ResponseModel<JpStationDto> selectOne(@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(jpStationServiceImpl.queryBySeq(sequenceNbr));
JpStationDto jpStationDto= jpStationServiceImpl.queryBySeq(sequenceNbr);
LambdaQueryWrapper<JpInverter> qug=new LambdaQueryWrapper<>();
qug.eq(JpInverter::getThirdStationId,jpStationDto.getThirdStationId());
List<JpInverter> jpInverter=jpInverterMapper.selectList(qug);
LambdaQueryWrapper<JpCollector> qug1=new LambdaQueryWrapper<>();
qug1.eq(JpCollector::getThirdStationId,jpStationDto.getThirdStationId());
List<JpCollector> JpCollector=jpCollectorMapper.selectList(qug1);
jpStationDto.setJpCollector(JpCollector);
jpStationDto.setJpInverter(jpInverter);
return ResponseHelper.buildResponse(jpStationDto);
}
/**
......@@ -122,15 +133,19 @@ public class JpStationController extends BaseController {
LambdaQueryWrapper<JpPersonStation> qug=new LambdaQueryWrapper<>();
qug.eq(JpPersonStation::getPersonId,getUserInfo().getUserId());
List<JpPersonStation> pPersonStation=pPersonStationMapper.selectList(qug);
reviewDto.setStatioId(pPersonStation.isEmpty()?null:pPersonStation);
if(pPersonStation!=null&&!pPersonStation.isEmpty()){
reviewDto.setStatioId(pPersonStation.isEmpty()?null:pPersonStation);
}else{
return ResponseHelper.buildResponse(null);
}
// }
Page<JpStationDto> page=jpStationServiceImpl.queryForJpStationPage(current,size,reviewDto);
return ResponseHelper.buildResponse(page);
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/queryPage")
@GetMapping(value = "/countState")
@ApiOperation(httpMethod = "GET",value = "场站列表", notes = "场站列表")
public ResponseModel<Map<String,Object>> queryForDealerReviewPage(JpStationDto reviewDto) {
public ResponseModel< List<Map<String,Object>>> countState(JpStationDto reviewDto) {
//获取当前人管理场站
LambdaQueryWrapper<JpPersonStation> qug=new LambdaQueryWrapper<>();
......@@ -151,9 +166,14 @@ public class JpStationController extends BaseController {
LambdaQueryWrapper<JpPersonStation> qug=new LambdaQueryWrapper<>();
qug.eq(JpPersonStation::getPersonId,getUserInfo().getUserId());
List<JpPersonStation> pPersonStation=pPersonStationMapper.selectList(qug);
reviewDto.setStatioId(pPersonStation.isEmpty()?null:pPersonStation);
List<Map<String,Object>> listCollector= jpCollectorMapper.queryCountStatus(reviewDto);
List<Map<String,Object>> listInverter= jpInverterMapper.queryCountStatus(reviewDto);
if(pPersonStation!=null&&!pPersonStation.isEmpty()){
reviewDto.setStatioId(pPersonStation.isEmpty()?null:pPersonStation);
}else{
return ResponseHelper.buildResponse(null);
}
List<Map<String,Object>> listCollector= jpCollectorMapper.queryCollectorCountStatus(reviewDto);
List<Map<String,Object>> listInverter= jpInverterMapper.queryInverterCountStatus(reviewDto);
Map<String,Object> map=new HashMap<>();
map.put("collector",listCollector);
map.put("inverter",listInverter);
......@@ -212,7 +232,11 @@ public class JpStationController extends BaseController {
LambdaQueryWrapper<JpPersonStation> qug=new LambdaQueryWrapper<>();
qug.eq(JpPersonStation::getPersonId,getUserInfo().getUserId());
List<JpPersonStation> pPersonStation=pPersonStationMapper.selectList(qug);
reviewDto.setStatioId(pPersonStation.isEmpty()?null:pPersonStation);
if(pPersonStation!=null&&!pPersonStation.isEmpty()){
reviewDto.setStatioId(pPersonStation.isEmpty()?null:pPersonStation);
}else{
return ResponseHelper.buildResponse(null);
}
}
return ResponseHelper.buildResponse(jpStationMapper.queryCount(reviewDto));
}
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/TdHygfJpInverterWarnController.java
View file @ 0996f163
package com.yeejoin.amos.boot.module.hygf.biz.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.yeejoin.amos.boot.module.hygf.api.dto.JpStationDto;
import com.yeejoin.amos.boot.module.hygf.api.entity.JpPersonStation;
import com.yeejoin.amos.boot.module.hygf.api.entity.JpStation;
import com.yeejoin.amos.boot.module.hygf.api.entity.TdHygfJpInverterWarn;
import com.yeejoin.amos.boot.module.hygf.api.mapper.JpPersonStationMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.JpStationMapper;
import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.TdHygfJpInverterWarnMapper;
import org.apache.commons.lang.StringUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RestController;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.TdHygfJpInverterWarnServiceImpl;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
......@@ -30,6 +44,12 @@ public class TdHygfJpInverterWarnController extends BaseController {
@Autowired
TdHygfJpInverterWarnServiceImpl tdHygfJpInverterWarnServiceImpl;
@Autowired
JpPersonStationMapper pPersonStationMapper;
@Autowired
TdHygfJpInverterWarnMapper tdHygfJpInverterWarnMapper;
@Autowired
JpStationMapper jpStationMapper;
/**
* 新增户用光伏监盘逆变器报警表
......@@ -54,9 +74,9 @@ public class TdHygfJpInverterWarnController extends BaseController {
@PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新户用光伏监盘逆变器报警表", notes = "根据sequenceNbr更新户用光伏监盘逆变器报警表")
public ResponseModel<TdHygfJpInverterWarnDto> updateBySequenceNbrTdHygfJpInverterWarn(@RequestBody TdHygfJpInverterWarnDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
return ResponseHelper.buildResponse(tdHygfJpInverterWarnServiceImpl.updateWithModel(model));
public ResponseModel<TdHygfJpInverterWarnDto> updateBySequenceNbrTdHygfJpInverterWarn(
@RequestBody TdHygfJpInverterWarnDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
return ResponseHelper.buildResponse(tdHygfJpInverterWarnServiceImpl.updateWithModel(model));
}
......@@ -99,11 +119,22 @@ public class TdHygfJpInverterWarnController extends BaseController {
@ApiOperation(httpMethod = "GET", value = "户用光伏监盘逆变器报警表分页查询", notes = "户用光伏监盘逆变器报警表分页查询")
public ResponseModel<Page<TdHygfJpInverterWarnDto>> queryForPage(@RequestParam(value = "current") int current,
@RequestParam(value = "size") int size, TdHygfJpInverterWarnDto tdHygfJpInverterWarnDto) {
Page<TdHygfJpInverterWarnDto> page = new Page<TdHygfJpInverterWarnDto>();
page.setCurrent(current);
page.setSize(size);
return ResponseHelper.buildResponse(
tdHygfJpInverterWarnServiceImpl.queryForTdHygfJpInverterWarnPage(page, tdHygfJpInverterWarnDto));
LambdaQueryWrapper<JpPersonStation> qug = new LambdaQueryWrapper<>();
qug.eq(JpPersonStation::getPersonId, getUserInfo().getUserId());
List<JpPersonStation> pPersonStation = pPersonStationMapper.selectList(qug);
if (!pPersonStation.isEmpty()) {
Page<TdHygfJpInverterWarnDto> page = new Page<TdHygfJpInverterWarnDto>();
page.setCurrent(current);
page.setSize(size);
List<String> ids = pPersonStation.stream().map(i -> i.getStationId()).collect(Collectors.toList());
tdHygfJpInverterWarnDto.setStationIds(ids);
return ResponseHelper.buildResponse(
tdHygfJpInverterWarnServiceImpl.queryForTdHygfJpInverterWarnPage(page, tdHygfJpInverterWarnDto));
} else {
return ResponseHelper.buildResponse(new Page<TdHygfJpInverterWarnDto>());
}
}
/**
......@@ -117,4 +148,77 @@ public class TdHygfJpInverterWarnController extends BaseController {
public ResponseModel<List<TdHygfJpInverterWarnDto>> selectForList() {
return ResponseHelper.buildResponse(tdHygfJpInverterWarnServiceImpl.queryForTdHygfJpInverterWarnList());
}
/**
* 获取告警统计
* **/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "户用光伏监盘逆变器报警表列表全部数据查询", notes = "户用光伏监盘逆变器报警表列表全部数据查询")
@GetMapping(value = "/selectcount")
public ResponseModel< List<Map<String,Object>>> selectcount(JpStationDto reviewDto) {
LambdaQueryWrapper<JpStation> qugda=new LambdaQueryWrapper<>();
//获取当前人管理场站
if(reviewDto.getThirdStationId()==null){
//获取当前人管理场站
LambdaQueryWrapper<JpPersonStation> qug=new LambdaQueryWrapper<>();
qug.eq(JpPersonStation::getPersonId,getUserInfo().getUserId());
List<JpPersonStation> pPersonStation=pPersonStationMapper.selectList(qug);
if(pPersonStation==null||pPersonStation.isEmpty()){
return ResponseHelper.buildResponse(null);
}
List ids=null;
if(pPersonStation!=null&&!pPersonStation.isEmpty()){
ids=new ArrayList();
for (JpPersonStation jpPersonStation : pPersonStation) {
ids.add(jpPersonStation.getStationId());
}
qugda.in(ids!=null,JpStation::getThirdStationId,ids);
}
}else{
qugda.eq(JpStation::getThirdStationId,reviewDto.getThirdStationId());
}
qugda.like(reviewDto.getUserName()!=null,JpStation::getUserName,reviewDto.getUserName());
qugda.like(reviewDto.getArea()!=null,JpStation::getArea,reviewDto.getArea());
List<JpStation> pPersonStation=jpStationMapper.selectList(qugda);
List<Map<String,Object>> datalist= tdHygfJpInverterWarnMapper.getCountTdHygfJpInverterWarn(pPersonStation!=null&&!pPersonStation.isEmpty()?pPersonStation:null);
return ResponseHelper.buildResponse(datalist);
}
// /**
// * 获取告警统计
// **/
// @TycloudOperation(ApiLevel = UserType.AGENCY)
// @ApiOperation(httpMethod = "GET", value = "户用光伏监盘逆变器报警表列表全部数据查询", notes = "户用光伏监盘逆变器报警表列表全部数据查询")
// @GetMapping(value = "/selectcount")
// public ResponseModel<List<Map<String, Object>>> selectcount(JpStationDto reviewDto) {
// LambdaQueryWrapper<JpStation> qugda = new LambdaQueryWrapper<>();
// // 获取当前人管理场站
// if (reviewDto.getThirdStationId() == null) {
// // 获取当前人管理场站
// LambdaQueryWrapper<JpPersonStation> qug = new LambdaQueryWrapper<>();
// qug.eq(JpPersonStation::getPersonId, getUserInfo().getUserId());
// List<JpPersonStation> pPersonStation = pPersonStationMapper.selectList(qug);
// List ids = null;
// if (pPersonStation != null && !pPersonStation.isEmpty()) {
// ids = new ArrayList();
// for (JpPersonStation jpPersonStation : pPersonStation) {
// ids.add(jpPersonStation.getStationId());
// }
// qugda.in(ids != null, JpStation::getThirdStationId, ids);
// }
// } else {
// qugda.eq(JpStation::getThirdStationId, reviewDto.getThirdStationId());
// }
// qugda.like(reviewDto.getUserName() != null, JpStation::getUserName, reviewDto.getUserName());
// qugda.like(reviewDto.getArea() != null, JpStation::getArea, reviewDto.getArea());
// List<JpStation> pPersonStation = jpStationMapper.selectList(qugda);
// List<Map<String, Object>> datalist = tdHygfJpInverterWarnMapper.getCountTdHygfJpInverterWarn(pPersonStation);
// return ResponseHelper.buildResponse(datalist);
// }
}
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/JpCollectorServiceImpl.java
View file @ 0996f163
......@@ -4,9 +4,18 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.JpCollector;
import com.yeejoin.amos.boot.module.hygf.api.mapper.JpCollectorMapper;
import com.yeejoin.amos.boot.module.hygf.api.service.IJpCollectorService;
import com.yeejoin.amos.boot.module.hygf.api.dto.JpCollectorDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.JpStationDto;
import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import java.util.HashMap;
import java.util.List;
......@@ -25,9 +34,22 @@ public class JpCollectorServiceImpl extends BaseService<JpCollectorDto, JpCollec
* 分页查询
*/
public Page<JpCollectorDto> queryForJpCollectorPage(Page<JpCollectorDto> page, JpCollectorDto jpCollectorDto) {
Map<String, Object> params = new HashMap<>();
params.put("state", jpCollectorDto.getState());
return this.queryForPage(page, null, false,params);
Page<JpCollector> entiryPage = new Page<>(page.getCurrent(), page.getSize());
LambdaQueryWrapper<JpCollector> wrapper = new LambdaQueryWrapper<>();
if (jpCollectorDto.getState() != null) {
wrapper.eq(JpCollector::getState, jpCollectorDto.getState());
}
entiryPage = (Page<JpCollector>) this.page(entiryPage, wrapper);
if (!ValidationUtil.isEmpty(entiryPage.getRecords())) {
page.setTotal(entiryPage.getTotal());
page.setPages(entiryPage.getPages());
page.setCurrent(entiryPage.getCurrent());
page.setSize(entiryPage.getSize());
if (!ValidationUtil.isEmpty(entiryPage.getRecords()))
page.setRecords(Bean.toModels(entiryPage.getRecords(), this.getModelClass()));
}
return page;
}
/**
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/JpInverterServiceImpl.java
View file @ 0996f163
package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
import java.util.List;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.hygf.api.dto.JpInverterDto;
import com.yeejoin.amos.boot.module.hygf.api.entity.JpInverter;
import com.yeejoin.amos.boot.module.hygf.api.mapper.JpInverterMapper;
import com.yeejoin.amos.boot.module.hygf.api.service.IJpInverterService;
import com.yeejoin.amos.boot.module.hygf.api.dto.JpInverterDto;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 户用光伏监盘逆变器表服务实现类
......@@ -25,9 +27,22 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
* 分页查询
*/
public Page<JpInverterDto> queryForJpInverterPage(Page<JpInverterDto> page, JpInverterDto jpInverterDto) {
Map<String, Object> params = new HashMap<>();
params.put("state", jpInverterDto.getState());
return this.queryForPage(page, null, false, params);
Page<JpInverter> entiryPage = new Page<>(page.getCurrent(), page.getSize());
LambdaQueryWrapper<JpInverter> wrapper = new LambdaQueryWrapper<>();
if (jpInverterDto.getState() != null) {
wrapper.eq(JpInverter::getState, jpInverterDto.getState());
}
entiryPage = (Page<JpInverter>) this.page(entiryPage, wrapper);
if (!ValidationUtil.isEmpty(entiryPage.getRecords())) {
page.setTotal(entiryPage.getTotal());
page.setPages(entiryPage.getPages());
page.setCurrent(entiryPage.getCurrent());
page.setSize(entiryPage.getSize());
if (!ValidationUtil.isEmpty(entiryPage.getRecords()))
page.setRecords(Bean.toModels(entiryPage.getRecords(), this.getModelClass()));
}
return page;
}
/**
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/TdHygfJpInverterWarnServiceImpl.java
View file @ 0996f163
......@@ -5,10 +5,17 @@ import java.util.List;
import java.util.Map;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.yeejoin.amos.boot.module.hygf.api.dto.ReviewDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.TdHygfJpInverterWarnDto;
import com.yeejoin.amos.boot.module.hygf.api.entity.JpCollector;
import com.yeejoin.amos.boot.module.hygf.api.entity.TdHygfJpInverterWarn;
import com.yeejoin.amos.boot.module.hygf.api.service.ITdHygfJpInverterWarnService;
import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.TdHygfJpInverterWarnMapper;
......@@ -26,11 +33,19 @@ public class TdHygfJpInverterWarnServiceImpl
/**
* 分页查询
*/
public Page<TdHygfJpInverterWarnDto> queryForTdHygfJpInverterWarnPage(Page<TdHygfJpInverterWarnDto> page,
public Page<TdHygfJpInverterWarnDto> queryForTdHygfJpInverterWarnPage(Page<TdHygfJpInverterWarnDto> pageParam,
TdHygfJpInverterWarnDto tdHygfJpInverterWarnDto) {
Map<String, Object> params = new HashMap<>();
params.put("state", tdHygfJpInverterWarnDto.getState());
return this.queryForPage(page, null, false, params);
int pageNum = (int) pageParam.getCurrent();
int pageSize = (int) pageParam.getSize();
PageHelper.startPage(pageNum, pageSize);
List<TdHygfJpInverterWarnDto> list = this.baseMapper.list(tdHygfJpInverterWarnDto);
PageInfo<TdHygfJpInverterWarnDto> page = new PageInfo(list);
com.baomidou.mybatisplus.extension.plugins.pagination.Page<TdHygfJpInverterWarnDto> pagenew = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<TdHygfJpInverterWarnDto>();
pagenew.setCurrent(pageNum);
pagenew.setTotal(page.getTotal());
pagenew.setSize(pageSize);
pagenew.setRecords(page.getList());
return pagenew;
}
/**
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application-dev.properties
View file @ 0996f163
......@@ -22,8 +22,8 @@ spring.datasource.mysql-service.connection-timeout: 30000
spring.datasource.tdengine-service.driver-class-name=com.taosdata.jdbc.TSDBDriver
spring.datasource.tdengine-service.jdbc-url=jdbc:TAOS://139.9.170.47:6041/house_pv_data?user=root&password=taosdata&timezone=GMT+8
spring.datasource.tdengine-service.driver-class-name=com.taosdata.jdbc.rs.RestfulDriver
spring.datasource.tdengine-service.jdbc-url=jdbc:TAOS-RS://139.9.170.47:6041/house_pv_data?user=root&password=taosdata&timezone=GMT+8
spring.datasource.tdengine-service.username=root
spring.datasource.tdengine-service.password=taosdata
spring.datasource.tdengine-service.type=com.zaxxer.hikari.HikariDataSource
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application.properties
View file @ 0996f163
spring.application.name=AMOS-HYGF
spring.application.name=AMOS-HYGF-WJ
server.servlet.context-path=/hygf
server.port=33330
server.uri-encoding=UTF-8
......
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