Skip to content

G
gf_back
Commit c2d91725 authored by ZWT's avatar ZWT
Browse files
Options

feat(零碳): 长庆演示系统新增功能 

1.修改第三方日累计数据推送表表结构,增加日累计储能放电量字段,同时修改代码对应实体及mapper文件,修改相关接口增加储能日累计放电量接收逻辑;
2.修改首页井场收益分析模块接口,修改获取储能累计放电量逻辑;
3.设计并创建井口日用电趋势表,生成对应实体类及mapper文件;
4.统计分析模块,新增本月累计节电经济效益查询接口,添加线上接口文档并完成接口冒烟测试;
5.统计分析模块,新增本月累计减碳量查询接口,添加线上接口文档并完成接口冒烟测试;
6.统计分析模块,新增光伏发电趋势查询接口,添加线上接口文档并完成接口冒烟测试;
7.统计分析模块,新增月度总览查询接口,添加线上接口文档并完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent e1ea8e3c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1262 deletions
C00-common/pps-common/src/test/java/pps/core/common/utils/SmartRecordTest.java deleted 100644 → 0
View file @ e1ea8e3c
package pps.core.common.utils;
public class SmartRecordTest {
// @Test
// public void test(){
// SmartRecord r = new SmartRecord();
// r.put("abc.ddd", "1");
// r.fixDataObjID();
// Assertions.assertTrue(r.containsKey("ddd"));
// Assertions.assertTrue(r.containsKey("abc.ddd"));
// }
}
C00-common/pps-common/src/test/java/pps/core/common/utils/SqlFilterTest.java
View file @ c2d91725
......@@ -21,6 +21,4 @@ class SqlFilterTest {
Thread.currentThread().setName("dealNewToOldMq");
Assertions.assertEquals("dealNewToOldMq", Thread.currentThread().getName());
}
}
//Generated with love by TestMe :) Please report issues and submit feature requests at: http://weirddev.com/forum#!/testme
\ No newline at end of file
}
\ No newline at end of file
C09-base/pps-cloud-base/src/main/java/pps/cloud/base/service/BaseBaseClientCloudService.java deleted 100644 → 0
View file @ e1ea8e3c
package pps.cloud.base.service;
import pps.cloud.base.service.data.BaseNameInput;
import pps.cloud.base.service.data.FindBaseClientOutput;
import pps.cloud.base.service.data.UpdateBaseClientCloudInput;
import xstartup.annotation.XService;
import xstartup.annotation.XText;
import xstartup.base.XContext;
import xstartup.data.XServiceResult;
import xstartup.data.XSingleResult;
@XService
public interface BaseBaseClientCloudService {
@XText("根据名称获取托运商数据")
XSingleResult<FindBaseClientOutput> selectShipperByName(XContext context, BaseNameInput input);
@XText("根据名称获取上游用户数据")
XSingleResult<FindBaseClientOutput> selectUpClientByName(XContext context, BaseNameInput input);
@XText("根据名称获取下游数据")
XSingleResult<FindBaseClientOutput> selectDownClientByName(XContext context, BaseNameInput input);
@XText("更新上下游用户与托运商")
XServiceResult updateBaseClient(XContext context, UpdateBaseClientCloudInput input);
}
C09-base/pps-cloud-base/src/main/java/pps/cloud/base/service/data/BaseNameInput.java deleted 100644 → 0
View file @ e1ea8e3c
package pps.cloud.base.service.data;
import xstartup.annotation.XText;
public class BaseNameInput {
@XText("名称")
private String name;
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
}
C09-base/pps-cloud-base/src/main/java/pps/cloud/base/service/data/FindBaseClientOutput.java deleted 100644 → 0
View file @ e1ea8e3c
package pps.cloud.base.service.data;
import xstartup.annotation.XText;
import java.util.Date;
public class FindBaseClientOutput {
@XText("主键")
private String id;
@XText("编码")
private String clientCode;
@XText("名称")
private String clientName;
@XText("简称")
private String clientShortAme;
@XText("曾用名")
private String usedName;
@XText("简称曾用名")
private String shortUsedName;
@XText("固话")
private String tel;
@XText("传真")
private String fax;
@XText("手机")
private String mobile;
@XText("电子邮件")
private String email;
@XText("地址")
private String address;
@XText("国家")
private String country;
@XText("省")
private String province;
@XText("城市")
private String city;
@XText("县")
private String county;
@XText("邮编")
private String postcode;
@XText("备注")
private String remark;
private Integer saleType;
private Integer industryType;
@XText("是否国内")
private Integer beDomestic;
@XText("是否重点客户")
private Integer beKeyCustomer;
@XText("是否为上游用户")
private Integer beUpLient;
@XText("是否为下游用户")
private Integer beDownClient;
@XText("是否为托运商")
private Integer beConsignor;
private String vendorType;
@XText("生效时间")
private Date effectTime;
@XText("结束时间")
private Date endTime;
@XText("地区")
private String region;
@XText("MDM编码")
private String mdmCode;
@XText("组织机构id")
private String ouId;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getClientCode() {
return clientCode;
}
public void setClientCode(String clientCode) {
this.clientCode = clientCode;
}
public String getClientName() {
return clientName;
}
public void setClientName(String clientName) {
this.clientName = clientName;
}
public String getClientShortAme() {
return clientShortAme;
}
public void setClientShortAme(String clientShortAme) {
this.clientShortAme = clientShortAme;
}
public String getUsedName() {
return usedName;
}
public void setUsedName(String usedName) {
this.usedName = usedName;
}
public String getShortUsedName() {
return shortUsedName;
}
public void setShortUsedName(String shortUsedName) {
this.shortUsedName = shortUsedName;
}
public String getTel() {
return tel;
}
public void setTel(String tel) {
this.tel = tel;
}
public String getFax() {
return fax;
}
public void setFax(String fax) {
this.fax = fax;
}
public String getMobile() {
return mobile;
}
public void setMobile(String mobile) {
this.mobile = mobile;
}
public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
}
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
public String getCountry() {
return country;
}
public void setCountry(String country) {
this.country = country;
}
public String getProvince() {
return province;
}
public void setProvince(String province) {
this.province = province;
}
public String getCity() {
return city;
}
public void setCity(String city) {
this.city = city;
}
public String getCounty() {
return county;
}
public void setCounty(String county) {
this.county = county;
}
public String getPostcode() {
return postcode;
}
public void setPostcode(String postcode) {
this.postcode = postcode;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public Integer getSaleType() {
return saleType;
}
public void setSaleType(Integer saleType) {
this.saleType = saleType;
}
public Integer getIndustryType() {
return industryType;
}
public void setIndustryType(Integer industryType) {
this.industryType = industryType;
}
public Integer getBeDomestic() {
return beDomestic;
}
public void setBeDomestic(Integer beDomestic) {
this.beDomestic = beDomestic;
}
public Integer getBeKeyCustomer() {
return beKeyCustomer;
}
public void setBeKeyCustomer(Integer beKeyCustomer) {
this.beKeyCustomer = beKeyCustomer;
}
public Integer getBeUpLient() {
return beUpLient;
}
public void setBeUpLient(Integer beUpLient) {
this.beUpLient = beUpLient;
}
public Integer getBeDownClient() {
return beDownClient;
}
public void setBeDownClient(Integer beDownClient) {
this.beDownClient = beDownClient;
}
public Integer getBeConsignor() {
return beConsignor;
}
public void setBeConsignor(Integer beConsignor) {
this.beConsignor = beConsignor;
}
public String getVendorType() {
return vendorType;
}
public void setVendorType(String vendorType) {
this.vendorType = vendorType;
}
public Date getEffectTime() {
return effectTime;
}
public void setEffectTime(Date effectTime) {
this.effectTime = effectTime;
}
public Date getEndTime() {
return endTime;
}
public void setEndTime(Date endTime) {
this.endTime = endTime;
}
public String getRegion() {
return region;
}
public void setRegion(String region) {
this.region = region;
}
public String getMdmCode() {
return mdmCode;
}
public void setMdmCode(String mdmCode) {
this.mdmCode = mdmCode;
}
public String getOuId() {
return ouId;
}
public void setOuId(String ouId) {
this.ouId = ouId;
}
}
C09-base/pps-cloud-base/src/main/java/pps/cloud/base/service/data/UpdateBaseClientCloudInput.java deleted 100644 → 0
View file @ e1ea8e3c
package pps.cloud.base.service.data;
import xstartup.annotation.XText;
import java.util.Date;
public class UpdateBaseClientCloudInput {
@XText("主键")
private String id;
@XText("编码")
private String clientCode;
@XText("名称")
private String clientName;
@XText("简称")
private String clientShortAme;
@XText("曾用名")
private String usedName;
@XText("简称曾用名")
private String shortUsedName;
@XText("固话")
private String tel;
@XText("传真")
private String fax;
@XText("手机")
private String mobile;
@XText("电子邮件")
private String email;
@XText("地址")
private String address;
@XText("国家")
private String country;
@XText("省")
private String province;
@XText("城市")
private String city;
@XText("县")
private String county;
@XText("邮编")
private String postcode;
@XText("备注")
private String remark;
@XText("是否删除")
private Integer beDeleted;
private Integer saleType;
private Integer industryType;
@XText("是否国内")
private Integer beDomestic;
@XText("是否重点客户")
private Integer beKeyCustomer;
@XText("是否为上游用户")
private Integer beUpLient;
@XText("是否为下游用户")
private Integer beDownClient;
@XText("是否为托运商")
private Integer beConsignor;
private String vendorType;
@XText("生效时间")
private Date effectTime;
@XText("结束时间")
private Date endTime;
@XText("地区")
private String region;
@XText("排序")
private Integer sort;
@XText("MDM编码")
private String mdmCode;
@XText("创建人")
private String createById;
@XText("创建人名称")
private String createByName;
@XText("创建时间")
private Date createTime;
@XText("修改人")
private String modifyById;
@XText("修改人名称")
private String modifyByName;
@XText("修改时间")
private Date modifyTime;
@XText("上下游用户类型")
private String clientType;
@XText("组织机构id")
private String ouId;
public String getOuId() {
return ouId;
}
public void setOuId(String ouId) {
this.ouId = ouId;
}
public String getClientType() {
return clientType;
}
public void setClientType(String clientType) {
this.clientType = clientType;
}
public String getId() {
return this.id;
}
public void setId(String value) {
this.id = value;
}
public String getClientCode() {
return this.clientCode;
}
public void setClientCode(String value) {
this.clientCode = value;
}
public String getClientName() {
return this.clientName;
}
public void setClientName(String value) {
this.clientName = value;
}
public String getClientShortAme() {
return this.clientShortAme;
}
public void setClientShortAme(String value) {
this.clientShortAme = value;
}
public String getUsedName() {
return this.usedName;
}
public void setUsedName(String value) {
this.usedName = value;
}
public String getShortUsedName() {
return this.shortUsedName;
}
public void setShortUsedName(String value) {
this.shortUsedName = value;
}
public String getTel() {
return this.tel;
}
public void setTel(String value) {
this.tel = value;
}
public String getFax() {
return this.fax;
}
public void setFax(String value) {
this.fax = value;
}
public String getMobile() {
return this.mobile;
}
public void setMobile(String value) {
this.mobile = value;
}
public String getEmail() {
return this.email;
}
public void setEmail(String value) {
this.email = value;
}
public String getAddress() {
return this.address;
}
public void setAddress(String value) {
this.address = value;
}
public String getCountry() {
return this.country;
}
public void setCountry(String value) {
this.country = value;
}
public String getProvince() {
return this.province;
}
public void setProvince(String value) {
this.province = value;
}
public String getCity() {
return this.city;
}
public void setCity(String value) {
this.city = value;
}
public String getCounty() {
return this.county;
}
public void setCounty(String value) {
this.county = value;
}
public String getPostcode() {
return this.postcode;
}
public void setPostcode(String value) {
this.postcode = value;
}
public String getRemark() {
return this.remark;
}
public void setRemark(String value) {
this.remark = value;
}
public Integer getBeDeleted() {
return this.beDeleted;
}
public void setBeDeleted(Integer value) {
this.beDeleted = value;
}
public Integer getSaleType() {
return this.saleType;
}
public void setSaleType(Integer value) {
this.saleType = value;
}
public Integer getIndustryType() {
return this.industryType;
}
public void setIndustryType(Integer value) {
this.industryType = value;
}
public Integer getBeDomestic() {
return this.beDomestic;
}
public void setBeDomestic(Integer value) {
this.beDomestic = value;
}
public Integer getBeKeyCustomer() {
return this.beKeyCustomer;
}
public void setBeKeyCustomer(Integer value) {
this.beKeyCustomer = value;
}
public Integer getBeUpLient() {
return this.beUpLient;
}
public void setBeUpLient(Integer value) {
this.beUpLient = value;
}
public Integer getBeDownClient() {
return this.beDownClient;
}
public void setBeDownClient(Integer value) {
this.beDownClient = value;
}
public Integer getBeConsignor() {
return this.beConsignor;
}
public void setBeConsignor(Integer value) {
this.beConsignor = value;
}
public String getVendorType() {
return this.vendorType;
}
public void setVendorType(String value) {
this.vendorType = value;
}
public Date getEffectTime() {
return this.effectTime;
}
public void setEffectTime(Date value) {
this.effectTime = value;
}
public Date getEndTime() {
return this.endTime;
}
public void setEndTime(Date value) {
this.endTime = value;
}
public String getRegion() {
return this.region;
}
public void setRegion(String value) {
this.region = value;
}
public Integer getSort() {
return this.sort;
}
public void setSort(Integer value) {
this.sort = value;
}
public String getMdmCode() {
return this.mdmCode;
}
public void setMdmCode(String value) {
this.mdmCode = value;
}
public String getCreateById() {
return this.createById;
}
public void setCreateById(String value) {
this.createById = value;
}
public String getCreateByName() {
return this.createByName;
}
public void setCreateByName(String value) {
this.createByName = value;
}
public Date getCreateTime() {
return this.createTime;
}
public void setCreateTime(Date value) {
this.createTime = value;
}
public String getModifyById() {
return this.modifyById;
}
public void setModifyById(String value) {
this.modifyById = value;
}
public String getModifyByName() {
return this.modifyByName;
}
public void setModifyByName(String value) {
this.modifyByName = value;
}
public Date getModifyTime() {
return this.modifyTime;
}
public void setModifyTime(Date value) {
this.modifyTime = value;
}
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/CounterService.java
View file @ c2d91725
......@@ -27,7 +27,6 @@ public class CounterService {
* @param context
* @return
*/
// @XApiAnonymous
@XText("获取全局计数器")
@XApiGet
public XSingleResult<MyCounterOutput> getGlobalCounter(XContext context) {
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/SysPageInfoService.java
View file @ c2d91725
......@@ -54,26 +54,6 @@ public class SysPageInfoService {
if (entity == null) {
return XServiceResult.error(context, XError.NotFound);
}
/*//查询是否有当前页面未发布的数据，如果有不新增，如果没有，新增一条
QueryWrapper<SysPageInfoEnt> queryStateVersion = new QueryWrapper();
queryStateVersion.lambda().eq(SysPageInfoEnt::getPageId,entity.getPageId())
.eq(SysPageInfoEnt::getReleaseState,0);
List<SysPageInfoEnt> sysPageInfos = mapper.selectList(queryStateVersion);
if(ObjectUtils.isEmpty(sysPageInfos)){
SysPageInfoEnt sysPage = XCopyUtils.copyNewObject(entity, SysPageInfoEnt.class);
sysPage.setId(UUID.randomUUID().toString());
sysPage.setIsHistory(0);
sysPage.setReleaseState(0);
sysPage.setPageContext(input.getPageContext());
sysPage.setCreateById(session.getId());
sysPage.setCreateByName(session.getLoginName());
sysPage.setCreateTime(new Date());
mapper.insert(sysPage);
}else{
SysPageInfoEnt sysPageInfoEnt = sysPageInfos.get(0);
sysPageInfoEnt.setPageContext(input.getPageContext());
mapper.updateById(sysPageInfoEnt);
}*/
if (StringUtils.isNotBlank(input.getPageContext())) {
entity.setPageContext(input.getPageContext());
}
......
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