From f8fb4b06450f825d1f1696bbbd877c14e21fc714 Mon Sep 17 00:00:00 2001 From: qdintc Date: Mon, 1 Sep 2025 06:58:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=AF=8F=E6=97=A5=E8=B4=9F=E5=80=BA?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=8A=9F=E8=83=BD=E8=87=AA=E6=B5=8B=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../intc/api/invest/RemoteInvestService.java | 2 +- .../factory/RemoteInvestFallbackFactory.java | 2 +- .../DailyLiabilitiesController.java | 38 +++++++++---------- .../intc/invest/domain/DailyLiabilities.java | 4 +- .../com/intc/job/controller/InvestJob.java | 4 +- .../intc/job/service/IInvestJobService.java | 2 +- .../intc/job/service/impl/InvestJobImpl.java | 2 +- .../java/com/intc/job/task/InvestJobTask.java | 6 +-- 8 files changed, 30 insertions(+), 30 deletions(-) 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 f3ca8f3..6c54db6 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 @@ -94,7 +94,7 @@ public interface RemoteInvestService public R synFuturesDailyHistory(); /** - * 生成每日负债统计数据 + * 生成每日净资产统计数据 * * @return 结果 */ 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 8f06949..14312ab 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 @@ -76,7 +76,7 @@ public class RemoteInvestFallbackFactory implements FallbackFactory list = dailyLiabilitiesService.selectDailyLiabilitiesList(dailyLiabilitiesDto); ExcelUtil util = new ExcelUtil(DailyLiabilitiesVo.class); - util.exportExcel(response, list, "每日负债统计数据"); + util.exportExcel(response, list, "每日净资产统计数据"); } /** - * 获取每日负债统计详细信息 + * 获取每日净资产统计详细信息 */ - @ApiOperation(value="获取每日负债统计详细信息") + @ApiOperation(value="获取每日净资产统计详细信息") @RequiresPermissions("invest:dailyLiabilities:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) @@ -79,11 +79,11 @@ public class DailyLiabilitiesController extends BaseController } /** - * 新增每日负债统计 + * 新增每日净资产统计 */ - @ApiOperation(value="新增每日负债统计") + @ApiOperation(value="新增每日净资产统计") @RequiresPermissions("invest:dailyLiabilities:add") - @Log(title = "每日负债统计", businessType = BusinessType.INSERT) + @Log(title = "每日净资产统计", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody DailyLiabilities dailyLiabilities) { @@ -91,11 +91,11 @@ public class DailyLiabilitiesController extends BaseController } /** - * 修改每日负债统计 + * 修改每日净资产统计 */ - @ApiOperation(value="修改每日负债统计") + @ApiOperation(value="修改每日净资产统计") @RequiresPermissions("invest:dailyLiabilities:edit") - @Log(title = "每日负债统计", businessType = BusinessType.UPDATE) + @Log(title = "每日净资产统计", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody DailyLiabilities dailyLiabilities) { @@ -103,11 +103,11 @@ public class DailyLiabilitiesController extends BaseController } /** - * 删除每日负债统计 + * 删除每日净资产统计 */ - @ApiOperation(value="删除每日负债统计") + @ApiOperation(value="删除每日净资产统计") @RequiresPermissions("invest:dailyLiabilities:remove") - @Log(title = "每日负债统计", businessType = BusinessType.DELETE) + @Log(title = "每日净资产统计", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] 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 index 1358602..61543aa 100644 --- 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 @@ -60,8 +60,8 @@ public class DailyLiabilities extends BaseEntity /** 记录时间 */ @ApiModelProperty(value="记录时间") - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date recordDate; @Override 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 9353133..8e94146 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 @@ -153,9 +153,9 @@ public class InvestJob @PostMapping("/generateDailyLiabilities") public AjaxResult generateDailyLiabilities() { - System.out.println("================================开始生成每日负债统计数据("+ DateUtils.getTime() +")================================="); + System.out.println("================================开始生成每日净资产统计数据("+ DateUtils.getTime() +")================================="); investJobService.generateDailyLiabilities(); - System.out.println("================================结束生成每日负债统计数据("+ DateUtils.getTime() +")================================="); + 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 b4fe079..14af144 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 @@ -35,7 +35,7 @@ public interface IInvestJobService /** - * 生成每日负债统计数据 + * 生成每日净资产 * * @author tianyongbao * @date 2025-08-31 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 46f095e..4347d0a 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 @@ -436,7 +436,7 @@ public class InvestJobImpl implements IInvestJobService List list=dailyLiabilitiesMapper.selectDailyLiabilities(); //修改子类别 - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy年MM月dd日负债统计"); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy年MM月dd日净资产统计"); for (DailyLiabilitiesVo vo : list) { DailyLiabilities dailyLiabilities=new DailyLiabilities(); dailyLiabilities.setCreditBalance(vo.getCreditBalance()); diff --git a/intc-modules/intc-job/src/main/java/com/intc/job/task/InvestJobTask.java b/intc-modules/intc-job/src/main/java/com/intc/job/task/InvestJobTask.java index 0c8a6ea..c61034f 100644 --- a/intc-modules/intc-job/src/main/java/com/intc/job/task/InvestJobTask.java +++ b/intc-modules/intc-job/src/main/java/com/intc/job/task/InvestJobTask.java @@ -89,10 +89,10 @@ public class InvestJobTask } - /**生成每日负债统计数据*/ + /**生成每日净资产统计数据*/ public void generateDailyLiabilities(){ - System.out.println("================================开始生成每日负债统计数据("+ DateUtils.getTime() +")================================="); + System.out.println("================================开始生成每日净资产统计数据("+ DateUtils.getTime() +")================================="); remoteInvestService.generateDailyLiabilities(); - System.out.println("================================结束生成每日负债统计数据("+ DateUtils.getTime() +")================================="); + System.out.println("================================结束生成每日净资产统计数据("+ DateUtils.getTime() +")================================="); } }