信控数据库调整表结构

realtime/generationXK-service/src/main/java/com/gyee/generation/controller/ProEconMeterPointValueController.java

@@ -0,0 +1,20 @@
+package com.gyee.generation.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 电计量点值表 前端控制器
+ * </p>
+ *
+ * @author 石林
+ * @since 2022-10-14
+ */
+@RestController
+@RequestMapping("//pro-econ-meter-point-value")
+public class ProEconMeterPointValueController {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/MeterpointvalueMapper.java

@@ -1,16 +0,0 @@
-package com.gyee.generation.mapper.auto;
-
-import com.gyee.generation.model.auto.Meterpointvalue;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author 谢生杰
- * @since 2022-03-21
- */
-public interface MeterpointvalueMapper extends BaseMapper<Meterpointvalue> {
-
-}

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconMeterPointValueMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.model.auto.ProEconMeterPointValue;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 电计量点值表 Mapper 接口
+ * </p>
+ *
+ * @author 石林
+ * @since 2022-10-14
+ */
+public interface ProEconMeterPointValueMapper extends BaseMapper<ProEconMeterPointValue> {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/Meterpointvalue.java

@@ -1,74 +0,0 @@
-package com.gyee.generation.model.auto;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 谢生杰
- * @since 2022-03-21
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("METERPOINTVALUE")
-public class Meterpointvalue extends Model {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    @TableField("RECORDDATE")
-    private Date recorddate;
-
-    @TableField("METERID")
-    private String meterid;
-
-    @TableField("YEAR")
-    private Double year;
-
-    @TableField("MONTH")
-    private Double month;
-
-    @TableField("DAY")
-    private Double day;
-
-    @TableField("NOW")
-    private Double now;
-
-    @TableField("TOTALVALUE")
-    private Double totalvalue;
-
-    @TableField("YEARVALUE")
-    private Double yearvalue;
-
-    @TableField("MONTHVALUE")
-    private Double monthvalue;
-
-    @TableField("DAYVALUE")
-    private Double dayvalue;
-
-    @TableField("YEAR4")
-    private Double year4;
-
-    @TableField("MONTH4")
-    private Double month4;
-
-    @TableField("DAY4")
-    private Double day4;
-
-    @TableField("NOW4")
-    private Double now4;
-
-
-}

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProEconMeterPointValue.java

@@ -0,0 +1,99 @@
+package com.gyee.generation.model.auto;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 电计量点值表
+ * </p>
+ *
+ * @author 石林
+ * @since 2022-10-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconMeterPointValue extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private Integer id;
+
+    /**
+     * 时间
+     */
+    private Date recordDate;
+
+    /**
+     * 电计量编号
+     */
+    private String meterId;
+
+    /**
+     * 年初底码
+     */
+    private Double year;
+
+    /**
+     * 月初底码
+     */
+    private Double month;
+
+    /**
+     * 昨日底码
+     */
+    private Double day;
+
+    /**
+     * 当日底码
+     */
+    private Double now;
+
+    /**
+     * 总值
+     */
+    private Double totalValue;
+
+    /**
+     * 年值
+     */
+    private Double yearValue;
+
+    /**
+     * 月值
+     */
+    private Double monthValue;
+
+    /**
+     * 日值
+     */
+    private Double dayValue;
+
+    /**
+     * 年初底码2
+     */
+    private Double year4;
+
+    /**
+     * 月初底码2
+     */
+    private Double month4;
+
+    /**
+     * 昨日底码2
+     */
+    private Double day4;
+
+    /**
+     * 当日底码2
+     */
+    private Double now4;
+
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/service/GenerationService.java

@@ -8,7 +8,7 @@ import com.gyee.common.util.DateUtils;
 import com.gyee.common.util.DoubleUtils;
 import com.gyee.generation.init.CacheContext;
 import com.gyee.generation.model.auto.*;
-import com.gyee.generation.service.auto.IMeterpointvalueService;
+import com.gyee.generation.service.auto.IProEconMeterPointValueService;
 import com.gyee.generation.util.realtimesource.IEdosUtil;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -31,7 +31,7 @@ public class GenerationService {
     @Resource
     private IEdosUtil edosUtil;
     @Resource
-    private IMeterpointvalueService meterpointvalueService;
+    private IProEconMeterPointValueService proEconMeterPointValueService;
 
 
     /**
@@ -168,18 +168,18 @@ public class GenerationService {
             Date monthFirstZero = DateUtils.getMonthFirstZero(day);
             Date yearFirstZero = DateUtils.getYearFirstZero(day);
             Date date = DateUtils.addDays(samedayZero, 1);
-            List<Meterpointvalue> resultList = new ArrayList<>();
-            QueryWrapper<Meterpointvalue> qw = new QueryWrapper();
+            List<ProEconMeterPointValue> resultList = new ArrayList<>();
+            QueryWrapper<ProEconMeterPointValue> qw = new QueryWrapper();
             qw.eq("recorddate",date);
-            meterpointvalueService.remove(qw);
+            proEconMeterPointValueService.remove(qw);
             meterpoints.stream().forEach(meterpoint -> {
                 String meterid = meterpoint.getId();
                 Double magnification = meterpoint.getMagnification();
                 Double xs = meterpoint.getXs();
-                Meterpointvalue meterpointvalue = new Meterpointvalue();
+                ProEconMeterPointValue meterpointvalue = new ProEconMeterPointValue();
 
-                meterpointvalue.setRecorddate(date);
-                meterpointvalue.setMeterid(meterpoint.getId());
+                meterpointvalue.setRecordDate(date);
+                meterpointvalue.setMeterId(meterpoint.getId());
                 Double real = 0.0;
                 Double sameday = 0.0;
                 Double month = 0.0;
@@ -204,12 +204,12 @@ public class GenerationService {
                 Double yearvalue = (real/xs - year/xs) * magnification;
                 Double monthvalue = (real/xs - month/xs) * magnification;
                 Double dayvalue = (real/xs - sameday/xs) * magnification;
-                meterpointvalue.setYearvalue(yearvalue);
-                meterpointvalue.setMonthvalue(monthvalue);
-                meterpointvalue.setDayvalue(dayvalue);
+                meterpointvalue.setYearValue(yearvalue);
+                meterpointvalue.setMonthValue(monthvalue);
+                meterpointvalue.setDayValue(dayvalue);
                 resultList.add(meterpointvalue);
             });
-            meterpointvalueService.saveBatch(resultList);
+            proEconMeterPointValueService.saveBatch(resultList);
         });
 
 
@@ -217,25 +217,25 @@ public class GenerationService {
     }
 
     public void updateMeterpointValueHistory(String beginDate,String endDate){
-        List<Meterpointvalue> resultLsit = new ArrayList<>();
+        List<ProEconMeterPointValue> resultLsit = new ArrayList<>();
         Map<String,ProBasicMeterPoint> meterpointMap = CacheContext.meterpointMap;
         List<String> days = DateUtils.getDays(beginDate, endDate);
         days.stream().forEach(day->{
             Date date = DateUtils.parseDate(beginDate);
             Date date1 = DateUtils.addDays(date, 1);
             Date date2= DateUtils.addDays(date1, 1);
-            QueryWrapper<Meterpointvalue> qw = new QueryWrapper<>();
+            QueryWrapper<ProEconMeterPointValue> qw = new QueryWrapper<>();
             qw.eq("recorddate",date1);
-            List<Meterpointvalue> meterpointvalues = meterpointvalueService.list(qw);
+            List<ProEconMeterPointValue> meterpointvalues = proEconMeterPointValueService.list(qw);
 
             meterpointvalues.stream().forEach(meterpointvalue -> {
-                ProBasicMeterPoint meterpoint = meterpointMap.get(meterpointvalue.getMeterid());
+                ProBasicMeterPoint meterpoint = meterpointMap.get(meterpointvalue.getMeterId());
                 Double magnification = meterpoint.getMagnification();
                 Double xs = meterpoint.getXs();
                 Double real = 0.0;
 
                 try {
-                    real = edosUtil.getSectionData(meterpointvalue.getMeterid(),date1.getTime()).getPointValueInDouble();
+                    real = edosUtil.getSectionData(meterpointvalue.getMeterId(),date1.getTime()).getPointValueInDouble();
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -244,12 +244,12 @@ public class GenerationService {
                 Double dayvalue = (real/xs - meterpointvalue.getDay4()) * magnification;
                 meterpointvalue.setNow(DoubleUtils.keepPrecision(real,2));
                 meterpointvalue.setNow4(DoubleUtils.keepPrecision(real,4));
-                meterpointvalue.setYearvalue(yearvalue);
-                meterpointvalue.setMonthvalue(monthvalue);
-                meterpointvalue.setDayvalue(dayvalue);
+                meterpointvalue.setYearValue(yearvalue);
+                meterpointvalue.setMonthValue(monthvalue);
+                meterpointvalue.setDayValue(dayvalue);
                 resultLsit.add(meterpointvalue);
             });
-            meterpointvalueService.saveOrUpdateBatch(resultLsit);
+            proEconMeterPointValueService.saveOrUpdateBatch(resultLsit);
         });
     }
 

realtime/generationXK-service/src/main/java/com/gyee/generation/service/auto/IMeterpointvalueService.java

@@ -1,16 +0,0 @@
-package com.gyee.generation.service.auto;
-
-import com.gyee.generation.model.auto.Meterpointvalue;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author 谢生杰
- * @since 2022-03-21
- */
-public interface IMeterpointvalueService extends IService<Meterpointvalue> {
-
-}

realtime/generationXK-service/src/main/java/com/gyee/generation/service/auto/IProEconMeterPointValueService.java

@@ -0,0 +1,16 @@
+package com.gyee.generation.service.auto;
+
+import com.gyee.generation.model.auto.ProEconMeterPointValue;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 电计量点值表 服务类
+ * </p>
+ *
+ * @author 石林
+ * @since 2022-10-14
+ */
+public interface IProEconMeterPointValueService extends IService<ProEconMeterPointValue> {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/service/auto/impl/MeterpointvalueServiceImpl.java

@@ -1,20 +0,0 @@
-package com.gyee.generation.service.auto.impl;
-
-import com.gyee.generation.model.auto.Meterpointvalue;
-import com.gyee.generation.mapper.auto.MeterpointvalueMapper;
-import com.gyee.generation.service.auto.IMeterpointvalueService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author 谢生杰
- * @since 2022-03-21
- */
-@Service
-public class MeterpointvalueServiceImpl extends ServiceImpl<MeterpointvalueMapper, Meterpointvalue> implements IMeterpointvalueService {
-
-}

realtime/generationXK-service/src/main/java/com/gyee/generation/service/auto/impl/ProEconMeterPointValueServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.generation.service.auto.impl;
+
+import com.gyee.generation.model.auto.ProEconMeterPointValue;
+import com.gyee.generation.mapper.auto.ProEconMeterPointValueMapper;
+import com.gyee.generation.service.auto.IProEconMeterPointValueService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 电计量点值表 服务实现类
+ * </p>
+ *
+ * @author 石林
+ * @since 2022-10-14
+ */
+@Service
+public class ProEconMeterPointValueServiceImpl extends ServiceImpl<ProEconMeterPointValueMapper, ProEconMeterPointValue> implements IProEconMeterPointValueService {
+
+}