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
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 { ...@@ -21,6 +21,4 @@ class SqlFilterTest {
Thread.currentThread().setName("dealNewToOldMq"); Thread.currentThread().setName("dealNewToOldMq");
Assertions.assertEquals("dealNewToOldMq", Thread.currentThread().getName()); Assertions.assertEquals("dealNewToOldMq", Thread.currentThread().getName());
} }
} }
\ No newline at end of file
//Generated with love by TestMe :) Please report issues and submit feature requests at: http://weirddev.com/forum#!/testme
\ No newline at end of file
C02-system/pps-core-system/src/main/java/pps/core/system/service/SysOutUserCreateLogService.java deleted 100644 → 0
View file @ e1ea8e3c
package pps.core.system.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.util.CollectionUtils;
import pps.cloud.base.service.BaseBaseClientCloudService;
import pps.cloud.base.service.data.BaseNameInput;
import pps.cloud.base.service.data.FindBaseClientOutput;
import pps.cloud.base.service.data.UpdateBaseClientCloudInput;
import pps.core.common.session.PpsUserSession;
import pps.core.common.utils.MD5Util;
import pps.core.system.entity.*;
import pps.core.system.mapper.*;
import pps.core.system.service.data.sys_out_user_create_log.CreateSysOutUserCreateLogViewInput;
import pps.core.system.service.data.sys_out_user_create_log.QuerySysOutUserCreateLogViewInput;
import pps.core.system.service.data.sys_out_user_create_log.QuerySysOutUserCreateLogViewOutput;
import pps.core.system.utils.UserInfoUtil;
import xstartup.annotation.XService;
import xstartup.annotation.XText;
import xstartup.base.XContext;
import xstartup.base.util.XCopyUtils;
import xstartup.base.util.XDateUtils;
import xstartup.base.util.XStringUtils;
import xstartup.data.XPageResult;
import xstartup.data.XServiceResult;
import xstartup.data.XSingleResult;
import xstartup.feature.api.annotation.XApiAnonymous;
import xstartup.feature.api.annotation.XApiGet;
import xstartup.feature.api.annotation.XApiPost;
import xstartup.feature.mybatis.helper.XMapperHelper;
import xstartup.helper.XTransactionHelper;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.UUID;
@XText("外部用户创建管理")
@XService
public class SysOutUserCreateLogService {
@XText("查询外部用户创建列表")
@XApiGet
public XPageResult<QuerySysOutUserCreateLogViewOutput> querySysOutUserCreateLogViewPage(XContext context, QuerySysOutUserCreateLogViewInput input) {
SysOutUserCreateLogMapper mapper = context.getBean(SysOutUserCreateLogMapper.class);
PpsUserSession session = context.getSession(PpsUserSession.class);
QueryWrapper<SysOutUserCreateLogEnt> queryWrapper = new QueryWrapper<>();
if (input.getStatus() != null) {
queryWrapper.lambda().eq(SysOutUserCreateLogEnt::getStatus, input.getStatus());
}
if (StringUtils.isNotBlank(input.getOuId())) {
queryWrapper.lambda().eq(SysOutUserCreateLogEnt::getOuId, input.getOuId());
}
if (StringUtils.isNotBlank(input.getClientName())) {
queryWrapper.lambda().like(SysOutUserCreateLogEnt::getClientName, input.getClientName());
}
if (StringUtils.isNotBlank(input.getLoginName())) {
queryWrapper.lambda().like(SysOutUserCreateLogEnt::getLoginName, input.getLoginName());
}
if (StringUtils.isNotBlank(input.getUserName())) {
queryWrapper.lambda().like(SysOutUserCreateLogEnt::getUserName, input.getUserName());
}
if (StringUtils.isNotBlank(input.getStartDataDate())) {
queryWrapper.lambda().ge(SysOutUserCreateLogEnt::getCreateTime, input.getStartDataDate());
}
if (StringUtils.isNotBlank(input.getEndDataDate())) {
queryWrapper.lambda().le(SysOutUserCreateLogEnt::getCreateTime, input.getEndDataDate());
}
queryWrapper.lambda().orderByDesc(SysOutUserCreateLogEnt::getCreateTime);
XPageResult<QuerySysOutUserCreateLogViewOutput> query = XMapperHelper.query(mapper, input, queryWrapper, QuerySysOutUserCreateLogViewOutput.class);
List<QuerySysOutUserCreateLogViewOutput> result = query.getResult().getItems();
result.stream().forEach(item -> {
if (XStringUtils.isNotEmpty(item.getOuLevel())) {
switch (item.getOuLevel()) {
case "0":
item.setOuLevelName("托运商");
break;
case "1":
item.setOuLevelName("上游用户");
break;
case "2":
item.setOuLevelName("下游用户");
break;
}
}
if (XStringUtils.isNotEmpty(item.getMediumList())) {
String[] mediumList = item.getMediumList().split(",");
List<String> mediumNameList = new ArrayList<>();
for (String medium : mediumList) {
switch (medium) {
case "GAS":
mediumNameList.add("天然气");
break;
case "LNG":
mediumNameList.add("LNG");
break;
case "OIL":
mediumNameList.add("原油");
break;
case "CPY":
mediumNameList.add("成品油");
break;
}
}
item.setMediumListName(String.join(",", mediumNameList));
}
});
return query;
}
@XText("审批外部用户")
@XApiPost
public XServiceResult approveOutUser(XContext context, CreateSysOutUserCreateLogViewInput input) {
return XTransactionHelper.begin(context, () -> {
SysOutUserCreateLogMapper mapper = context.getBean(SysOutUserCreateLogMapper.class);
QueryWrapper<SysOutUserCreateLogEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SysOutUserCreateLogEnt::getId, input.getId());
SysOutUserCreateLogEnt ent = mapper.selectOne(queryWrapper);
if (null == ent || ent.getStatus() == 1 || ent.getStatus() == 2)
return XServiceResult.error(500, "数据已被处理");
PpsUserSession session = context.getSession(PpsUserSession.class);
//1.判断客户信息是否存在，如果存在，进行下一步，如果不存在，直接返回
Date date = new Date();
ent.setModifyById(session.getId());
ent.setModifyByName(session.getUserName());
ent.setModifyTime(date);
ent.setStatus(input.getStatus());
if (input.getStatus() == 1) {
String ouLevel = "SUPPLIER";
BaseBaseClientCloudService cloudService = context.getBean(BaseBaseClientCloudService.class);
BaseNameInput baseNameInput = new BaseNameInput();
baseNameInput.setName(ent.getClientName());
FindBaseClientOutput client = null;
switch (ent.getOuLevel()) {
case "0":
XSingleResult<FindBaseClientOutput> resultShipper = cloudService.selectShipperByName(context, baseNameInput);
resultShipper.throwIfFail();
client = resultShipper.getResult();
break;
case "1":
XSingleResult<FindBaseClientOutput> resultUpClient = cloudService.selectUpClientByName(context, baseNameInput);
resultUpClient.throwIfFail();
client = resultUpClient.getResult();
ouLevel = "UP_CLIENT";
break;
case "2":
XSingleResult<FindBaseClientOutput> resultDownClient = cloudService.selectDownClientByName(context, baseNameInput);
resultDownClient.throwIfFail();
client = resultDownClient.getResult();
ouLevel = "DOWN_CLIENT";
break;
}
if (null != client && XStringUtils.isEmpty(client.getOuId())) {
//2.判断客户是否存在组织机构，如果不存在，新增组织机构，并与客户做业务绑定
//2.1创建组织机构
SysOrganizationEnt organization = new SysOrganizationEnt();
SysOrganizationMapper organizationMapper = context.getBean(SysOrganizationMapper.class);
organization.setId(UUID.randomUUID().toString());
organization.setOuName(ent.getClientName());
organization.setShortName(ent.getClientName());
organization.setOuLevel(ouLevel);
organization.setCreateById(session.getId());
organization.setCreateByName(session.getUserName());
organization.setCreateTime(date);
organization.setIsDeleted(1);
organizationMapper.insert(organization);
//2.1.1赋予组织机构介质类型
SysOrganizationPropertyMapper propertyMapper = context.getBean(SysOrganizationPropertyMapper.class);
String[] mediumList = ent.getMediumList().split(",");
for (String item : mediumList) {
SysOrganizationPropertyEnt organizationPropertyEnt = new SysOrganizationPropertyEnt();
organizationPropertyEnt.setId(UUID.randomUUID().toString());
organizationPropertyEnt.setOuId(organization.getId());
organizationPropertyEnt.setPropertyCode("MEDIUM_TYPE");
organizationPropertyEnt.setPropertyValue(item);
organizationPropertyEnt.setEffectTime(date);
organizationPropertyEnt.setEndTime(XDateUtils.parse("2099-12-31 00:00:00"));
organizationPropertyEnt.setCreateById(session.getId());
organizationPropertyEnt.setCreateByName(session.getUserName());
organizationPropertyEnt.setCreateTime(date);
propertyMapper.insert(organizationPropertyEnt);
}
//2.2组织机构挂在外部企业下面
SysOrganizationRelMapper organizationRelMapper = context.getBean(SysOrganizationRelMapper.class);
SysOrganizationRelEnt organizationRelEnt = new SysOrganizationRelEnt();
organizationRelEnt.setId(UUID.randomUUID().toString());
organizationRelEnt.setOuId(organization.getId());
organizationRelEnt.setParentOuId("0cfa0232-2ed8-4721-a8f3-5febf9122510");
organizationRelEnt.setOuIdPath("F6AC16F3-C184-4836-BE87-65AA5F1695B8/0cfa0232-2ed8-4721-a8f3-5febf9122510/" + organizationRelEnt.getId());
organizationRelEnt.setEffectTime(date);
organizationRelEnt.setEndTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse("9999-12-31 00:00:00"));
organizationRelEnt.setCreateById(session.getId());
organizationRelEnt.setCreateByName(session.getUserName());
organizationRelEnt.setCreateTime(date);
organizationRelEnt.setSort(999);
organizationRelMapper.insert(organizationRelEnt);
//2.3更新客户组织机构id
client.setOuId(organization.getId());
BaseBaseClientCloudService clientCloudService = context.getBean(BaseBaseClientCloudService.class);
UpdateBaseClientCloudInput clientCloudInput = XCopyUtils.copyNewObject(client, UpdateBaseClientCloudInput.class);
clientCloudService.updateBaseClient(context, clientCloudInput);
ent.setOuId(organization.getId());
ent.setOuName(organization.getOuName());
ent.setClientId(client.getId());
ent.setClientName(client.getClientName());
}
//3新增用户
SysUserMapper userMapper = context.getBean(SysUserMapper.class);
SysUserEnt userEnt = XCopyUtils.copyNewObject(ent, SysUserEnt.class);
userEnt.setId(UUID.randomUUID().toString());
userEnt.setCreateById(session.getId());
userEnt.setCreateByName(session.getUserName());
userEnt.setCreateTime(date);
userEnt.setIsOuter(1);
userEnt.setIsInner(2);
if (XStringUtils.isNotEmpty(userEnt.getPassword()))
userEnt.setPassword(MD5Util.encryptPassword(userEnt.getPassword()));
else
userEnt.setPassword("2e7832f9c3a0ca243c559017c07cceed");
userEnt.setPhone(UserInfoUtil.encrypt(userEnt.getPhone()));
userMapper.insert(userEnt);
//插入用户组织机构关系
SysUserOrganizationRelEnt sysUserOrganizationRelEnt = new SysUserOrganizationRelEnt();
sysUserOrganizationRelEnt.setId(UUID.randomUUID().toString());
sysUserOrganizationRelEnt.setOuId(client.getOuId());
sysUserOrganizationRelEnt.setUserId(userEnt.getId());
sysUserOrganizationRelEnt.setCreateById(session.getId());
sysUserOrganizationRelEnt.setCreateByName(session.getUserName());
sysUserOrganizationRelEnt.setCreateTime(date);
sysUserOrganizationRelEnt.setEffectTime(new Date());
sysUserOrganizationRelEnt.setEndTime(XDateUtils.tryParse("2099-12-31"));
SysUserOrganizationRelMapper userOrganizationRelMapper = context.getBean(SysUserOrganizationRelMapper.class);
userOrganizationRelMapper.insert(sysUserOrganizationRelEnt);
//插入用户角色关系
SysUserRoleRelMapper userRoleRelMapper = context.getBean(SysUserRoleRelMapper.class);
QueryWrapper<SysUserRoleRelEnt> queryRelWrapper = new QueryWrapper<>();
queryRelWrapper.lambda().eq(SysUserRoleRelEnt::getUserId, "abd73e81-2b0a-4585-a71b-b52c7a36a2cb");
List<SysUserRoleRelEnt> userRoleRelEnts = userRoleRelMapper.selectList(queryRelWrapper);
if (!CollectionUtils.isEmpty(userRoleRelEnts)) {
userRoleRelEnts.stream().forEach(item -> {
item.setId(UUID.randomUUID().toString());
item.setUserId(userEnt.getId());
userRoleRelMapper.insert(item);
});
}
}
mapper.updateById(ent);
return XServiceResult.OK;
});
}
@XText("创建外部用户")
@XApiPost
@XApiAnonymous
public XServiceResult createOutUser(XContext context, CreateSysOutUserCreateLogViewInput input) {
return XTransactionHelper.begin(context, () -> {
SysOutUserCreateLogMapper mapper = context.getBean(SysOutUserCreateLogMapper.class);
Date date = new Date();
//1.判断客户信息是否存在，如果存在，进行下一步，如果不存在，直接返回
SysOutUserCreateLogEnt ent = XCopyUtils.copyNewObject(input, SysOutUserCreateLogEnt.class);
ent.setCreateTime(date);
ent.setModifyTime(date);
ent.setStatus(0);
Boolean flag = true;
StringBuffer buffer = new StringBuffer();
if (XStringUtils.isEmpty(ent.getClientName())) {
flag = false;
buffer.append("客户名称不能为空");
}
if (XStringUtils.isEmpty(ent.getLoginName())) {
flag = false;
buffer.append("登录名不能为空");
}
if (XStringUtils.isEmpty(ent.getUserName())) {
flag = false;
buffer.append("用户姓名不能为空");
}
// if(XStringUtils.isEmpty(ent.getPassword())){
// flag = false;
// buffer.append("登录密码不能为空");
// }
// if(XStringUtils.isEmpty(ent.getIamLoginName())){
// flag = false;
// buffer.append("IAM接口登录名不能为空");
// }
// if(XStringUtils.isEmpty(ent.getUserCode())){
// flag = false;
// buffer.append("员工编码不能为空");
// }
// if(XStringUtils.isEmpty(ent.getDuty())){
// flag = false;
// buffer.append("职务不能为空");
// }
// if(XStringUtils.isEmpty(ent.getPostalCode())){
// flag = false;
// buffer.append("邮编不能为空");
// }
// if(XStringUtils.isEmpty(ent.getPhone())){
// flag = false;
// buffer.append("手机号不能为空");
// }
// if(XStringUtils.isEmpty(ent.getEmail())){
// flag = false;
// buffer.append("用户邮箱不能为空");
// }
// if(XStringUtils.isEmpty(ent.getAddress())){
// flag = false;
// buffer.append("通讯地址不能为空");
// }
if (flag) {
//2根据日志，判断用户操作次数
SysOutUserSearchCilentLogMapper searchCilentLogMapper = context.getBean(SysOutUserSearchCilentLogMapper.class);
QueryWrapper<SysOutUserSearchClientLogEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SysOutUserSearchClientLogEnt::getIpAddress, context.getWebRequest().getClientIp());
queryWrapper.lambda().ge(SysOutUserSearchClientLogEnt::getCreateTime, XDateUtils.addMunites(new Date(), -5));
Long count = searchCilentLogMapper.selectCount(queryWrapper);
if (count > 5)
return XServiceResult.error(500, "客户查询失败超过5次");
BaseBaseClientCloudService cloudService = context.getBean(BaseBaseClientCloudService.class);
BaseNameInput baseNameInput = new BaseNameInput();
baseNameInput.setName(ent.getClientName());
FindBaseClientOutput client = null;
switch (input.getOuLevel()) {
case "0":
XSingleResult<FindBaseClientOutput> resultShipper = cloudService.selectShipperByName(context, baseNameInput);
resultShipper.throwIfFail();
client = resultShipper.getResult();
break;
case "1":
XSingleResult<FindBaseClientOutput> resultUpClient = cloudService.selectUpClientByName(context, baseNameInput);
resultUpClient.throwIfFail();
client = resultUpClient.getResult();
break;
case "2":
XSingleResult<FindBaseClientOutput> resultDownClient = cloudService.selectDownClientByName(context, baseNameInput);
resultDownClient.throwIfFail();
client = resultDownClient.getResult();
break;
}
if (null != client) {
//3如果客户存在，新增用户
//3.1判断账户、iam账户是否重复
SysUserMapper userMapper = context.getBean(SysUserMapper.class);
QueryWrapper<SysUserEnt> entQueryWrapper = new QueryWrapper<>();
entQueryWrapper.lambda().eq(SysUserEnt::getLoginName, ent.getLoginName());
Long loginCount = userMapper.selectCount(entQueryWrapper);
QueryWrapper<SysOutUserCreateLogEnt> logEntQueryWrapper = new QueryWrapper<>();
logEntQueryWrapper.lambda().eq(SysOutUserCreateLogEnt::getLoginName, ent.getLoginName());
Long loginLogCount = mapper.selectCount(logEntQueryWrapper);
if (loginCount > 0 || loginLogCount > 0) {
return XServiceResult.error(500, "登录账户已存在");
}
if (XStringUtils.isNotEmpty(ent.getIamLoginName())) {
entQueryWrapper.clear();
entQueryWrapper.lambda().eq(SysUserEnt::getIamLoginName, ent.getIamLoginName());
Long loginIamCount = userMapper.selectCount(entQueryWrapper);
logEntQueryWrapper.clear();
logEntQueryWrapper.lambda().eq(SysOutUserCreateLogEnt::getIamLoginName, ent.getIamLoginName());
Long loginLogiamCount = mapper.selectCount(logEntQueryWrapper);
if (loginIamCount > 0 || loginLogiamCount > 0) {
return XServiceResult.error(500, "IAM登录账户已存在");
}
}
if (XStringUtils.isNotEmpty(ent.getPhone())) {
entQueryWrapper.clear();
entQueryWrapper.lambda().eq(SysUserEnt::getPhone, ent.getPhone());
Long loginPhoneCount = userMapper.selectCount(entQueryWrapper);
logEntQueryWrapper.clear();
logEntQueryWrapper.lambda().eq(SysOutUserCreateLogEnt::getPhone, ent.getPhone());
Long loginLogPhoneCount = mapper.selectCount(logEntQueryWrapper);
if (loginPhoneCount > 0 || loginLogPhoneCount > 0) {
return XServiceResult.error(500, "手机号码已存在");
}
}
if (!CollectionUtils.isEmpty(input.getMediumList())) {
List<String> mediumList = input.getMediumList();
String str = "";
for (String item : mediumList) {
str += item + ",";
}
ent.setMediumList(str.substring(0, str.length() - 1));
}
// ent.setMediumList(StringUtils.join("," ,input.getMediumList()));
ent.setClientId(client.getId());
if (XStringUtils.isNotEmpty(client.getOuId())) {
SysOrganizationMapper orgMapper = context.getBean(SysOrganizationMapper.class);
QueryWrapper<SysOrganizationEnt> orgQueryWrapper = new QueryWrapper<>();
orgQueryWrapper.lambda().eq(SysOrganizationEnt::getId, client.getOuId());
SysOrganizationEnt sysOrganizationEnt = orgMapper.selectOne(orgQueryWrapper);
if (null != sysOrganizationEnt) {
ent.setOuId(sysOrganizationEnt.getId());
ent.setOuName(sysOrganizationEnt.getOuName());
}
}
mapper.insert(ent);
} else {
//根据ip记录日志，防止用户重复操作。
SysOutUserSearchClientLogEnt logEnt = new SysOutUserSearchClientLogEnt();
logEnt.setId(UUID.randomUUID().toString());
logEnt.setErrorMsg(ent.getClientName());
logEnt.setIpAddress(context.getWebRequest().getClientIp());
logEnt.setCreateTime(new Date());
searchCilentLogMapper.insert(logEnt);
return XServiceResult.error(500, "客户不存在");
}
} else {
return XServiceResult.error(500, buffer.toString());
}
return XServiceResult.OK;
});
}
}
\ 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 { ...@@ -27,7 +27,6 @@ public class CounterService {
* @param context * @param context
* @return * @return
*/ */
// @XApiAnonymous
@XText("获取全局计数器") @XText("获取全局计数器")
@XApiGet @XApiGet
public XSingleResult<MyCounterOutput> getGlobalCounter(XContext context) { 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 { ...@@ -54,26 +54,6 @@ public class SysPageInfoService {
if (entity == null) { if (entity == null) {
return XServiceResult.error(context, XError.NotFound); 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())) { if (StringUtils.isNotBlank(input.getPageContext())) {
entity.setPageContext(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