Browse Source

曲线偏差率接口调试

wangb 3 months ago
parent
commit
eec558b89d

+ 90 - 44
generationXK-service/src/main/java/com/gyee/generation/service/WindPowerInfo1Service.java

@@ -1354,6 +1354,46 @@ public class WindPowerInfo1Service {
     }
 
 
+    public void writeGfHistory(Date date) throws Exception {
+        String s2 = "2024-12-11 23:55:00";
+        String[] split = gf.split(",");
+        List<String> str = new ArrayList<>(Arrays.asList(split));
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date date1 = simpleDateFormat.parse(s2);
+        long time = date1.getTime();
+        for (long i = time; i < 1735106823000L; i += 86400000) {
+            List<ProEconAnalysisSubtableBottom> ls = new ArrayList<>();
+            for (String s : str) {
+                Map<String, PointData2> historySection = adapter.getHistorySection(goldenUri(), s, i);
+                ProEconAnalysisSubtableBottom pb = new ProEconAnalysisSubtableBottom();
+                pb.setRecordDate(new Date(i));
+                String[] split1 = s.split("\\.");
+                if ("曙光储能电站".equals(split1[2]) || "宁东33光伏场站".equals(split1[2])) {
+                    pb.setWpid("GJNY_NXGS_SGB_GDC_STA");
+                } else if ("霞光储能电站".equals(split1[2]) || "宁东32光伏场站".equals(split1[2])) {
+                    pb.setWpid("GJNY_NXGS_XGB_GDC_STA");
+                } else if ("电度表".equals(split1[3])) {
+                    pb.setWpid("NX_FGS_HA_FDC_STA");
+                } else if ("区域集控".equals(split1[0]) && "惠安风场".equals(split1[1])) {
+                    pb.setWpid("NX_FGS_HA_FDC_STA");
+                } else {
+                    pb.setWpid("GJNY_NXGS_QZB_GDC_STA");
+                }
+                pb.setMeterId(s);
+                pb.setMeterName(s);
+                pb.setStopCode(historySection.get(s).getDoubleValue());
+                pb.setStopCodeModify(historySection.get(s).getDoubleValue());
+                ls.add(pb);
+            }
+            try {
+                boolean b = iProEconAnalysisSubtableBottomService.batchAdd(ls);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+
     public void writeReport1(Date date) throws Exception {
         String[] split = repInfo1.split(",");
         List<String> ls = new ArrayList<>(Arrays.asList(split));
@@ -1387,7 +1427,8 @@ public class WindPowerInfo1Service {
     }
 
     public void writeReportHistory(Date date) throws Exception {
-        String[] dateTime = {"2024-12-13 08:00:00","2024-12-13 12:00:00", "2024-12-13 16:00:00", "2024-12-13 20:00:00"};
+//        String[] dateTime = {"2024-12-13 08:00:00","2024-12-13 12:00:00", "2024-12-13 16:00:00", "2024-12-13 20:00:00"};
+        String[] dateTime = {"2024-12-25 00:00:00", "2024-12-25 04:00:00", "2024-12-25 08:00:00", "2024-12-24 20:00:00"};
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         String[] split = repInfo1.split(",");
@@ -1395,29 +1436,31 @@ public class WindPowerInfo1Service {
         for (String s : dateTime) {
             Date date1 = simpleDateFormat.parse(s);
             long timestamp = date1.getTime();
-            for (long i = timestamp; i < 1735033631000L; i += 86400000) {
-                List<StationInfoHour> shs = new ArrayList<>();
-                for (String l : ls) {
-                    Map<String, PointData2> historySection = adapter.getHistorySection(goldenUri(), l, i);
-                    if (null == historySection || historySection.isEmpty()) {
-                        return;
-                    }
-                        StationInfoHour sh = new StationInfoHour();
-                        sh.setRecordDate(LocalDateTime.ofInstant(Instant.ofEpochMilli(i),ZoneId.systemDefault()));
-                        sh.setWpid("NX_FGS_HA_FDC_STA");
-                        sh.setMeterId(l);
-                        sh.setMeterName(l);
-                        sh.setCode(BigDecimal.valueOf(historySection.get(l).getDoubleValue()));
-                        sh.setCodeModify(BigDecimal.valueOf(historySection.get(l).getDoubleValue()));
-                        shs.add(sh);
-
-                }
-                try {
-                    boolean b = stationInfoHourService.saveBatch(shs);
-                } catch (Exception e) {
-                    e.printStackTrace();
+//            for (long i = timestamp; i < 1735033631000L; i += 86400000) {
+            List<StationInfoHour> shs = new ArrayList<>();
+            for (String l : ls) {
+//                    Map<String, PointData2> historySection = adapter.getHistorySection(goldenUri(), l, i);
+                Map<String, PointData2> historySection = adapter.getHistorySection(goldenUri(), l, timestamp);
+                if (null == historySection || historySection.isEmpty()) {
+                    return;
                 }
+                StationInfoHour sh = new StationInfoHour();
+//                        sh.setRecordDate(LocalDateTime.ofInstant(Instant.ofEpochMilli(i),ZoneId.systemDefault()));
+                sh.setRecordDate(LocalDateTime.ofInstant(Instant.ofEpochMilli(timestamp), ZoneId.systemDefault()));
+                sh.setWpid("NX_FGS_HA_FDC_STA");
+                sh.setMeterId(l);
+                sh.setMeterName(l);
+                sh.setCode(BigDecimal.valueOf(historySection.get(l).getDoubleValue()));
+                sh.setCodeModify(BigDecimal.valueOf(historySection.get(l).getDoubleValue()));
+                shs.add(sh);
+
             }
+            try {
+                boolean b = stationInfoHourService.saveBatch(shs);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+//            }
         }
 
     }
@@ -1455,7 +1498,8 @@ public class WindPowerInfo1Service {
     }
 
     public void writeReportHistory2(Date date) throws Exception {
-        String[] dateTime = {"2024-12-13 01:00:00", "2024-12-13 05:00:00", "2024-12-13 09:00:00","2024-12-13 13:00:00", "2024-12-13 15:00:00", "2024-12-13 21:00:00"};
+//        String[] dateTime = {"2024-12-13 01:00:00", "2024-12-13 05:00:00", "2024-12-13 09:00:00","2024-12-13 13:00:00", "2024-12-13 17:00:00", "2024-12-13 21:00:00"};
+        String[] dateTime = {"2024-11-07 21:00:00"};
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         String[] split = repInfo2.split(",");
@@ -1463,30 +1507,32 @@ public class WindPowerInfo1Service {
         for (String s : dateTime) {
             Date date1 = simpleDateFormat.parse(s);
             long timestamp = date1.getTime();
-            for (long i = timestamp; i < 1735033631000L; i += 86400000) {
-                List<StationInfoHour> shs = new ArrayList<>();
-                for (String l : ls) {
-                    Map<String, PointData2> historySection = adapter.getHistorySection(goldenUri(), l, i);
-                    if (null == historySection || historySection.isEmpty()) {
-                        return;
-                    }
-                    StationInfoHour sh = new StationInfoHour();
-                    sh.setRecordDate(LocalDateTime.ofInstant(Instant.ofEpochMilli(i),ZoneId.systemDefault()));
-                    sh.setWpid("NX_FGS_HA_FDC_STA");
-                    sh.setMeterId(l);
-                    sh.setMeterName(l);
-                    sh.setCode(BigDecimal.valueOf(historySection.get(l).getDoubleValue()));
-                    sh.setCodeModify(BigDecimal.valueOf(historySection.get(l).getDoubleValue()));
-                    shs.add(sh);
-
-                }
-                try {
-                    boolean b = stationInfoHourService.saveBatch(shs);
-                } catch (Exception e) {
-                    e.printStackTrace();
+//            for (long i = timestamp; i < 1735033631000L; i += 86400000) {
+            List<StationInfoHour> shs = new ArrayList<>();
+            for (String l : ls) {
+//                    Map<String, PointData2> historySection = adapter.getHistorySection(goldenUri(), l, i);
+                Map<String, PointData2> historySection = adapter.getHistorySection(goldenUri(), l, timestamp);
+                if (null == historySection || historySection.isEmpty()) {
+                    return;
                 }
+                StationInfoHour sh = new StationInfoHour();
+//                    sh.setRecordDate(LocalDateTime.ofInstant(Instant.ofEpochMilli(i),ZoneId.systemDefault()));
+                sh.setRecordDate(LocalDateTime.ofInstant(Instant.ofEpochMilli(timestamp), ZoneId.systemDefault()));
+                sh.setWpid("NX_FGS_HA_FDC_STA");
+                sh.setMeterId(l);
+                sh.setMeterName(l);
+                sh.setCode(BigDecimal.valueOf(historySection.get(l).getDoubleValue()));
+                sh.setCodeModify(BigDecimal.valueOf(historySection.get(l).getDoubleValue()));
+                shs.add(sh);
+
+            }
+            try {
+                boolean b = stationInfoHourService.saveBatch(shs);
+            } catch (Exception e) {
+                e.printStackTrace();
             }
         }
+//        }
 
     }
 

+ 26 - 26
runeconomy-xk/src/main/java/com/gyee/runeconomy/model/auto/CurvefittingmainExample.java

@@ -267,72 +267,72 @@ public class CurvefittingmainExample {
         }
 
         public Criteria andWindturbineidIsNull() {
-            addCriterion("windturbineId is null");
+            addCriterion("windturbine_id is null");
             return (Criteria) this;
         }
 
         public Criteria andWindturbineidIsNotNull() {
-            addCriterion("windturbineId is not null");
+            addCriterion("windturbine_id is not null");
             return (Criteria) this;
         }
 
         public Criteria andWindturbineidEqualTo(String value) {
-            addCriterion("windturbineId =", value, "windturbineid");
+            addCriterion("windturbine_id =", value, "windturbineid");
             return (Criteria) this;
         }
 
         public Criteria andWindturbineidNotEqualTo(String value) {
-            addCriterion("windturbineId <>", value, "windturbineid");
+            addCriterion("windturbine_id <>", value, "windturbineid");
             return (Criteria) this;
         }
 
         public Criteria andWindturbineidGreaterThan(String value) {
-            addCriterion("windturbineId >", value, "windturbineid");
+            addCriterion("windturbine_id >", value, "windturbineid");
             return (Criteria) this;
         }
 
         public Criteria andWindturbineidGreaterThanOrEqualTo(String value) {
-            addCriterion("windturbineId >=", value, "windturbineid");
+            addCriterion("windturbine_id >=", value, "windturbineid");
             return (Criteria) this;
         }
 
         public Criteria andWindturbineidLessThan(String value) {
-            addCriterion("windturbineId <", value, "windturbineid");
+            addCriterion("windturbine_id <", value, "windturbineid");
             return (Criteria) this;
         }
 
         public Criteria andWindturbineidLessThanOrEqualTo(String value) {
-            addCriterion("windturbineId <=", value, "windturbineid");
+            addCriterion("windturbine_id <=", value, "windturbineid");
             return (Criteria) this;
         }
 
         public Criteria andWindturbineidLike(String value) {
-            addCriterion("windturbineId like", value, "windturbineid");
+            addCriterion("windturbine_id like", value, "windturbineid");
             return (Criteria) this;
         }
 
         public Criteria andWindturbineidNotLike(String value) {
-            addCriterion("windturbineId not like", value, "windturbineid");
+            addCriterion("windturbine_id not like", value, "windturbineid");
             return (Criteria) this;
         }
 
         public Criteria andWindturbineidIn(List<String> values) {
-            addCriterion("windturbineId in", values, "windturbineid");
+            addCriterion("windturbine_id in", values, "windturbineid");
             return (Criteria) this;
         }
 
         public Criteria andWindturbineidNotIn(List<String> values) {
-            addCriterion("windturbineId not in", values, "windturbineid");
+            addCriterion("windturbine_id not in", values, "windturbineid");
             return (Criteria) this;
         }
 
         public Criteria andWindturbineidBetween(String value1, String value2) {
-            addCriterion("windturbineId between", value1, value2, "windturbineid");
+            addCriterion("windturbine_id between", value1, value2, "windturbineid");
             return (Criteria) this;
         }
 
         public Criteria andWindturbineidNotBetween(String value1, String value2) {
-            addCriterion("windturbineId not between", value1, value2, "windturbineid");
+            addCriterion("windturbine_id not between", value1, value2, "windturbineid");
             return (Criteria) this;
         }
 
@@ -517,62 +517,62 @@ public class CurvefittingmainExample {
         }
 
         public Criteria andRecorddateIsNull() {
-            addCriterion("recordDate is null");
+            addCriterion("record_date is null");
             return (Criteria) this;
         }
 
         public Criteria andRecorddateIsNotNull() {
-            addCriterion("recordDate is not null");
+            addCriterion("record_date is not null");
             return (Criteria) this;
         }
 
         public Criteria andRecorddateEqualTo(Date value) {
-            addCriterion("recordDate =", value, "recorddate");
+            addCriterion("record_date =", value, "recorddate");
             return (Criteria) this;
         }
 
         public Criteria andRecorddateNotEqualTo(Date value) {
-            addCriterion("recordDate <>", value, "recorddate");
+            addCriterion("record_date <>", value, "recorddate");
             return (Criteria) this;
         }
 
         public Criteria andRecorddateGreaterThan(Date value) {
-            addCriterion("recordDate >", value, "recorddate");
+            addCriterion("record_date >", value, "recorddate");
             return (Criteria) this;
         }
 
         public Criteria andRecorddateGreaterThanOrEqualTo(Date value) {
-            addCriterion("recordDate >=", value, "recorddate");
+            addCriterion("record_date >=", value, "recorddate");
             return (Criteria) this;
         }
 
         public Criteria andRecorddateLessThan(Date value) {
-            addCriterion("recordDate <", value, "recorddate");
+            addCriterion("record_date <", value, "recorddate");
             return (Criteria) this;
         }
 
         public Criteria andRecorddateLessThanOrEqualTo(Date value) {
-            addCriterion("recordDate <=", value, "recorddate");
+            addCriterion("record_date <=", value, "recorddate");
             return (Criteria) this;
         }
 
         public Criteria andRecorddateIn(List<Date> values) {
-            addCriterion("recordDate in", values, "recorddate");
+            addCriterion("record_date in", values, "recorddate");
             return (Criteria) this;
         }
 
         public Criteria andRecorddateNotIn(List<Date> values) {
-            addCriterion("recordDate not in", values, "recorddate");
+            addCriterion("record_date not in", values, "recorddate");
             return (Criteria) this;
         }
 
         public Criteria andRecorddateBetween(Date value1, Date value2) {
-            addCriterion("recordDate between", value1, value2, "recorddate");
+            addCriterion("record_date between", value1, value2, "recorddate");
             return (Criteria) this;
         }
 
         public Criteria andRecorddateNotBetween(Date value1, Date value2) {
-            addCriterion("recordDate not between", value1, value2, "recorddate");
+            addCriterion("record_date not between", value1, value2, "recorddate");
             return (Criteria) this;
         }
 

+ 24 - 24
runeconomy-xk/src/main/java/com/gyee/runeconomy/model/auto/CurvefittingmonthmainExample.java

@@ -266,72 +266,72 @@ public class CurvefittingmonthmainExample {
         }
 
         public Criteria andWindturbineidIsNull() {
-            addCriterion("windturbineId is null");
+            addCriterion("windturbine_id is null");
             return (Criteria) this;
         }
 
         public Criteria andWindturbineidIsNotNull() {
-            addCriterion("windturbineId is not null");
+            addCriterion("windturbine_id is not null");
             return (Criteria) this;
         }
 
         public Criteria andWindturbineidEqualTo(String value) {
-            addCriterion("windturbineId =", value, "windturbineid");
+            addCriterion("windturbine_id =", value, "windturbine_id");
             return (Criteria) this;
         }
 
         public Criteria andWindturbineidNotEqualTo(String value) {
-            addCriterion("windturbineId <>", value, "windturbineid");
+            addCriterion("windturbine_id <>", value, "windturbine_id");
             return (Criteria) this;
         }
 
         public Criteria andWindturbineidGreaterThan(String value) {
-            addCriterion("windturbineId >", value, "windturbineid");
+            addCriterion("windturbine_id >", value, "windturbine_id");
             return (Criteria) this;
         }
 
         public Criteria andWindturbineidGreaterThanOrEqualTo(String value) {
-            addCriterion("windturbineId >=", value, "windturbineid");
+            addCriterion("windturbine_id >=", value, "windturbine_id");
             return (Criteria) this;
         }
 
         public Criteria andWindturbineidLessThan(String value) {
-            addCriterion("windturbineId <", value, "windturbineid");
+            addCriterion("windturbine_id <", value, "windturbine_id");
             return (Criteria) this;
         }
 
         public Criteria andWindturbineidLessThanOrEqualTo(String value) {
-            addCriterion("windturbineId <=", value, "windturbineid");
+            addCriterion("windturbine_id <=", value, "windturbine_id");
             return (Criteria) this;
         }
 
         public Criteria andWindturbineidLike(String value) {
-            addCriterion("windturbineId like", value, "windturbineid");
+            addCriterion("windturbine_id like", value, "windturbine_id");
             return (Criteria) this;
         }
 
         public Criteria andWindturbineidNotLike(String value) {
-            addCriterion("windturbineId not like", value, "windturbineid");
+            addCriterion("windturbine_id not like", value, "windturbine_id");
             return (Criteria) this;
         }
 
         public Criteria andWindturbineidIn(List<String> values) {
-            addCriterion("windturbineId in", values, "windturbineid");
+            addCriterion("windturbine_id in", values, "windturbine_id");
             return (Criteria) this;
         }
 
         public Criteria andWindturbineidNotIn(List<String> values) {
-            addCriterion("windturbineId not in", values, "windturbineid");
+            addCriterion("windturbine_id not in", values, "windturbine_id");
             return (Criteria) this;
         }
 
         public Criteria andWindturbineidBetween(String value1, String value2) {
-            addCriterion("windturbineId between", value1, value2, "windturbineid");
+            addCriterion("windturbine_id between", value1, value2, "windturbine_id");
             return (Criteria) this;
         }
 
         public Criteria andWindturbineidNotBetween(String value1, String value2) {
-            addCriterion("windturbineId not between", value1, value2, "windturbineid");
+            addCriterion("windturbine_id not between", value1, value2, "windturbine_id");
             return (Criteria) this;
         }
 
@@ -726,52 +726,52 @@ public class CurvefittingmonthmainExample {
         }
 
         public Criteria andDeviationrate2EqualTo(BigDecimal value) {
-            addCriterion("deviationRate2 =", value, "deviationrate2");
+            addCriterion("deviationRate2 =", value, "deviation_rate2");
             return (Criteria) this;
         }
 
         public Criteria andDeviationrate2NotEqualTo(BigDecimal value) {
-            addCriterion("deviationRate2 <>", value, "deviationrate2");
+            addCriterion("deviationRate2 <>", value, "deviation_rate2");
             return (Criteria) this;
         }
 
         public Criteria andDeviationrate2GreaterThan(BigDecimal value) {
-            addCriterion("deviationRate2 >", value, "deviationrate2");
+            addCriterion("deviationRate2 >", value, "deviation_rate2");
             return (Criteria) this;
         }
 
         public Criteria andDeviationrate2GreaterThanOrEqualTo(BigDecimal value) {
-            addCriterion("deviationRate2 >=", value, "deviationrate2");
+            addCriterion("deviationRate2 >=", value, "deviation_rate2");
             return (Criteria) this;
         }
 
         public Criteria andDeviationrate2LessThan(BigDecimal value) {
-            addCriterion("deviationRate2 <", value, "deviationrate2");
+            addCriterion("deviationRate2 <", value, "deviation_rate2");
             return (Criteria) this;
         }
 
         public Criteria andDeviationrate2LessThanOrEqualTo(BigDecimal value) {
-            addCriterion("deviationRate2 <=", value, "deviationrate2");
+            addCriterion("deviationRate2 <=", value, "deviation_rate2");
             return (Criteria) this;
         }
 
         public Criteria andDeviationrate2In(List<BigDecimal> values) {
-            addCriterion("deviationRate2 in", values, "deviationrate2");
+            addCriterion("deviationRate2 in", values, "deviation_rate2");
             return (Criteria) this;
         }
 
         public Criteria andDeviationrate2NotIn(List<BigDecimal> values) {
-            addCriterion("deviationRate2 not in", values, "deviationrate2");
+            addCriterion("deviationRate2 not in", values, "deviation_rate2");
             return (Criteria) this;
         }
 
         public Criteria andDeviationrate2Between(BigDecimal value1, BigDecimal value2) {
-            addCriterion("deviationRate2 between", value1, value2, "deviationrate2");
+            addCriterion("deviationRate2 between", value1, value2, "deviation_rate2");
             return (Criteria) this;
         }
 
         public Criteria andDeviationrate2NotBetween(BigDecimal value1, BigDecimal value2) {
-            addCriterion("deviationRate2 not between", value1, value2, "deviationrate2");
+            addCriterion("deviationRate2 not between", value1, value2, "deviation_rate2");
             return (Criteria) this;
         }
 

+ 11 - 1
runeconomy-xk/src/main/java/com/gyee/runeconomy/service/auto/impl/CurvefittingmainService.java

@@ -2,9 +2,12 @@ package com.gyee.runeconomy.service.auto.impl;
 
 import com.gyee.common.model.Convert;
 import com.gyee.runeconomy.config.BaseService;
+import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.mapper.auto.CurvefittingmainMapper;
 import com.gyee.runeconomy.model.auto.Curvefittingmain;
 import com.gyee.runeconomy.model.auto.CurvefittingmainExample;
+import com.gyee.runeconomy.model.auto.Curvefittingmonthmain;
+import com.gyee.runeconomy.model.auto.ProBasicEquipment;
 import com.gyee.runeconomy.model.vo.Tablepar;
 import com.gyee.runeconomy.util.DateUtils;
 import com.gyee.runeconomy.util.StringUtils;
@@ -99,7 +102,7 @@ public class CurvefittingmainService implements BaseService<Curvefittingmain, Cu
 		List<Curvefittingmain> list =new ArrayList<>();
 
 		CurvefittingmainExample example=new CurvefittingmainExample();
-		example.setOrderByClause(" deviationrate2 DESC");
+		example.setOrderByClause(" deviation_rate2 DESC");
 
 
 		CurvefittingmainExample.Criteria criteria =example.createCriteria();
@@ -110,6 +113,13 @@ public class CurvefittingmainService implements BaseService<Curvefittingmain, Cu
 
 		list=curvefittingmainMapper.selectByExample(example);
 
+		for (Curvefittingmain curvefittingmain : list) {
+			for (ProBasicEquipment wtl : CacheContext.wtls) {
+				if (curvefittingmain.getWindturbineid().equals(wtl.getId())) {
+					curvefittingmain.setWindturbineid(wtl.getNemCode());
+				}
+			}
+		}
 		list=sortCurvefittingmainList(tablepar, list);
 
 		return list;

+ 13 - 5
runeconomy-xk/src/main/java/com/gyee/runeconomy/service/auto/impl/CurvefittingmonthmainService.java

@@ -2,9 +2,11 @@ package com.gyee.runeconomy.service.auto.impl;
 
 import com.gyee.common.model.Convert;
 import com.gyee.runeconomy.config.BaseService;
+import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.mapper.auto.CurvefittingmonthmainMapper;
 import com.gyee.runeconomy.model.auto.Curvefittingmonthmain;
 import com.gyee.runeconomy.model.auto.CurvefittingmonthmainExample;
+import com.gyee.runeconomy.model.auto.ProBasicEquipment;
 import com.gyee.runeconomy.model.vo.Tablepar;
 import com.gyee.runeconomy.util.StringUtils;
 import org.springframework.stereotype.Service;
@@ -102,7 +104,7 @@ public class CurvefittingmonthmainService implements BaseService<Curvefittingmon
 		if(StringUtils.notEmp(wtIds) && StringUtils.notEmp(year) && StringUtils.notEmp(month))
 		{
 			CurvefittingmonthmainExample example=new CurvefittingmonthmainExample();
-			example.setOrderByClause(" deviationrate2 DESC");
+			example.setOrderByClause(" deviation_rate2 DESC");
 
 
 			CurvefittingmonthmainExample.Criteria criteria =example.createCriteria();
@@ -113,21 +115,27 @@ public class CurvefittingmonthmainService implements BaseService<Curvefittingmon
 
 			list=curvefittingmonthmainMapper.selectByExample(example);
 
+			for (Curvefittingmonthmain curvefittingmonthmain : list) {
+				for (ProBasicEquipment wtl : CacheContext.wtls) {
+					if (curvefittingmonthmain.getWindturbineid().equals(wtl.getId())) {
+						curvefittingmonthmain.setWindturbineid(wtl.getNemCode());
+					}
+				}
+			}
 			list=sortCurvefittingmonthmainList(tablepar, list);
 		}
 
-
 		return list;
-
 	}
 
+
 	public  List<Curvefittingmonthmain> sortCurvefittingmonthmainList(Tablepar tablepar,List<Curvefittingmonthmain> ls)
 	{
-
+		tablepar.setOrderByColumn("windturbine_id");
 		if (null !=tablepar && StringUtils.notEmp(tablepar.getOrderByColumn())) {
 
 			switch (tablepar.getOrderByColumn()) {
-				case "windturbineid":
+				case "windturbine_id":
 					if (tablepar.getIsAsc().equals("asc")) {
 
 						Collections.sort(ls, new Comparator<Curvefittingmonthmain>() {

+ 57 - 57
runeconomy-xk/src/main/resources/mapper/CurvefittingmainMapper.xml

@@ -7,14 +7,14 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="windturbineId" jdbcType="VARCHAR" property="windturbineid" />
-    <result column="monthDeviationRate" jdbcType="DECIMAL" property="monthdeviationrate" />
-    <result column="yearDeviationRate" jdbcType="DECIMAL" property="yeardeviationrate" />
-    <result column="standardDeviationRate" jdbcType="DECIMAL" property="standarddeviationrate" />
-    <result column="recordDate" jdbcType="TIMESTAMP" property="recorddate" />
-    <result column="deviationRate1" jdbcType="DECIMAL" property="deviationrate1" />
-    <result column="deviationRate2" jdbcType="DECIMAL" property="deviationrate2" />
-    <result column="deviationRate3" jdbcType="DECIMAL" property="deviationrate3" />
+    <result column="windturbine_id" jdbcType="VARCHAR" property="windturbineid" />
+    <result column="month_deviation_rate" jdbcType="DECIMAL" property="monthdeviationrate" />
+    <result column="year_deviation_rate" jdbcType="DECIMAL" property="yeardeviationrate" />
+    <result column="standard_deviation_rate" jdbcType="DECIMAL" property="standarddeviationrate" />
+    <result column="record_date" jdbcType="TIMESTAMP" property="recorddate" />
+    <result column="deviation_rate1" jdbcType="DECIMAL" property="deviationrate1" />
+    <result column="deviation_rate2" jdbcType="DECIMAL" property="deviationrate2" />
+    <result column="deviation_rate3" jdbcType="DECIMAL" property="deviationrate3" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -87,8 +87,8 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, windturbineId, monthDeviationRate, yearDeviationRate, standardDeviationRate, 
-    recordDate, deviationRate1, deviationRate2, deviationRate3
+    id, windturbine_id, month_deviation_rate, year_deviation_rate, standard_deviation_rate,
+    record_date, deviation_rate1, deviation_rate2, deviation_rate3
   </sql>
   <select id="selectByExample" parameterType="com.gyee.runeconomy.model.auto.CurvefittingmainExample" resultMap="BaseResultMap">
     <!--
@@ -100,7 +100,7 @@
       distinct
     </if>
     <include refid="Base_Column_List" />
-    from curvefittingmain
+    from pro_econ_curve_fitting_main
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -141,10 +141,10 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    insert into curvefittingmain (id, windturbineId, monthDeviationRate, 
-      yearDeviationRate, standardDeviationRate, 
-      recordDate, deviationRate1, deviationRate2, 
-      deviationRate3)
+    insert into curvefittingmain (id, windturbine_id, month_deviation_rate, 
+      year_deviation_rate, standard_deviation_rate, 
+      record_date, deviation_rate1, deviation_rate2,
+    deviation_rate3)
     values (#{id,jdbcType=VARCHAR}, #{windturbineid,jdbcType=VARCHAR}, #{monthdeviationrate,jdbcType=DECIMAL}, 
       #{yeardeviationrate,jdbcType=DECIMAL}, #{standarddeviationrate,jdbcType=DECIMAL}, 
       #{recorddate,jdbcType=TIMESTAMP}, #{deviationrate1,jdbcType=DECIMAL}, #{deviationrate2,jdbcType=DECIMAL}, 
@@ -160,39 +160,39 @@
       <if test="id != null">
         id,
       </if>
-      <if test="windturbineid != null">
+      <if test="windturbine_id != null">
         windturbineId,
       </if>
-      <if test="monthdeviationrate != null">
+      <if test="month_deviation_rate != null">
         monthDeviationRate,
       </if>
       <if test="yeardeviationrate != null">
-        yearDeviationRate,
+        year_deviation_rate,
       </if>
       <if test="standarddeviationrate != null">
-        standardDeviationRate,
+        standard_deviation_rate,
       </if>
       <if test="recorddate != null">
-        recordDate,
+        record_date,
       </if>
       <if test="deviationrate1 != null">
-        deviationRate1,
+        deviation_rate1,
       </if>
       <if test="deviationrate2 != null">
-        deviationRate2,
+        deviation_rate2,
       </if>
       <if test="deviationrate3 != null">
-        deviationRate3,
+        deviation_rate3,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
         #{id,jdbcType=VARCHAR},
       </if>
-      <if test="windturbineid != null">
+      <if test="windturbine_id != null">
         #{windturbineid,jdbcType=VARCHAR},
       </if>
-      <if test="monthdeviationrate != null">
+      <if test="month_deviation_rate != null">
         #{monthdeviationrate,jdbcType=DECIMAL},
       </if>
       <if test="yeardeviationrate != null">
@@ -236,28 +236,28 @@
         id = #{record.id,jdbcType=VARCHAR},
       </if>
       <if test="record.windturbineid != null">
-        windturbineId = #{record.windturbineid,jdbcType=VARCHAR},
+        windturbine_id = #{record.windturbineid,jdbcType=VARCHAR},
       </if>
       <if test="record.monthdeviationrate != null">
-        monthDeviationRate = #{record.monthdeviationrate,jdbcType=DECIMAL},
+        month_deviation_rate = #{record.monthdeviationrate,jdbcType=DECIMAL},
       </if>
       <if test="record.yeardeviationrate != null">
-        yearDeviationRate = #{record.yeardeviationrate,jdbcType=DECIMAL},
+        year_deviation_rate = #{record.yeardeviationrate,jdbcType=DECIMAL},
       </if>
       <if test="record.standarddeviationrate != null">
-        standardDeviationRate = #{record.standarddeviationrate,jdbcType=DECIMAL},
+        standard_deviation_rate = #{record.standarddeviationrate,jdbcType=DECIMAL},
       </if>
       <if test="record.recorddate != null">
-        recordDate = #{record.recorddate,jdbcType=TIMESTAMP},
+        record_date = #{record.recorddate,jdbcType=TIMESTAMP},
       </if>
       <if test="record.deviationrate1 != null">
-        deviationRate1 = #{record.deviationrate1,jdbcType=DECIMAL},
+        deviation_rate1 = #{record.deviationrate1,jdbcType=DECIMAL},
       </if>
       <if test="record.deviationrate2 != null">
-        deviationRate2 = #{record.deviationrate2,jdbcType=DECIMAL},
+        deviation_rate2 = #{record.deviationrate2,jdbcType=DECIMAL},
       </if>
       <if test="record.deviationrate3 != null">
-        deviationRate3 = #{record.deviationrate3,jdbcType=DECIMAL},
+        deviation_rate3 = #{record.deviationrate3,jdbcType=DECIMAL},
       </if>
     </set>
     <if test="_parameter != null">
@@ -271,14 +271,14 @@
     -->
     update curvefittingmain
     set id = #{record.id,jdbcType=VARCHAR},
-      windturbineId = #{record.windturbineid,jdbcType=VARCHAR},
-      monthDeviationRate = #{record.monthdeviationrate,jdbcType=DECIMAL},
-      yearDeviationRate = #{record.yeardeviationrate,jdbcType=DECIMAL},
-      standardDeviationRate = #{record.standarddeviationrate,jdbcType=DECIMAL},
-      recordDate = #{record.recorddate,jdbcType=TIMESTAMP},
-      deviationRate1 = #{record.deviationrate1,jdbcType=DECIMAL},
-      deviationRate2 = #{record.deviationrate2,jdbcType=DECIMAL},
-      deviationRate3 = #{record.deviationrate3,jdbcType=DECIMAL}
+    windturbine_id = #{record.windturbineid,jdbcType=VARCHAR},
+    month_deviation_rate = #{record.monthdeviationrate,jdbcType=DECIMAL},
+      year_deviation_rate = #{record.yeardeviationrate,jdbcType=DECIMAL},
+      standard_deviation_rate = #{record.standarddeviationrate,jdbcType=DECIMAL},
+      record_date = #{record.recorddate,jdbcType=TIMESTAMP},
+    deviation_rate1 = #{record.deviationrate1,jdbcType=DECIMAL},
+    deviation_rate2 = #{record.deviationrate2,jdbcType=DECIMAL},
+    deviation_rate3 = #{record.deviationrate3,jdbcType=DECIMAL}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -291,28 +291,28 @@
     update curvefittingmain
     <set>
       <if test="windturbineid != null">
-        windturbineId = #{windturbineid,jdbcType=VARCHAR},
+        windturbine_id = #{windturbineid,jdbcType=VARCHAR},
       </if>
       <if test="monthdeviationrate != null">
-        monthDeviationRate = #{monthdeviationrate,jdbcType=DECIMAL},
+        month_deviation_rate = #{monthdeviationrate,jdbcType=DECIMAL},
       </if>
       <if test="yeardeviationrate != null">
-        yearDeviationRate = #{yeardeviationrate,jdbcType=DECIMAL},
+        year_deviation_rate = #{yeardeviationrate,jdbcType=DECIMAL},
       </if>
       <if test="standarddeviationrate != null">
-        standardDeviationRate = #{standarddeviationrate,jdbcType=DECIMAL},
+        standard_deviation_rate = #{standarddeviationrate,jdbcType=DECIMAL},
       </if>
       <if test="recorddate != null">
-        recordDate = #{recorddate,jdbcType=TIMESTAMP},
+        record_date = #{recorddate,jdbcType=TIMESTAMP},
       </if>
       <if test="deviationrate1 != null">
-        deviationRate1 = #{deviationrate1,jdbcType=DECIMAL},
+        deviation_rate1 = #{deviationrate1,jdbcType=DECIMAL},
       </if>
       <if test="deviationrate2 != null">
-        deviationRate2 = #{deviationrate2,jdbcType=DECIMAL},
+        deviation_rate2 = #{deviationrate2,jdbcType=DECIMAL},
       </if>
       <if test="deviationrate3 != null">
-        deviationRate3 = #{deviationrate3,jdbcType=DECIMAL},
+        deviation_rate3 = #{deviationrate3,jdbcType=DECIMAL},
       </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
@@ -323,14 +323,14 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     update curvefittingmain
-    set windturbineId = #{windturbineid,jdbcType=VARCHAR},
-      monthDeviationRate = #{monthdeviationrate,jdbcType=DECIMAL},
-      yearDeviationRate = #{yeardeviationrate,jdbcType=DECIMAL},
-      standardDeviationRate = #{standarddeviationrate,jdbcType=DECIMAL},
-      recordDate = #{recorddate,jdbcType=TIMESTAMP},
-      deviationRate1 = #{deviationrate1,jdbcType=DECIMAL},
-      deviationRate2 = #{deviationrate2,jdbcType=DECIMAL},
-      deviationRate3 = #{deviationrate3,jdbcType=DECIMAL}
+    set windturbine_id = #{windturbineid,jdbcType=VARCHAR},
+    month_deviation_rate = #{monthdeviationrate,jdbcType=DECIMAL},
+      year_deviation_rate = #{yeardeviationrate,jdbcType=DECIMAL},
+      standard_deviation_rate = #{standarddeviationrate,jdbcType=DECIMAL},
+      record_date = #{recorddate,jdbcType=TIMESTAMP},
+    deviation_rate1 = #{deviationrate1,jdbcType=DECIMAL},
+    deviation_rate2 = #{deviationrate2,jdbcType=DECIMAL},
+    deviation_rate3 = #{deviationrate3,jdbcType=DECIMAL}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

+ 50 - 50
runeconomy-xk/src/main/resources/mapper/CurvefittingmonthmainMapper.xml

@@ -7,15 +7,15 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="windturbineId" jdbcType="VARCHAR" property="windturbineid" />
+    <result column="windturbine_id" jdbcType="VARCHAR" property="windturbineid" />
     <result column="year" jdbcType="VARCHAR" property="year" />
     <result column="month" jdbcType="VARCHAR" property="month" />
-    <result column="monthDeviationRate" jdbcType="DECIMAL" property="monthdeviationrate" />
-    <result column="yearDeviationRate" jdbcType="DECIMAL" property="yeardeviationrate" />
-    <result column="standardDeviationRate" jdbcType="DECIMAL" property="standarddeviationrate" />
-    <result column="deviationRate1" jdbcType="DECIMAL" property="deviationrate1" />
-    <result column="deviationRate2" jdbcType="DECIMAL" property="deviationrate2" />
-    <result column="deviationRate3" jdbcType="DECIMAL" property="deviationrate3" />
+    <result column="month_deviation_rate" jdbcType="DECIMAL" property="monthdeviationrate" />
+    <result column="year_deviation_rate" jdbcType="DECIMAL" property="yeardeviationrate" />
+    <result column="standard_deviation_rate" jdbcType="DECIMAL" property="standarddeviationrate" />
+    <result column="deviation_rate1" jdbcType="DECIMAL" property="deviationrate1" />
+    <result column="deviation_rate2" jdbcType="DECIMAL" property="deviationrate2" />
+    <result column="deviation_rate3" jdbcType="DECIMAL" property="deviationrate3" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -88,8 +88,8 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, windturbineId, year, month, monthDeviationRate, yearDeviationRate, standardDeviationRate, 
-    deviationRate1, deviationRate2, deviationRate3
+    id, windturbine_id, year, month, month_deviation_rate, year_deviation_rate, standard_deviation_rate,
+    deviation_rate1, deviation_rate2, deviation_rate3
   </sql>
   <select id="selectByExample" parameterType="com.gyee.runeconomy.model.auto.CurvefittingmonthmainExample" resultMap="BaseResultMap">
     <!--
@@ -101,7 +101,6 @@
       distinct
     </if>
     <include refid="Base_Column_List" />
     from pro_econ_curve_fitt_month_main
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
@@ -143,12 +142,12 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    insert into curvefittingmonthmain (id, windturbineId, year, 
-      month, monthDeviationRate, yearDeviationRate, 
-      standardDeviationRate, deviationRate1, 
-      deviationRate2, deviationRate3)
-    values (#{id,jdbcType=VARCHAR}, #{windturbineid,jdbcType=VARCHAR}, #{year,jdbcType=VARCHAR}, 
-      #{month,jdbcType=VARCHAR}, #{monthdeviationrate,jdbcType=DECIMAL}, #{yeardeviationrate,jdbcType=DECIMAL}, 
+    insert into curvefittingmonthmain (id, windturbine_id, year, 
+      month, month_deviation_rate, year_deviation_rate,
+    standard_deviation_rate, deviation_rate1,
+    deviation_rate2, deviation_rate3)
+    values (#{id,jdbcType=VARCHAR}, #{windturbine_id,jdbcType=VARCHAR}, #{year,jdbcType=VARCHAR},
+      #{month,jdbcType=VARCHAR}, #{monthdeviationrate,jdbcType=DECIMAL}, #{yeardeviationrate,jdbcType=DECIMAL},
       #{standarddeviationrate,jdbcType=DECIMAL}, #{deviationrate1,jdbcType=DECIMAL}, 
       #{deviationrate2,jdbcType=DECIMAL}, #{deviationrate3,jdbcType=DECIMAL})
   </insert>
@@ -162,8 +161,8 @@
       <if test="id != null">
         id,
       </if>
-      <if test="windturbineid != null">
-        windturbineId,
+      <if test="windturbine_id != null">
+        windturbine_id,
       </if>
       <if test="year != null">
         year,
@@ -172,12 +171,12 @@
         month,
       </if>
       <if test="monthdeviationrate != null">
-        monthDeviationRate,
+        month_deviation_rate,
       </if>
-      <if test="yeardeviationrate != null">
+      <if test="year_deviation_rate != null">
         yearDeviationRate,
       </if>
-      <if test="standarddeviationrate != null">
+      <if test="standard_deviation_rate != null">
         standardDeviationRate,
       </if>
       <if test="deviationrate1 != null">
@@ -194,8 +193,8 @@
       <if test="id != null">
         #{id,jdbcType=VARCHAR},
       </if>
-      <if test="windturbineid != null">
-        #{windturbineid,jdbcType=VARCHAR},
+      <if test="windturbine_id != null">
+        #{windturbine_id,jdbcType=VARCHAR},
       </if>
       <if test="year != null">
         #{year,jdbcType=VARCHAR},
@@ -206,8 +205,8 @@
       <if test="monthdeviationrate != null">
         #{monthdeviationrate,jdbcType=DECIMAL},
       </if>
-      <if test="yeardeviationrate != null">
-        #{yeardeviationrate,jdbcType=DECIMAL},
+      <if test="year_deviation_rate != null">
+        #{year_deviation_rate,jdbcType=DECIMAL},
       </if>
       <if test="standarddeviationrate != null">
         #{standarddeviationrate,jdbcType=DECIMAL},
@@ -243,8 +242,8 @@
       <if test="record.id != null">
         id = #{record.id,jdbcType=VARCHAR},
       </if>
-      <if test="record.windturbineid != null">
-        windturbineId = #{record.windturbineid,jdbcType=VARCHAR},
+      <if test="record.windturbine_id != null">
+        windturbine_id = #{record.windturbine_id,jdbcType=VARCHAR},
       </if>
       <if test="record.year != null">
         year = #{record.year,jdbcType=VARCHAR},
@@ -253,10 +252,10 @@
         month = #{record.month,jdbcType=VARCHAR},
       </if>
       <if test="record.monthdeviationrate != null">
-        monthDeviationRate = #{record.monthdeviationrate,jdbcType=DECIMAL},
+        month_deviation_rate = #{record.monthdeviationrate,jdbcType=DECIMAL},
       </if>
-      <if test="record.yeardeviationrate != null">
-        yearDeviationRate = #{record.yeardeviationrate,jdbcType=DECIMAL},
+      <if test="record.year_deviation_rate != null">
+        year_deviation_rate = #{record.yeardeviationrate,jdbcType=DECIMAL},
       </if>
       <if test="record.standarddeviationrate != null">
         standardDeviationRate = #{record.standarddeviationrate,jdbcType=DECIMAL},
@@ -282,15 +281,15 @@
     -->
     update curvefittingmonthmain
     set id = #{record.id,jdbcType=VARCHAR},
-      windturbineId = #{record.windturbineid,jdbcType=VARCHAR},
+      windturbine_id = #{record.windturbine_id,jdbcType=VARCHAR},
       year = #{record.year,jdbcType=VARCHAR},
       month = #{record.month,jdbcType=VARCHAR},
-      monthDeviationRate = #{record.monthdeviationrate,jdbcType=DECIMAL},
-      yearDeviationRate = #{record.yeardeviationrate,jdbcType=DECIMAL},
-      standardDeviationRate = #{record.standarddeviationrate,jdbcType=DECIMAL},
-      deviationRate1 = #{record.deviationrate1,jdbcType=DECIMAL},
-      deviationRate2 = #{record.deviationrate2,jdbcType=DECIMAL},
-      deviationRate3 = #{record.deviationrate3,jdbcType=DECIMAL}
+      month_deviation_rate = #{record.monthdeviationrate,jdbcType=DECIMAL},
+      year_deviation_rate = #{record.yeardeviationrate,jdbcType=DECIMAL},
+    standard_deviation_rate = #{record.standarddeviationrate,jdbcType=DECIMAL},
+    deviation_rate1 = #{record.deviationrate1,jdbcType=DECIMAL},
+    deviation_rate2 = #{record.deviationrate2,jdbcType=DECIMAL},
+    deviation_rate3 = #{record.deviationrate3,jdbcType=DECIMAL}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -303,7 +302,7 @@
     update curvefittingmonthmain
     <set>
       <if test="windturbineid != null">
-        windturbineId = #{windturbineid,jdbcType=VARCHAR},
+        windturbine_id = #{windturbineid,jdbcType=VARCHAR},
       </if>
       <if test="year != null">
         year = #{year,jdbcType=VARCHAR},
@@ -312,22 +311,22 @@
         month = #{month,jdbcType=VARCHAR},
       </if>
       <if test="monthdeviationrate != null">
-        monthDeviationRate = #{monthdeviationrate,jdbcType=DECIMAL},
+        month_deviation_rate = #{monthdeviationrate,jdbcType=DECIMAL},
       </if>
       <if test="yeardeviationrate != null">
-        yearDeviationRate = #{yeardeviationrate,jdbcType=DECIMAL},
+        year_deviation_rate = #{yeardeviationrate,jdbcType=DECIMAL},
       </if>
       <if test="standarddeviationrate != null">
-        standardDeviationRate = #{standarddeviationrate,jdbcType=DECIMAL},
+        standard_deviation_rate = #{standarddeviationrate,jdbcType=DECIMAL},
       </if>
       <if test="deviationrate1 != null">
-        deviationRate1 = #{deviationrate1,jdbcType=DECIMAL},
+        deviation_rate1 = #{deviationrate1,jdbcType=DECIMAL},
       </if>
       <if test="deviationrate2 != null">
-        deviationRate2 = #{deviationrate2,jdbcType=DECIMAL},
+        deviation_rate2 = #{deviationrate2,jdbcType=DECIMAL},
       </if>
       <if test="deviationrate3 != null">
-        deviationRate3 = #{deviationrate3,jdbcType=DECIMAL},
+        deviation_rate3 = #{deviationrate3,jdbcType=DECIMAL},
       </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
@@ -338,15 +337,15 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     update curvefittingmonthmain
-    set windturbineId = #{windturbineid,jdbcType=VARCHAR},
+    set windturbine_id = #{windturbine_id,jdbcType=VARCHAR},
       year = #{year,jdbcType=VARCHAR},
       month = #{month,jdbcType=VARCHAR},
-      monthDeviationRate = #{monthdeviationrate,jdbcType=DECIMAL},
-      yearDeviationRate = #{yeardeviationrate,jdbcType=DECIMAL},
-      standardDeviationRate = #{standarddeviationrate,jdbcType=DECIMAL},
-      deviationRate1 = #{deviationrate1,jdbcType=DECIMAL},
-      deviationRate2 = #{deviationrate2,jdbcType=DECIMAL},
-      deviationRate3 = #{deviationrate3,jdbcType=DECIMAL}
+      month_deviation_rate = #{monthdeviationrate,jdbcType=DECIMAL},
+      year_deviation_rate = #{yeardeviationrate,jdbcType=DECIMAL},
+    standard_deviation_rate = #{standarddeviationrate,jdbcType=DECIMAL},
+    deviation_rate1 = #{deviationrate1,jdbcType=DECIMAL},
+    deviation_rate2 = #{deviationrate2,jdbcType=DECIMAL},
+    deviation_rate3 = #{deviationrate3,jdbcType=DECIMAL}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>