Skip to content

A
amos-boot-biz
Commit 80d5267c authored by wujiang's avatar wujiang
Browse files
Options

提交添加接口

parent eb72e0bc
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 151 additions and 88 deletions
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/HouseholdPvDto.java
View file @ 80d5267c
package com.yeejoin.amos.boot.module.jxiop.api.dto;
import java.util.Date;
import java.util.List;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* 户用光伏表
......@@ -80,5 +83,15 @@ public class HouseholdPvDto extends BaseDto {
@ApiModelProperty(value = "创建时间")
private Date createTime;
/**合同信息*/
private HouseholdPvContactDto contactInfo;
/**租赁物信息*/
private HouseholdPvLeaseDto leaseInfo;
/**安装信息*/
private HouseholdPvInstallDto installInfo;
/**设备信息*/
private List<HouseholdPvDeviceDto> devices;
}
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/service/IHouseholdPvContactService.java
View file @ 80d5267c
package com.yeejoin.amos.boot.module.jxiop.api.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yeejoin.amos.boot.module.jxiop.api.entity.HouseholdPvContact;
/**
* 户用光伏合同表接口类
......@@ -7,6 +9,6 @@ package com.yeejoin.amos.boot.module.jxiop.api.service;
* @author system_generator
* @date 2023-03-17
*/
public interface IHouseholdPvContactService {
public interface IHouseholdPvContactService extends IService<HouseholdPvContact>{
}
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/service/IHouseholdPvDeviceService.java
View file @ 80d5267c
package com.yeejoin.amos.boot.module.jxiop.api.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yeejoin.amos.boot.module.jxiop.api.entity.HouseholdPvDevice;
/**
* 户用光伏设备表接口类
......@@ -7,6 +9,6 @@ package com.yeejoin.amos.boot.module.jxiop.api.service;
* @author system_generator
* @date 2023-03-17
*/
public interface IHouseholdPvDeviceService {
public interface IHouseholdPvDeviceService extends IService<HouseholdPvDevice>{
}
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/service/IHouseholdPvDistrictService.java
View file @ 80d5267c
package com.yeejoin.amos.boot.module.jxiop.api.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yeejoin.amos.boot.module.jxiop.api.entity.HouseholdPvDistrict;
/**
* 接口类
......@@ -7,6 +9,6 @@ package com.yeejoin.amos.boot.module.jxiop.api.service;
* @author system_generator
* @date 2023-03-17
*/
public interface IHouseholdPvDistrictService {
public interface IHouseholdPvDistrictService extends IService<HouseholdPvDistrict>{
}
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/service/IHouseholdPvInstallService.java
View file @ 80d5267c
package com.yeejoin.amos.boot.module.jxiop.api.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yeejoin.amos.boot.module.jxiop.api.entity.HouseholdPvInstall;
/**
* 户用光伏合同表接口类
......@@ -7,6 +9,6 @@ package com.yeejoin.amos.boot.module.jxiop.api.service;
* @author system_generator
* @date 2023-03-17
*/
public interface IHouseholdPvInstallService {
public interface IHouseholdPvInstallService extends IService<HouseholdPvInstall>{
}
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/service/IHouseholdPvLeaseService.java
View file @ 80d5267c
package com.yeejoin.amos.boot.module.jxiop.api.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yeejoin.amos.boot.module.jxiop.api.entity.HouseholdPvLease;
/**
* 户用光伏合同表接口类
......@@ -7,6 +9,6 @@ package com.yeejoin.amos.boot.module.jxiop.api.service;
* @author system_generator
* @date 2023-03-17
*/
public interface IHouseholdPvLeaseService {
public interface IHouseholdPvLeaseService extends IService<HouseholdPvLease>{
}
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/service/IHouseholdPvService.java
View file @ 80d5267c
package com.yeejoin.amos.boot.module.jxiop.api.service;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yeejoin.amos.boot.module.jxiop.api.dto.HouseholdPvDto;
import com.yeejoin.amos.boot.module.jxiop.api.dto.HouseholdPvImport;
import java.util.List;
import com.yeejoin.amos.boot.module.jxiop.api.entity.HouseholdPv;
/**
* 户用光伏表接口类
......@@ -12,11 +14,13 @@ import java.util.List;
* @author system_generator
* @date 2023-03-17
*/
public interface IHouseholdPvService {
public interface IHouseholdPvService extends IService<HouseholdPv>{
void importData(List<HouseholdPvImport> list);
List<HouseholdPvImport> selectExportList(HouseholdPvDto dto);
void deleteBatch(List<Long> ids);
HouseholdPvDto save(HouseholdPvDto householdPvDto);
}
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/HouseholdPvController.java
View file @ 80d5267c
......@@ -70,7 +70,7 @@ public class HouseholdPvController extends BaseController {
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增户用光伏表", notes = "新增户用光伏表")
public ResponseModel<HouseholdPvDto> save(@RequestBody HouseholdPvDto model) {
model = householdPvServiceImpl.createWithModel(model);
model = householdPvServiceImpl.save(model);
return ResponseHelper.buildResponse(model);
}
......
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/HouseholdPvServiceImpl.java
View file @ 80d5267c
package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import org.apache.commons.lang3.ObjectUtils;
import org.joda.time.LocalDateTime;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
import com.yeejoin.amos.boot.module.common.api.enums.ExcelSelectData;
import com.yeejoin.amos.boot.module.jxiop.api.dto.HouseholdPvDto;
import com.yeejoin.amos.boot.module.jxiop.api.dto.HouseholdPvImport;
import com.yeejoin.amos.boot.module.jxiop.api.entity.HouseholdPv;
import com.yeejoin.amos.boot.module.jxiop.api.entity.HouseholdPvContact;
import com.yeejoin.amos.boot.module.jxiop.api.entity.HouseholdPvInstall;
import com.yeejoin.amos.boot.module.jxiop.api.entity.HouseholdPvLease;
import com.yeejoin.amos.boot.module.jxiop.api.mapper.HouseholdPvMapper;
import com.yeejoin.amos.boot.module.jxiop.api.service.IHouseholdPvContactService;
import com.yeejoin.amos.boot.module.jxiop.api.service.IHouseholdPvInstallService;
import com.yeejoin.amos.boot.module.jxiop.api.service.IHouseholdPvLeaseService;
import com.yeejoin.amos.boot.module.jxiop.api.service.IHouseholdPvService;
import com.yeejoin.amos.boot.module.jxiop.api.dto.HouseholdPvDto;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.joda.time.DateTimeUtils;
import org.joda.time.LocalDateTime;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.*;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.text.DateFormat;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
* 户用光伏表服务实现类
......@@ -34,66 +36,99 @@ import java.util.List;
* @date 2023-03-17
*/
@Service
public class HouseholdPvServiceImpl extends BaseService<HouseholdPvDto,HouseholdPv,HouseholdPvMapper> implements IHouseholdPvService {
public class HouseholdPvServiceImpl extends BaseService<HouseholdPvDto, HouseholdPv, HouseholdPvMapper>
implements IHouseholdPvService {
@Autowired
HouseholdPvMapper householdPvMapper;
@Autowired
IHouseholdPvContactService iHouseholdPvContactService;
@Autowired
IHouseholdPvLeaseService iHouseholdPvLeaseService;
@Autowired
HouseholdPvMapper householdPvMapper;
@Autowired
IHouseholdPvInstallService iHouseholdPvInstallService;
/**
* 分页查询
*/
public IPage<HouseholdPv> queryForHouseholdPvPage(Page<HouseholdPv> page, HouseholdPvDto dto) {
LambdaQueryWrapper<HouseholdPv> lambda = new QueryWrapper<HouseholdPv>().lambda();
if (!ObjectUtils.isEmpty(dto.getName())) {
lambda.like(HouseholdPv::getName, dto.getName());
}
if (!ObjectUtils.isEmpty(dto.getPlatformCompanyId())) {
lambda.eq(HouseholdPv::getPlatformCompanyId, dto.getPlatformCompanyId());
}
if (!ObjectUtils.isEmpty(dto.getAddress())) {
lambda.like(HouseholdPv::getAddress, dto.getAddress());
}
if (!ObjectUtils.isEmpty(dto.getNumber())) {
lambda.like(HouseholdPv::getNumber, dto.getNumber());
}
return householdPvMapper.selectPage(page, lambda);
}
/**
* 分页查询
*/
public IPage<HouseholdPv> queryForHouseholdPvPage(Page<HouseholdPv> page, HouseholdPvDto dto) {
LambdaQueryWrapper<HouseholdPv> lambda = new QueryWrapper<HouseholdPv>().lambda();
if (!ObjectUtils.isEmpty(dto.getName())){
lambda.like(HouseholdPv::getName, dto.getName());
}
if (!ObjectUtils.isEmpty(dto.getPlatformCompanyId())){
lambda.eq(HouseholdPv::getPlatformCompanyId, dto.getPlatformCompanyId());
}
if (!ObjectUtils.isEmpty(dto.getAddress())){
lambda.like(HouseholdPv::getAddress, dto.getAddress());
}
if (!ObjectUtils.isEmpty(dto.getNumber())){
lambda.like(HouseholdPv::getNumber, dto.getNumber());
}
return householdPvMapper.selectPage(page, lambda);
}
/**
* 列表查询 示例
*/
public List<HouseholdPvDto> queryForHouseholdPvList() {
return this.queryForList("", false);
}
/**
* 列表查询 示例
*/
public List<HouseholdPvDto> queryForHouseholdPvList() {
return this.queryForList("" , false);
}
@Override
public void importData(List<HouseholdPvImport> list) {
ArrayList<HouseholdPv> householdPvs = new ArrayList<>();
list.forEach(item -> {
HouseholdPv householdPv = new HouseholdPv();
householdPv.setCreateTime(LocalDateTime.now().toDate());
if (!ObjectUtils.isEmpty(item.getExpiryTime())) {
try {
Date date = DateUtils.dateParse(item.getExpiryTime(), DateUtils.DATE_PATTERN);
householdPv.setExpiryTime(date);
} catch (ParseException e) {
e.printStackTrace();
}
}
BeanUtils.copyProperties(item, householdPv);
householdPvs.add(householdPv);
});
this.saveBatch(householdPvs);
}
@Override
public void importData(List<HouseholdPvImport> list) {
ArrayList<HouseholdPv> householdPvs = new ArrayList<>();
list.forEach(item ->{
HouseholdPv householdPv = new HouseholdPv();
householdPv.setCreateTime(LocalDateTime.now().toDate());
if (!ObjectUtils.isEmpty(item.getExpiryTime())){
try {
Date date = DateUtils.dateParse(item.getExpiryTime(), DateUtils.DATE_PATTERN);
householdPv.setExpiryTime(date);
} catch (ParseException e) {
e.printStackTrace();
}
}
BeanUtils.copyProperties(item,householdPv);
householdPvs.add(householdPv);
});
this.saveBatch(householdPvs);
}
@Override
public List<HouseholdPvImport> selectExportList(HouseholdPvDto dto) {
return householdPvMapper.selectExportList(dto);
}
@Override
public List<HouseholdPvImport> selectExportList(HouseholdPvDto dto) {
return householdPvMapper.selectExportList(dto);
}
@Override
public void deleteBatch(List<Long> ids) {
householdPvMapper.deleteBatchIds(ids);
}
@Override
public void deleteBatch(List<Long> ids) {
householdPvMapper.deleteBatchIds(ids);
}
@Override
public HouseholdPvDto save(HouseholdPvDto householdPvDto) {
HouseholdPv householdPv = new HouseholdPv();
BeanUtils.copyProperties(householdPvDto, householdPv);
this.save(householdPv);
HouseholdPvContact householdPvContact = new HouseholdPvContact();
BeanUtils.copyProperties(householdPvDto.getContactInfo(), householdPvContact);
householdPvContact.setHouseholdPvId(householdPv.getSequenceNbr());
iHouseholdPvContactService.save(householdPvContact);
HouseholdPvLease householdPvLease = new HouseholdPvLease();
BeanUtils.copyProperties(householdPvDto.getLeaseInfo(), householdPvLease);
householdPvContact.setHouseholdPvId(householdPv.getSequenceNbr());
iHouseholdPvLeaseService.save(householdPvLease);
HouseholdPvInstall householdPvInstall = new HouseholdPvInstall();
BeanUtils.copyProperties(householdPvDto.getInstallInfo(), householdPvInstall);
householdPvInstall.setHouseholdPvId(householdPv.getSequenceNbr());
iHouseholdPvInstallService.save(householdPvInstall);
return householdPvDto;
}
}
\ No newline at end of file
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/resource/application-dev.properties
View file @ 80d5267c
## DB properties:
spring.datasource.url=jdbc:mysql://39.98.45.134:3306/production?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.datasource.url=jdbc:mysql://172.16.10.220:3306/production?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.datasource.username=root
spring.datasource.password=Yeejoin@2020
## eureka properties:
eureka.instance.hostname=39.98.45.134
eureka.client.serviceUrl.defaultZone=http://${eureka.instance.hostname}:10001/eureka/
eureka.instance.hostname=172.16.10.220
eureka.client.serviceUrl.defaultZone=http://admin:a1234560@${eureka.instance.hostname}:10001/eureka/
## redis properties:
spring.redis.database=1
spring.redis.host=39.98.45.134
spring.redis.host=172.16.10.220
spring.redis.port=6379
spring.redis.password=yeejoin@2020
......
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