修改能耗数据抓取

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);

lidee-core/src/main/java/com/lideeyunji/core/framework/mapper/GrNhMapper.java

@@ -21,10 +21,11 @@ public interface GrNhMapper extends BaseMapper<GrNhEntity> {
     }
 
 
+
     @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<GrNhEntity>().eq("add_time", grNhEntity.getAddTime()));
         return 0;
     }
 }

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<GrNhEntity> {
 
     void delete(List<Long> idList);
 
+    Integer deltetNH(GrNhEntity grNhEntity);
 
 }
 

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<GrNhMapper, GrNhEntity> impleme
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(List<Long> idList) {
-
         removeByIds(idList);
     }
 
+    @Override
+    @DSTransactional
+    public Integer deltetNH(GrNhEntity grNhEntity) {
+        GrNhEntity old =   baseMapper.selectOne(new Wrapper<GrNhEntity>() {
+            @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<GrNhEntity>() {
+            @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;
     }