update

common-cloud/tool-modules/general-data/src/main/resources/application-local.yml

@@ -1,13 +1,13 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://172.192.13.95:3306/common_data?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+    url: jdbc:mysql://192.168.20.210:3306/common_data?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
     username: root
     password: root
   redis:
-    host: 172.192.10.105
-    port: 30013
-    password:
+    host: 192.168.20.210
+    port: 6379
+    password: admin
   jackson:
     time-zone: Asia/Shanghai
     date-format: yyyy-MM-dd HH:mm:ss
@@ -16,12 +16,7 @@ mybatis:
   mapper-locations: classpath:mapper/*.xml
   type-aliases-package: com.huashe.common.domain.model,com.huashe.common.weather.model
 
-holiday:
-  cron: 0 0 8 1 * ?
-  url: https://unpkg.com/holiday-calendar@1.1.6/data/CN/#year#.json
-
 weather:
-  cron: 0 15 6 * * ?
   # 服务提供商
   service-provider: juhe
   region:

ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/controller/MeterReadingController.java

@@ -105,7 +105,7 @@ public class MeterReadingController extends BaseController {
     }
 
     /**
-     * 删除动力箱柜
+     * 删除
      */
     @RequiresPermissions("ems:meterReading:remove")
     @Log(title = "抄表记录", businessType = BusinessType.DELETE)
@@ -125,7 +125,7 @@ public class MeterReadingController extends BaseController {
         MeterDevice meterDevice = meterDeviceService.selectMeterDeviceByCode(meterRec.getDeviceCode());
 
         if (null != lastItem) {
-            meterRec.setYear(StringUtils.substring(lastItem.getYear(), 0, 4));
+            meterRec.setYear(StringUtils.substring(meterRec.getMeterMonth(), 0, 4));
             meterRec.setLastReading(lastItem.getMeterReading());
             meterRec.setLastTime(lastItem.getMeterTime());
             meterRec.setIncrease(