From 01a3a22efc3aaa772ab3bf0ab512882e8989f997 Mon Sep 17 00:00:00 2001 From: chy Date: Mon, 16 Mar 2026 17:13:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=83=BD=E8=80=97=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=8A=93=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/config/job/anyToGrBiNh.java | 3 +- .../core/framework/mapper/GrNhMapper.java | 5 +- .../core/framework/service/IGrNhService.java | 3 ++ .../service/impl/GrNhServiceImpl.java | 52 ++++++++++++++++++- 4 files changed, 59 insertions(+), 4 deletions(-) diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/anyToGrBiNh.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/anyToGrBiNh.java index 571183a..7a48bf5 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/anyToGrBiNh.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/anyToGrBiNh.java @@ -121,11 +121,12 @@ public class anyToGrBiNh implements JobHandler { grNhEntity.setStcYearCurrent(data.getJSONObject("stcYearCompare").getFloat("currentValue"));//标准煤-昨年 grNhEntity.setStcYearBefore(data.getJSONObject("stcYearCompare").getFloat("beforeValue"));//标准煤-上年 + grNhService.deltetNH(grNhEntity); grNhService.saveNH(grNhEntity); } - + grNhService.deltetNH(grNhEntity); // grNhService.query().eq("add_time",1); diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/mapper/GrNhMapper.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/mapper/GrNhMapper.java index 88189b4..d0bf15e 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/mapper/GrNhMapper.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/mapper/GrNhMapper.java @@ -21,10 +21,11 @@ public interface GrNhMapper extends BaseMapper { } + @DS(value = "#dataSourceType") - default int delete(@Param("dataSourceType") String dataSourceType, GrNhEntity grNhEntity) { - + default int deltetNH(@Param("dataSourceType") String dataSourceType, GrNhEntity grNhEntity) { + //return this.delete(new Wrapper().eq("add_time", grNhEntity.getAddTime())); return 0; } } \ No newline at end of file diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/service/IGrNhService.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/service/IGrNhService.java index 2a5f5d4..c06446f 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/service/IGrNhService.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/service/IGrNhService.java @@ -1,7 +1,9 @@ package com.lideeyunji.core.framework.service; +import com.baomidou.dynamic.datasource.annotation.DSTransactional; import com.baomidou.mybatisplus.extension.service.IService; import com.lideeyunji.core.framework.entity.GrNhEntity; +import com.lideeyunji.tool.framework.common.constant.lideeYunJiBaseConstant; import java.util.List; @@ -17,6 +19,7 @@ public interface IGrNhService extends IService { void delete(List idList); + Integer deltetNH(GrNhEntity grNhEntity); } diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/GrNhServiceImpl.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/GrNhServiceImpl.java index 4391dc8..63f7149 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/GrNhServiceImpl.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/GrNhServiceImpl.java @@ -1,6 +1,8 @@ package com.lideeyunji.core.framework.service.impl; import com.baomidou.dynamic.datasource.annotation.DSTransactional; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.lideeyunji.core.framework.entity.GrNhEntity; import com.lideeyunji.core.framework.mapper.GrNhMapper; @@ -11,6 +13,7 @@ import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.Date; import java.util.List; /** @@ -26,16 +29,63 @@ public class GrNhServiceImpl extends ServiceImpl impleme @Override @Transactional(rollbackFor = Exception.class) public void delete(List idList) { - removeByIds(idList); } + @Override + @DSTransactional + public Integer deltetNH(GrNhEntity grNhEntity) { + GrNhEntity old = baseMapper.selectOne(new Wrapper() { + @Override + public GrNhEntity getEntity() { + return null; + } + + @Override + public MergeSegments getExpression() { + return null; + } + + @Override + public void clear() { + + } + + @Override + public String getSqlSegment() { + return ""; + } + }).setAddTime(new Date()); + int re = this.baseMapper.deltetNH(lideeYunJiBaseConstant.DS_ERP_BI_DATA, grNhEntity); + return re; + } //新增 @Override @DSTransactional public Integer saveNH(GrNhEntity grNhEntity) { + GrNhEntity old = baseMapper.selectOne(new Wrapper() { + @Override + public GrNhEntity getEntity() { + return null; + } + + @Override + public MergeSegments getExpression() { + return null; + } + + @Override + public void clear() { + + } + + @Override + public String getSqlSegment() { + return ""; + } + }).setAddTime(new Date()); int re = this.baseMapper.save(lideeYunJiBaseConstant.DS_ERP_BI_DATA, grNhEntity); return re; }