diff --git a/intc-api/intc-api-invest/src/main/java/com/intc/api/invest/RemoteInvestService.java b/intc-api/intc-api-invest/src/main/java/com/intc/api/invest/RemoteInvestService.java index 0ddf4b9..f3ca8f3 100644 --- a/intc-api/intc-api-invest/src/main/java/com/intc/api/invest/RemoteInvestService.java +++ b/intc-api/intc-api-invest/src/main/java/com/intc/api/invest/RemoteInvestService.java @@ -93,5 +93,13 @@ public interface RemoteInvestService @RequestMapping(value = "/job/synFuturesDailyHistory",method = RequestMethod.POST) public R synFuturesDailyHistory(); + /** + * 生成每日负债统计数据 + * + * @return 结果 + */ + @RequestMapping(value = "/job/generateDailyLiabilities",method = RequestMethod.POST) + public R generateDailyLiabilities(); + } diff --git a/intc-api/intc-api-invest/src/main/java/com/intc/api/invest/factory/RemoteInvestFallbackFactory.java b/intc-api/intc-api-invest/src/main/java/com/intc/api/invest/factory/RemoteInvestFallbackFactory.java index 673763a..8f06949 100644 --- a/intc-api/intc-api-invest/src/main/java/com/intc/api/invest/factory/RemoteInvestFallbackFactory.java +++ b/intc-api/intc-api-invest/src/main/java/com/intc/api/invest/factory/RemoteInvestFallbackFactory.java @@ -74,6 +74,10 @@ public class RemoteInvestFallbackFactory implements FallbackFactory list = dailyLiabilitiesService.selectDailyLiabilitiesList(dailyLiabilitiesDto); + return getDataTable(list); + } + + /** + * 导出每日负债统计列表 + */ + @ApiOperation(value="导出每日负债统计列表") + @RequiresPermissions("invest:dailyLiabilities:export") + @Log(title = "每日负债统计", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, DailyLiabilitiesDto dailyLiabilitiesDto) + { + List list = dailyLiabilitiesService.selectDailyLiabilitiesList(dailyLiabilitiesDto); + ExcelUtil util = new ExcelUtil(DailyLiabilitiesVo.class); + util.exportExcel(response, list, "每日负债统计数据"); + } + + /** + * 获取每日负债统计详细信息 + */ + @ApiOperation(value="获取每日负债统计详细信息") + @RequiresPermissions("invest:dailyLiabilities:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(dailyLiabilitiesService.selectDailyLiabilitiesById(id)); + } + + /** + * 新增每日负债统计 + */ + @ApiOperation(value="新增每日负债统计") + @RequiresPermissions("invest:dailyLiabilities:add") + @Log(title = "每日负债统计", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody DailyLiabilities dailyLiabilities) + { + return toAjax(dailyLiabilitiesService.insertDailyLiabilities(dailyLiabilities)); + } + + /** + * 修改每日负债统计 + */ + @ApiOperation(value="修改每日负债统计") + @RequiresPermissions("invest:dailyLiabilities:edit") + @Log(title = "每日负债统计", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody DailyLiabilities dailyLiabilities) + { + return toAjax(dailyLiabilitiesService.updateDailyLiabilities(dailyLiabilities)); + } + + /** + * 删除每日负债统计 + */ + @ApiOperation(value="删除每日负债统计") + @RequiresPermissions("invest:dailyLiabilities:remove") + @Log(title = "每日负债统计", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(dailyLiabilitiesService.deleteDailyLiabilitiesByIds(ids)); + } +} diff --git a/intc-modules/intc-invest/src/main/java/com/intc/invest/domain/DailyLiabilities.java b/intc-modules/intc-invest/src/main/java/com/intc/invest/domain/DailyLiabilities.java new file mode 100644 index 0000000..1358602 --- /dev/null +++ b/intc-modules/intc-invest/src/main/java/com/intc/invest/domain/DailyLiabilities.java @@ -0,0 +1,86 @@ +package com.intc.invest.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.web.domain.BaseEntity; +import lombok.Data; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import javax.validation.constraints.*; +/** + * 每日负债统计对象 daily_liabilities + * + * @author tianyongbao + * @date 2025-08-31 + */ +@ApiModel("每日负债统计对象") +@Data +public class DailyLiabilities extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + + /** 名称 */ + @ApiModelProperty(value="名称") + @Excel(name = "名称") + private String name; + + /** 总负债 */ + @ApiModelProperty(value="总负债") + @Excel(name = "总负债") + private Double totalBalance; + + /** 信用卡余额 */ + @ApiModelProperty(value="信用卡余额") + @Excel(name = "信用卡余额") + private Double creditBalance; + + /** 投资账户余额 */ + @ApiModelProperty(value="投资账户余额") + @Excel(name = "投资账户余额") + private Double investBalance; + + /** 储蓄账户余额 */ + @ApiModelProperty(value="储蓄账户余额") + @Excel(name = "储蓄账户余额") + private Double debitBalance; + + /** 借贷账户余额 */ + @ApiModelProperty(value="借贷账户余额") + @Excel(name = "借贷账户余额") + private Double lendingBalance; + + /** 删除标志(0代表存在 1代表删除) */ + private String delFlag; + + /** 记录时间 */ + @ApiModelProperty(value="记录时间") + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date recordDate; + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("name", getName()) + .append("totalBalance", getTotalBalance()) + .append("creditBalance", getCreditBalance()) + .append("investBalance", getInvestBalance()) + .append("debitBalance", getDebitBalance()) + .append("lendingBalance", getLendingBalance()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("delFlag", getDelFlag()) + .append("remark", getRemark()) + .append("recordDate", getRecordDate()) + .toString(); + } +} diff --git a/intc-modules/intc-invest/src/main/java/com/intc/invest/domain/dto/DailyLiabilitiesDto.java b/intc-modules/intc-invest/src/main/java/com/intc/invest/domain/dto/DailyLiabilitiesDto.java new file mode 100644 index 0000000..ca3de4a --- /dev/null +++ b/intc-modules/intc-invest/src/main/java/com/intc/invest/domain/dto/DailyLiabilitiesDto.java @@ -0,0 +1,39 @@ +package com.intc.invest.domain.dto; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.intc.common.core.web.domain.BaseEntity; +import lombok.Data; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +/** + * 每日负债统计Dto对象 daily_liabilities + * + * @author tianyongbao + * @date 2025-08-31 + */ +@ApiModel("每日负债统计Dto对象") +@Data +public class DailyLiabilitiesDto extends BaseEntity implements Serializable +{ + private static final long serialVersionUID = 1L; + + /** 名称 */ + @ApiModelProperty(value="名称") + private String name; + + /** 记录时间 */ + @ApiModelProperty(value="记录时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date recordDate; + + /** 开始日期 */ + @ApiModelProperty(value="开始日期") + private String startTime; + + /** 结束日期 */ + @ApiModelProperty(value="结束日期") + private String endTime; + +} diff --git a/intc-modules/intc-invest/src/main/java/com/intc/invest/domain/vo/DailyLiabilitiesVo.java b/intc-modules/intc-invest/src/main/java/com/intc/invest/domain/vo/DailyLiabilitiesVo.java new file mode 100644 index 0000000..f91469f --- /dev/null +++ b/intc-modules/intc-invest/src/main/java/com/intc/invest/domain/vo/DailyLiabilitiesVo.java @@ -0,0 +1,18 @@ +package com.intc.invest.domain.vo; + +import com.intc.common.core.annotation.Excel; +import com.intc.invest.domain.DailyLiabilities; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import io.swagger.annotations.ApiModel; +/** + * 每日负债统计Vo对象 daily_liabilities + * + * @author tianyongbao + * @date 2025-08-31 + */ +@ApiModel("每日负债统计Vo对象") +@Data +public class DailyLiabilitiesVo extends DailyLiabilities +{ +} diff --git a/intc-modules/intc-invest/src/main/java/com/intc/invest/mapper/DailyLiabilitiesMapper.java b/intc-modules/intc-invest/src/main/java/com/intc/invest/mapper/DailyLiabilitiesMapper.java new file mode 100644 index 0000000..64a6aa4 --- /dev/null +++ b/intc-modules/intc-invest/src/main/java/com/intc/invest/mapper/DailyLiabilitiesMapper.java @@ -0,0 +1,91 @@ +package com.intc.invest.mapper; + +import java.util.List; + +import com.intc.common.datascope.annotation.DataScope; +import com.intc.invest.domain.DailyLiabilities; +import com.intc.invest.domain.dto.DailyLiabilitiesDto; +import com.intc.invest.domain.vo.DailyLiabilitiesVo; + +/** + * 每日负债统计Mapper接口 + * + * @author tianyongbao + * @date 2025-08-31 + */ +public interface DailyLiabilitiesMapper +{ + /** + * 查询每日负债统计 + * + * @param id 每日负债统计主键 + * @return 每日负债统计 + */ + public DailyLiabilitiesVo selectDailyLiabilitiesById(Long id); + + /** + * 查询每日负债统计列表 + * + * @param dailyLiabilitiesDto 每日负债统计 + * @return 每日负债统计集合 + */ + @DataScope(businessAlias = "a") + public List selectDailyLiabilitiesList(DailyLiabilitiesDto dailyLiabilitiesDto); + + /** + * 新增每日负债统计 + * + * @param dailyLiabilities 每日负债统计 + * @return 结果 + */ + public int insertDailyLiabilities(DailyLiabilities dailyLiabilities); + + /** + * 修改每日负债统计 + * + * @param dailyLiabilities 每日负债统计 + * @return 结果 + */ + public int updateDailyLiabilities(DailyLiabilities dailyLiabilities); + + /** + * 删除每日负债统计 + * + * @param id 每日负债统计主键 + * @return 结果 + */ + public int deleteDailyLiabilitiesById(Long id); + + /** + * 批量删除每日负债统计 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteDailyLiabilitiesByIds(Long[] ids); + + /** + * 逻辑删除每日负债统计 + * + * @param id 每日负债统计主键 + * @return 结果 + */ + public int removeDailyLiabilitiesById(Long id); + + /** + * 批量逻辑删除每日负债统计 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int removeDailyLiabilitiesByIds(Long[] ids); + + + /** + * 查询每日负债 + * + * @return 每日负债统计 + */ + public List selectDailyLiabilities(); + +} diff --git a/intc-modules/intc-invest/src/main/java/com/intc/invest/service/IDailyLiabilitiesService.java b/intc-modules/intc-invest/src/main/java/com/intc/invest/service/IDailyLiabilitiesService.java new file mode 100644 index 0000000..67b0182 --- /dev/null +++ b/intc-modules/intc-invest/src/main/java/com/intc/invest/service/IDailyLiabilitiesService.java @@ -0,0 +1,63 @@ +package com.intc.invest.service; + +import java.util.List; +import com.intc.invest.domain.DailyLiabilities; +import com.intc.invest.domain.dto.DailyLiabilitiesDto; +import com.intc.invest.domain.vo.DailyLiabilitiesVo; + +/** + * 每日负债统计Service接口 + * + * @author tianyongbao + * @date 2025-08-31 + */ +public interface IDailyLiabilitiesService +{ + /** + * 查询每日负债统计 + * + * @param id 每日负债统计主键 + * @return 每日负债统计 + */ + public DailyLiabilitiesVo selectDailyLiabilitiesById(Long id); + + /** + * 查询每日负债统计列表 + * + * @param dailyLiabilitiesDto 每日负债统计 + * @return 每日负债统计集合 + */ + public List selectDailyLiabilitiesList(DailyLiabilitiesDto dailyLiabilitiesDto); + + /** + * 新增每日负债统计 + * + * @param dailyLiabilities 每日负债统计 + * @return 结果 + */ + public int insertDailyLiabilities(DailyLiabilities dailyLiabilities); + + /** + * 修改每日负债统计 + * + * @param dailyLiabilities 每日负债统计 + * @return 结果 + */ + public int updateDailyLiabilities(DailyLiabilities dailyLiabilities); + + /** + * 批量删除每日负债统计 + * + * @param ids 需要删除的每日负债统计主键集合 + * @return 结果 + */ + public int deleteDailyLiabilitiesByIds(Long[] ids); + + /** + * 删除每日负债统计信息 + * + * @param id 每日负债统计主键 + * @return 结果 + */ + public int deleteDailyLiabilitiesById(Long id); +} diff --git a/intc-modules/intc-invest/src/main/java/com/intc/invest/service/impl/DailyLiabilitiesServiceImpl.java b/intc-modules/intc-invest/src/main/java/com/intc/invest/service/impl/DailyLiabilitiesServiceImpl.java new file mode 100644 index 0000000..1b3377a --- /dev/null +++ b/intc-modules/intc-invest/src/main/java/com/intc/invest/service/impl/DailyLiabilitiesServiceImpl.java @@ -0,0 +1,103 @@ +package com.intc.invest.service.impl; + +import java.util.List; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.IdWorker; +import com.intc.common.security.utils.SecurityUtils; +import javax.annotation.Resource; +import org.springframework.stereotype.Service; +import com.intc.invest.mapper.DailyLiabilitiesMapper; +import com.intc.invest.domain.DailyLiabilities; +import com.intc.invest.domain.dto.DailyLiabilitiesDto; +import com.intc.invest.domain.vo.DailyLiabilitiesVo; +import com.intc.invest.service.IDailyLiabilitiesService; + +/** + * 每日负债统计Service业务层处理 + * + * @author tianyongbao + * @date 2025-08-31 + */ +@Service +public class DailyLiabilitiesServiceImpl implements IDailyLiabilitiesService +{ + @Resource + private DailyLiabilitiesMapper dailyLiabilitiesMapper; + + /** + * 查询每日负债统计 + * + * @param id 每日负债统计主键 + * @return 每日负债统计 + */ + @Override + public DailyLiabilitiesVo selectDailyLiabilitiesById(Long id) + { + return dailyLiabilitiesMapper.selectDailyLiabilitiesById(id); + } + + /** + * 查询每日负债统计列表 + * + * @param dailyLiabilitiesDto 每日负债统计 + * @return 每日负债统计 + */ + @Override + public List selectDailyLiabilitiesList(DailyLiabilitiesDto dailyLiabilitiesDto) + { + return dailyLiabilitiesMapper.selectDailyLiabilitiesList(dailyLiabilitiesDto); + } + + /** + * 新增每日负债统计 + * + * @param dailyLiabilities 每日负债统计 + * @return 结果 + */ + @Override + public int insertDailyLiabilities(DailyLiabilities dailyLiabilities) + { + dailyLiabilities.setCreateBy(SecurityUtils.getUsername()); + dailyLiabilities.setCreateTime(DateUtils.getNowDate()); + dailyLiabilities.setId(IdWorker.getId()); + return dailyLiabilitiesMapper.insertDailyLiabilities(dailyLiabilities); + } + + /** + * 修改每日负债统计 + * + * @param dailyLiabilities 每日负债统计 + * @return 结果 + */ + @Override + public int updateDailyLiabilities(DailyLiabilities dailyLiabilities) + { + dailyLiabilities.setUpdateBy(SecurityUtils.getUsername()); + dailyLiabilities.setUpdateTime(DateUtils.getNowDate()); + return dailyLiabilitiesMapper.updateDailyLiabilities(dailyLiabilities); + } + + /** + * 批量删除每日负债统计 + * + * @param ids 需要删除的每日负债统计主键 + * @return 结果 + */ + @Override + public int deleteDailyLiabilitiesByIds(Long[] ids) + { + return dailyLiabilitiesMapper.removeDailyLiabilitiesByIds(ids); + } + + /** + * 删除每日负债统计信息 + * + * @param id 每日负债统计主键 + * @return 结果 + */ + @Override + public int deleteDailyLiabilitiesById(Long id) + { + return dailyLiabilitiesMapper.removeDailyLiabilitiesById(id); + } +} diff --git a/intc-modules/intc-invest/src/main/java/com/intc/job/controller/InvestJob.java b/intc-modules/intc-invest/src/main/java/com/intc/job/controller/InvestJob.java index a0205e8..9353133 100644 --- a/intc-modules/intc-invest/src/main/java/com/intc/job/controller/InvestJob.java +++ b/intc-modules/intc-invest/src/main/java/com/intc/job/controller/InvestJob.java @@ -150,7 +150,14 @@ public class InvestJob return AjaxResult.success(); } - + @PostMapping("/generateDailyLiabilities") + public AjaxResult generateDailyLiabilities() + { + System.out.println("================================开始生成每日负债统计数据("+ DateUtils.getTime() +")================================="); + investJobService.generateDailyLiabilities(); + System.out.println("================================结束生成每日负债统计数据("+ DateUtils.getTime() +")================================="); + return AjaxResult.success(); + } } diff --git a/intc-modules/intc-invest/src/main/java/com/intc/job/service/IInvestJobService.java b/intc-modules/intc-invest/src/main/java/com/intc/job/service/IInvestJobService.java index cb99a28..b4fe079 100644 --- a/intc-modules/intc-invest/src/main/java/com/intc/job/service/IInvestJobService.java +++ b/intc-modules/intc-invest/src/main/java/com/intc/job/service/IInvestJobService.java @@ -34,5 +34,12 @@ public interface IInvestJobService public void generateFutureStocksBill(); + /** + * 生成每日负债统计数据 + * + * @author tianyongbao + * @date 2025-08-31 + */ + public void generateDailyLiabilities(); } diff --git a/intc-modules/intc-invest/src/main/java/com/intc/job/service/impl/InvestJobImpl.java b/intc-modules/intc-invest/src/main/java/com/intc/job/service/impl/InvestJobImpl.java index 2a636e2..46f095e 100644 --- a/intc-modules/intc-invest/src/main/java/com/intc/job/service/impl/InvestJobImpl.java +++ b/intc-modules/intc-invest/src/main/java/com/intc/job/service/impl/InvestJobImpl.java @@ -53,6 +53,8 @@ public class InvestJobImpl implements IInvestJobService @Resource private StocksDailyHistoryMapper stocksDailyHistoryMapper; + @Resource + private DailyLiabilitiesMapper dailyLiabilitiesMapper; /** * 生成数据 @@ -423,4 +425,32 @@ public class InvestJobImpl implements IInvestJobService } } + /** + * 生成每日负债统计数据 + * + * @author tianyongbao + * @date 2025-08-31 + */ + @Override + public void generateDailyLiabilities() { + + List list=dailyLiabilitiesMapper.selectDailyLiabilities(); + //修改子类别 + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy年MM月dd日负债统计"); + for (DailyLiabilitiesVo vo : list) { + DailyLiabilities dailyLiabilities=new DailyLiabilities(); + dailyLiabilities.setCreditBalance(vo.getCreditBalance()); + dailyLiabilities.setDebitBalance(vo.getDebitBalance()); + dailyLiabilities.setInvestBalance(vo.getInvestBalance()); + dailyLiabilities.setLendingBalance(vo.getLendingBalance()); + dailyLiabilities.setName(simpleDateFormat.format(new Date())); + dailyLiabilities.setTotalBalance(vo.getInvestBalance()+vo.getDebitBalance()+vo.getCreditBalance()+vo.getLendingBalance()); + dailyLiabilities.setCreateBy(vo.getCreateBy()); + dailyLiabilities.setCreateTime(DateUtils.getNowDate()); + dailyLiabilities.setRecordDate(DateUtils.getNowDate()); + dailyLiabilities.setId(IdWorker.getId()); + dailyLiabilitiesMapper.insertDailyLiabilities(dailyLiabilities); + } + + } } diff --git a/intc-modules/intc-invest/src/main/resources/mapper/invest/DailyLiabilitiesMapper.xml b/intc-modules/intc-invest/src/main/resources/mapper/invest/DailyLiabilitiesMapper.xml new file mode 100644 index 0000000..d68b2b4 --- /dev/null +++ b/intc-modules/intc-invest/src/main/resources/mapper/invest/DailyLiabilitiesMapper.xml @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + + + select a.id, a.name, a.total_balance, a.credit_balance, a.invest_balance, a.debit_balance, a.lending_balance, a.create_by, a.create_time, a.update_by, a.update_time, a.del_flag, a.remark, a.record_date from daily_liabilities a + + + + + + + + insert into daily_liabilities + + id, + name, + total_balance, + credit_balance, + invest_balance, + debit_balance, + lending_balance, + create_by, + create_time, + update_by, + update_time, + del_flag, + remark, + record_date, + + + #{id}, + #{name}, + #{totalBalance}, + #{creditBalance}, + #{investBalance}, + #{debitBalance}, + #{lendingBalance}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{delFlag}, + #{remark}, + #{recordDate}, + + + + + update daily_liabilities + + name = #{name}, + total_balance = #{totalBalance}, + credit_balance = #{creditBalance}, + invest_balance = #{investBalance}, + debit_balance = #{debitBalance}, + lending_balance = #{lendingBalance}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + del_flag = #{delFlag}, + remark = #{remark}, + record_date = #{recordDate}, + + where id = #{id} + + + + delete from daily_liabilities where id = #{id} + + + + delete from daily_liabilities where id in + + #{id} + + + + update daily_liabilities set del_flag='1' where id = #{id} + + + + update daily_liabilities set del_flag='1' where id in + + #{id} + + + +