新增：

1、读取每天用水数据；
2、读取历史用水数据；
3、读取每天用电数据；
4、读取历史用电数据；

huimv-env-platform/.idea/workspace.xml

@@ -1,19 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="aea4e25b-646a-4ad1-9dc9-156d47497795" name="Default Changelist" comment="优化保温箱接收数据代码">
-      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
+    <list default="true" id="aea4e25b-646a-4ad1-9dc9-156d47497795" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/huimv-env-common/src/test/java/com/huimv/env/common/CodeGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/huimv-env-common/src/test/java/com/huimv/env/common/CodeGenerator.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/huimv-env-device/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/huimv-env-device/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/huimv-env-common/src/main/java/com/huimv/env/common/controller/EnvElectricityDayController.java" beforeDir="false" afterPath="$PROJECT_DIR$/huimv-env-manage/src/main/java/com/huimv/env/manage/controller/EnvElectricityDayController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/huimv-env-common/src/main/java/com/huimv/env/common/mapper/BaseDeviceCofigMapper.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/huimv-env-common/src/main/java/com/huimv/env/common/mapper/EnvWaterDayMapper.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/huimv-env-common/src/main/java/com/huimv/env/common/mapper/LampConfigMapper.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/huimv-env-common/src/main/java/com/huimv/env/common/mapper/xml/EnvWaterDayMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/huimv-env-common/src/main/java/com/huimv/env/common/service/EnvElectricityDayService.java" beforeDir="false" afterPath="$PROJECT_DIR$/huimv-env-common/src/main/java/com/huimv/env/common/service/EnvElectricityDayService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/huimv-env-common/src/main/java/com/huimv/env/common/service/EnvElectricityMonthService.java" beforeDir="false" afterPath="$PROJECT_DIR$/huimv-env-common/src/main/java/com/huimv/env/common/service/EnvElectricityMonthService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/huimv-env-common/src/main/java/com/huimv/env/common/service/EnvWaterDayService.java" beforeDir="false" afterPath="$PROJECT_DIR$/huimv-env-common/src/main/java/com/huimv/env/common/service/EnvWaterDayService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/huimv-env-common/src/main/java/com/huimv/env/common/service/EnvWaterMonthService.java" beforeDir="false" afterPath="$PROJECT_DIR$/huimv-env-common/src/main/java/com/huimv/env/common/service/EnvWaterMonthService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/huimv-env-common/src/main/java/com/huimv/env/common/service/IBaseDeviceCofigService.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/huimv-env-common/src/main/java/com/huimv/env/common/service/ILampConfigService.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/huimv-env-common/src/main/java/com/huimv/env/common/service/impl/BaseDeviceCofigServiceImpl.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/huimv-env-common/src/main/java/com/huimv/env/common/service/impl/EnvElectricityDayServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/huimv-env-common/src/main/java/com/huimv/env/common/service/impl/EnvElectricityDayServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/huimv-env-common/src/main/java/com/huimv/env/common/service/impl/EnvElectricityMonthServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/huimv-env-common/src/main/java/com/huimv/env/common/service/impl/EnvElectricityMonthServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/huimv-env-common/src/main/java/com/huimv/env/common/service/impl/EnvWaterDayServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/huimv-env-common/src/main/java/com/huimv/env/common/service/impl/EnvWaterDayServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/huimv-env-common/src/main/java/com/huimv/env/common/service/impl/EnvWaterMonthServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/huimv-env-common/src/main/java/com/huimv/env/common/service/impl/EnvWaterMonthServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/huimv-env-common/src/main/java/com/huimv/env/common/service/impl/LampConfigServiceImpl.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/huimv-env-common/src/main/java/com/huimv/env/common/utils/Const.java" beforeDir="false" afterPath="$PROJECT_DIR$/huimv-env-common/src/main/java/com/huimv/env/common/utils/Const.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/huimv-env-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/huimv-env-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/huimv-env-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/huimv-env-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/huimv-env-device/src/main/java/com/huimv/env/device/HuimvDeviceApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/huimv-env-device/src/main/java/com/huimv/env/device/HuimvDeviceApplication.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/huimv-env-device/src/main/java/com/huimv/env/device/listener/DeviceListener.java" beforeDir="false" afterPath="$PROJECT_DIR$/huimv-env-device/src/main/java/com/huimv/env/device/listener/DeviceListener.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/huimv-env-device/src/main/java/com/huimv/env/device/listener/SensorListener.java" beforeDir="false" afterPath="$PROJECT_DIR$/huimv-env-device/src/main/java/com/huimv/env/device/listener/SensorListener.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/huimv-env-device/src/main/java/com/huimv/env/device/service/IDeviceService.java" beforeDir="false" afterPath="$PROJECT_DIR$/huimv-env-device/src/main/java/com/huimv/env/device/service/IDeviceService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/huimv-env-device/src/main/java/com/huimv/env/device/service/impl/DeviceServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/huimv-env-device/src/main/java/com/huimv/env/device/service/impl/DeviceServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/huimv-env-lamp/src/main/java/com/huimv/env/lamp/service/impl/LampInputHandleServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/huimv-env-lamp/src/main/java/com/huimv/env/lamp/service/impl/LampInputHandleServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/huimv-env-manage/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/huimv-env-manage/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/huimv-env-manage/src/main/java/com/huimv/env/manage/HuimvEnvManageApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/huimv-env-manage/src/main/java/com/huimv/env/manage/HuimvEnvManageApplication.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/huimv-env-manage/src/main/java/com/huimv/env/manage/config/InterceptorConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/huimv-env-manage/src/main/java/com/huimv/env/manage/config/InterceptorConfig.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/huimv-env-manage/src/main/java/com/huimv/env/manage/controller/EnvWaterDayController.java" beforeDir="false" afterPath="$PROJECT_DIR$/huimv-env-manage/src/main/java/com/huimv/env/manage/controller/EnvWaterDayController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/huimv-env-manage/src/main/java/com/huimv/env/manage/mapper/EnvWaterDayMapper.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/huimv-env-manage/src/main/java/com/huimv/env/manage/mapper/EnvWaterMonthMapper.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/huimv-env-manage/src/main/java/com/huimv/env/manage/mapper/LampConfigMapper.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/huimv-env-manage/src/main/java/com/huimv/env/manage/mapper/xml/EnvWaterDayMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/huimv-env-manage/src/main/java/com/huimv/env/manage/service/EnvWaterDayService.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/huimv-env-manage/src/main/java/com/huimv/env/manage/service/EnvWaterMonthService.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/huimv-env-manage/src/main/java/com/huimv/env/manage/service/impl/EnvWaterDayServiceImpl.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/huimv-env-manage/src/main/java/com/huimv/env/manage/service/impl/EnvWaterMonthServiceImpl.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/huimv-env-manage/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/huimv-env-manage/src/main/resources/application-dev.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/huimv-env-manage/src/main/resources/application-prod.yml" beforeDir="false" afterPath="$PROJECT_DIR$/huimv-env-manage/src/main/resources/application-prod.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -98,7 +123,7 @@
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../cloud-platform" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/huimv-env-lamp/src/main/java/com/huimv/env/lamp/mapper" />
     <property name="project.structure.last.edited" value="Modules" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2" />
@@ -106,30 +131,30 @@
     <property name="settings.editor.selected.configurable" value="File.Encoding" />
   </component>
   <component name="RecentsManager">
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-device\src\main\resources\config" />
-    </key>
     <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
       <recent name="com.huimv.env.device.service" />
       <recent name="com.huimv.env.common.service" />
       <recent name="com.huimv.env.input" />
     </key>
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-lamp\src\main\java\com\huimv\env\lamp\mapper" />
+      <recent name="D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\mapper" />
+      <recent name="D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl" />
+      <recent name="D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service" />
+      <recent name="D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-input\src\main\resources" />
+    </key>
     <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="com.huimv.env.lamp.service" />
+      <recent name="com.huimv.env.lamp.service.impl" />
+      <recent name="com.huimv.env.lamp.mapper" />
       <recent name="com.huimv.env.common" />
       <recent name="com.huimv.env.manage" />
-      <recent name="com.huimv.env.device.producer" />
-      <recent name="com.huimv.env.common.utils" />
-      <recent name="com.huimv.env.device.config" />
     </key>
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-input\src\main\resources" />
-      <recent name="D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-device\src\main\resources" />
-      <recent name="D:\idea6\huimv.env.platform\huimv-env-platform" />
-      <recent name="D:\idea6\huimv.env.platform\huimv-env-platform\src\main\resources" />
-      <recent name="D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\config" />
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-device\src\main\resources\config" />
     </key>
   </component>
-  <component name="RunManager" selected="Application.CodeGenerator (1)">
+  <component name="RunManager" selected="Spring Boot.HuimvEnvManageApplication">
     <configuration name="CodeGenerator (1)" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="com.huimv.env.common.CodeGenerator" />
       <module name="huimv-env-common" />
@@ -221,8 +246,8 @@
     </configuration>
     <recent_temporary>
       <list>
-        <item itemvalue="Application.CodeGenerator (1)" />
         <item itemvalue="Spring Boot.HuimvDeviceApplication" />
+        <item itemvalue="Application.CodeGenerator (1)" />
         <item itemvalue="Application.CodeGenerator" />
         <item itemvalue="Application.HuimvEnvInputApplication" />
         <item itemvalue="JUnit.DeviceTest.test3" />
@@ -276,7 +301,13 @@
       <workItem from="1662538991378" duration="854000" />
       <workItem from="1663405853545" duration="628000" />
       <workItem from="1663490929068" duration="1954000" />
-      <workItem from="1666317958151" duration="17800000" />
+      <workItem from="1666317958151" duration="19556000" />
+      <workItem from="1666412481024" duration="600000" />
+      <workItem from="1666433863305" duration="813000" />
+      <workItem from="1666441750302" duration="1235000" />
+      <workItem from="1666497124475" duration="907000" />
+      <workItem from="1666597397678" duration="5102000" />
+      <workItem from="1666688023359" duration="10058000" />
     </task>
     <task id="LOCAL-00001" summary="新建环境控制平台">
       <created>1660656813145</created>
@@ -446,7 +477,14 @@
       <option name="project" value="LOCAL" />
       <updated>1661926653144</updated>
     </task>
-    <option name="localTasksCounter" value="25" />
+    <task id="LOCAL-00025" summary="新增：&#10;1、生成水表每天和每月数据。&#10;2、生成电表每天和每月数据。">
+      <created>1666344821794</created>
+      <option name="number" value="00025" />
+      <option name="presentableId" value="LOCAL-00025" />
+      <option name="project" value="LOCAL" />
+      <updated>1666344821794</updated>
+    </task>
+    <option name="localTasksCounter" value="26" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -485,85 +523,91 @@
     <MESSAGE value="删除show文件" />
     <MESSAGE value="修改平台推送问题。" />
     <MESSAGE value="修改端口号" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改端口号" />
+    <MESSAGE value="新增：生成水表每天和每月数据。" />
+    <MESSAGE value="新增：&#10;1、生成水表每天和每月数据。&#10;2、生成电表每天和每月数据。" />
+    <option name="LAST_COMMIT_MESSAGE" value="新增：&#10;1、生成水表每天和每月数据。&#10;2、生成电表每天和每月数据。" />
   </component>
   <component name="WindowStateProjectService">
     <state x="552" y="181" key="#Assign_Data_Sources" timestamp="1661413248338">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state x="552" y="181" key="#Assign_Data_Sources/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1661413248338" />
-    <state x="552" y="181" key="#Project_Structure" timestamp="1666259971505">
+    <state x="552" y="181" key="#Project_Structure" timestamp="1666692196404">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state x="552" y="181" key="#Project_Structure/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1666259971505" />
+    <state x="552" y="181" key="#Project_Structure/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1666692196404" />
     <state x="552" y="181" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1660731614165">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state x="552" y="181" key="#com.intellij.execution.impl.EditConfigurationsDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1660731614165" />
-    <state x="765" y="228" key="#com.intellij.ide.util.MemberChooser" timestamp="1666333104853">
+    <state x="624" y="328" key="#com.intellij.fileTypes.FileTypeChooser" timestamp="1666697339264">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state x="624" y="328" key="#com.intellij.fileTypes.FileTypeChooser/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1666697339264" />
+    <state x="765" y="228" key="#com.intellij.ide.util.MemberChooser" timestamp="1666699712472">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state x="765" y="228" key="#com.intellij.ide.util.MemberChooser/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1666333104853" />
+    <state x="765" y="228" key="#com.intellij.ide.util.MemberChooser/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1666699712472" />
     <state x="726" y="386" width="663" height="273" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.classes" timestamp="1660877046428">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state x="726" y="386" width="663" height="273" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.classes/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1660877046428" />
-    <state x="690" y="269" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1661419576972">
+    <state x="690" y="269" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1666692718011">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state x="690" y="269" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1661419576972" />
-    <state x="461" y="216" key="CommitChangelistDialog2" timestamp="1661926649626">
+    <state x="690" y="269" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1666692718011" />
+    <state x="461" y="216" key="CommitChangelistDialog2" timestamp="1666344814305">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state x="461" y="216" key="CommitChangelistDialog2/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1661926649626" />
+    <state x="461" y="216" key="CommitChangelistDialog2/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1666344814305" />
     <state x="92" y="92" width="1736" height="856" key="DiffContextDialog" timestamp="1661170245929">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state x="92" y="92" width="1736" height="856" key="DiffContextDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1661170245929" />
-    <state x="740" y="278" key="FileChooserDialogImpl" timestamp="1661151361195">
+    <state x="740" y="278" key="FileChooserDialogImpl" timestamp="1666442689749">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state x="740" y="278" key="FileChooserDialogImpl/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1661151361195" />
-    <state width="1877" height="2" key="GridCell.Tab.0.bottom" timestamp="1666341876903">
+    <state x="740" y="278" key="FileChooserDialogImpl/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1666442689749" />
+    <state width="1877" height="293" key="GridCell.Tab.0.bottom" timestamp="1666699578192">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state width="1877" height="315" key="GridCell.Tab.0.bottom/-1920.0.1920.1040/0.0.1920.1040@-1920.0.1920.1040" timestamp="1661594951986" />
-    <state width="1877" height="2" key="GridCell.Tab.0.bottom/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1666341876903" />
-    <state width="1877" height="2" key="GridCell.Tab.0.center" timestamp="1666341876903">
+    <state width="1877" height="293" key="GridCell.Tab.0.bottom/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1666699578192" />
+    <state width="1877" height="293" key="GridCell.Tab.0.center" timestamp="1666699578192">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state width="1877" height="315" key="GridCell.Tab.0.center/-1920.0.1920.1040/0.0.1920.1040@-1920.0.1920.1040" timestamp="1661594951985" />
-    <state width="1877" height="2" key="GridCell.Tab.0.center/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1666341876903" />
-    <state width="1877" height="2" key="GridCell.Tab.0.left" timestamp="1666341876903">
+    <state width="1877" height="293" key="GridCell.Tab.0.center/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1666699578192" />
+    <state width="1877" height="293" key="GridCell.Tab.0.left" timestamp="1666699578192">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state width="1877" height="315" key="GridCell.Tab.0.left/-1920.0.1920.1040/0.0.1920.1040@-1920.0.1920.1040" timestamp="1661594951985" />
-    <state width="1877" height="2" key="GridCell.Tab.0.left/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1666341876903" />
-    <state width="1877" height="2" key="GridCell.Tab.0.right" timestamp="1666341876903">
+    <state width="1877" height="293" key="GridCell.Tab.0.left/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1666699578192" />
+    <state width="1877" height="293" key="GridCell.Tab.0.right" timestamp="1666699578192">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state width="1877" height="315" key="GridCell.Tab.0.right/-1920.0.1920.1040/0.0.1920.1040@-1920.0.1920.1040" timestamp="1661594951985" />
-    <state width="1877" height="2" key="GridCell.Tab.0.right/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1666341876903" />
-    <state width="1877" height="302" key="GridCell.Tab.1.bottom" timestamp="1666332730986">
+    <state width="1877" height="293" key="GridCell.Tab.0.right/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1666699578192" />
+    <state width="1877" height="293" key="GridCell.Tab.1.bottom" timestamp="1666699578192">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state width="1877" height="315" key="GridCell.Tab.1.bottom/-1920.0.1920.1040/0.0.1920.1040@-1920.0.1920.1040" timestamp="1661594951987" />
-    <state width="1877" height="302" key="GridCell.Tab.1.bottom/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1666332730986" />
-    <state width="1877" height="302" key="GridCell.Tab.1.center" timestamp="1666332730986">
+    <state width="1877" height="293" key="GridCell.Tab.1.bottom/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1666699578192" />
+    <state width="1877" height="293" key="GridCell.Tab.1.center" timestamp="1666699578192">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state width="1877" height="315" key="GridCell.Tab.1.center/-1920.0.1920.1040/0.0.1920.1040@-1920.0.1920.1040" timestamp="1661594951987" />
-    <state width="1877" height="302" key="GridCell.Tab.1.center/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1666332730986" />
-    <state width="1877" height="302" key="GridCell.Tab.1.left" timestamp="1666332730986">
+    <state width="1877" height="293" key="GridCell.Tab.1.center/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1666699578192" />
+    <state width="1877" height="293" key="GridCell.Tab.1.left" timestamp="1666699578192">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state width="1877" height="315" key="GridCell.Tab.1.left/-1920.0.1920.1040/0.0.1920.1040@-1920.0.1920.1040" timestamp="1661594951987" />
-    <state width="1877" height="302" key="GridCell.Tab.1.left/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1666332730986" />
-    <state width="1877" height="302" key="GridCell.Tab.1.right" timestamp="1666332730986">
+    <state width="1877" height="293" key="GridCell.Tab.1.left/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1666699578192" />
+    <state width="1877" height="293" key="GridCell.Tab.1.right" timestamp="1666699578192">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state width="1877" height="315" key="GridCell.Tab.1.right/-1920.0.1920.1040/0.0.1920.1040@-1920.0.1920.1040" timestamp="1661594951987" />
-    <state width="1877" height="302" key="GridCell.Tab.1.right/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1666332730986" />
+    <state width="1877" height="293" key="GridCell.Tab.1.right/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1666699578192" />
     <state x="574" y="255" key="JpaSupport:com.ifengxue.plugin.gui.AutoGeneratorSettingsDialog" timestamp="1660903124149">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
@@ -576,27 +620,31 @@
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state x="490" y="178" key="Maven.ArtifactSearchDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1661145710163" />
+    <state x="669" y="236" key="MultipleFileMergeDialog" timestamp="1666699821559">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state x="669" y="236" key="MultipleFileMergeDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1666699821559" />
     <state x="463" y="165" key="SettingsEditor" timestamp="1661146123419">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state x="463" y="165" key="SettingsEditor/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1661146123419" />
-    <state x="552" y="256" key="Vcs.Push.Dialog.v2" timestamp="1661926654483">
+    <state x="552" y="256" key="Vcs.Push.Dialog.v2" timestamp="1666344824415">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state x="552" y="256" key="Vcs.Push.Dialog.v2/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1661926654483" />
-    <state x="754" y="438" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1666344670853">
+    <state x="552" y="256" key="Vcs.Push.Dialog.v2/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1666344824415" />
+    <state x="754" y="438" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1666699827377">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state x="-1166" y="438" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/-1920.0.1920.1040/0.0.1920.1040@-1920.0.1920.1040" timestamp="1661594947139" />
-    <state x="754" y="438" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1666344670853" />
+    <state x="754" y="438" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1666699827377" />
     <state x="-1779" y="0" width="1323" height="999" key="dock-window-1" timestamp="1666320788567">
       <screen x="-1920" y="0" width="1920" height="1040" />
     </state>
     <state x="-1779" y="0" width="1323" height="999" key="dock-window-1/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1666320788567" />
-    <state x="580" y="246" width="759" height="548" key="find.popup" timestamp="1662427069535">
+    <state x="580" y="246" width="759" height="548" key="find.popup" timestamp="1666693314888">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state x="580" y="246" width="759" height="548" key="find.popup/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1662427069535" />
+    <state x="580" y="246" width="759" height="548" key="find.popup/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1666693314888" />
     <state x="334" y="46" key="new project wizard" timestamp="1660737465619">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
@@ -605,6 +653,10 @@
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state x="663" y="152" key="refactoring.ChangeSignatureDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1666339863274" />
+    <state x="616" y="240" key="run.anything.popup" timestamp="1666693152040">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state x="616" y="240" key="run.anything.popup/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1666693152040" />
     <state x="623" y="225" width="672" height="678" key="search.everywhere.popup" timestamp="1660827351945">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/controller/EnvElectricityDayController.java

@@ -1,21 +0,0 @@
-package com.huimv.env.common.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zn
- * @since 2022-10-21
- */
-@RestController
-@RequestMapping("/env-electricity-day")
-public class EnvElectricityDayController {
-
-}
-

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/mapper/BaseDeviceCofigMapper.java

@@ -1,16 +0,0 @@
-package com.huimv.env.common.mapper;
-
-import com.huimv.env.common.dao.entity.BaseDeviceCofig;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author author
- * @since 2022-10-18
- */
-public interface BaseDeviceCofigMapper extends BaseMapper<BaseDeviceCofig> {
-
-}

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/mapper/xml/EnvWaterDayMapper.xml

@@ -13,8 +13,8 @@
         <result column="unit_id" property="unitId" />
         <result column="farm_code" property="farmCode" />
         <result column="data_unit" property="dataUnit" />
-        <result column="start_warter" property="startWarter" />
-        <result column="end_warter" property="endWarter" />
+        <result column="start_warter" property="startWater" />
+        <result column="end_warter" property="endWater" />
         <result column="start_time" property="startTime" />
         <result column="end_time" property="endTime" />
     </resultMap>

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/service/EnvElectricityDayService.java

@@ -1,12 +1,15 @@
 package com.huimv.env.common.service;
 
 import com.alibaba.fastjson.JSONObject;
+import com.huimv.common.utils.Result;
 import com.huimv.env.common.dao.entity.EnvDeviceRegisterEntity;
 import com.huimv.env.common.entity.EnvElectricityDay;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.sql.Date;
 import java.sql.Timestamp;
+import java.text.ParseException;
+import java.util.Map;
 
 /**
  * <p>
@@ -23,4 +26,6 @@ public interface EnvElectricityDayService extends IService<EnvElectricityDay> {
     void saveDayElectricity(JSONObject dataJo, EnvDeviceRegisterEntity envDeviceRegisterEntity, Timestamp nowTimestamp, Date todayDate, String farmCode);
 
     void updateDayElectricity(EnvElectricityDay envElectricityDay, JSONObject dataJo, EnvDeviceRegisterEntity envDeviceRegisterEntity, Timestamp nowTimestamp, Date todayDate, String farmCode);
+
+    Result getTodayElectricity(Map<String, String> paramsMap) throws ParseException;
 }

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/service/EnvElectricityMonthService.java

@@ -1,11 +1,13 @@
 package com.huimv.env.common.service;
 
 import com.alibaba.fastjson.JSONObject;
+import com.huimv.common.utils.Result;
 import com.huimv.env.common.dao.entity.EnvDeviceRegisterEntity;
 import com.huimv.env.common.entity.EnvElectricityMonth;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.sql.Timestamp;
+import java.util.Map;
 
 /**
  * <p>
@@ -22,4 +24,6 @@ public interface EnvElectricityMonthService extends IService<EnvElectricityMonth
     void saveMonthElectricity(JSONObject dataJo, EnvDeviceRegisterEntity envDeviceRegisterEntity, Timestamp nowTimestamp, String year, String month, String farmCode);
 
     void updateMonthElectricity(EnvElectricityMonth envElectricityMonth, JSONObject dataJo, Timestamp nowTimestamp);
+
+    Result getMonthElectricity(Map<String, String> paramsMap);
 }

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/service/EnvWaterDayService.java

@@ -1,13 +1,15 @@
 package com.huimv.env.common.service;
 
 import com.alibaba.fastjson.JSONObject;
+import com.huimv.common.utils.Result;
 import com.huimv.env.common.dao.entity.EnvDeviceRegisterEntity;
 import com.huimv.env.common.entity.EnvElectricityDay;
 import com.huimv.env.common.entity.EnvWaterDay;
 import com.baomidou.mybatisplus.extension.service.IService;
-
 import java.sql.Date;
 import java.sql.Timestamp;
+import java.text.ParseException;
+import java.util.Map;
 
 /**
  * <p>
@@ -27,6 +29,8 @@ public interface EnvWaterDayService extends IService<EnvWaterDay> {
 
     EnvWaterDay getDayWaterConsumption(String farmCode, String deviceCode, String sensorSn, Date todayDate);
 
+    Result getTodayWater(Map<String, String> paramsMap) throws ParseException;
+
 //    void saveDayElectricity(JSONObject dataJo, EnvDeviceRegisterEntity envDeviceRegisterEntity, Timestamp nowTimestamp, Date todayDate, String farmCode);
 
 //    void updateDayElectricity(EnvElectricityDay envElectricityDay, JSONObject dataJo, EnvDeviceRegisterEntity envDeviceRegisterEntity, Timestamp nowTimestamp, Date todayDate, String farmCode);

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/service/EnvWaterMonthService.java

@@ -1,11 +1,13 @@
 package com.huimv.env.common.service;
 
 import com.alibaba.fastjson.JSONObject;
+import com.huimv.common.utils.Result;
 import com.huimv.env.common.dao.entity.EnvDeviceRegisterEntity;
 import com.huimv.env.common.entity.EnvWaterMonth;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.sql.Timestamp;
+import java.util.Map;
 
 /**
  * <p>
@@ -24,4 +26,6 @@ public interface EnvWaterMonthService extends IService<EnvWaterMonth> {
     void updateMonthWater(EnvWaterMonth envWaterMonth, JSONObject dataJo, Timestamp nowTimestamp, String year, String month, String farmCode);
 
     EnvWaterMonth getMonthWaterConsumption(String farmCode, String deviceCode, String sensorSn, String year, String month);
+
+    Result getMonthWater(Map<String, String> paramsMap);
 }

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/service/IBaseDeviceCofigService.java

@@ -1,16 +0,0 @@
-package com.huimv.env.common.service;
-
-import com.huimv.env.common.dao.entity.BaseDeviceCofig;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author author
- * @since 2022-10-18
- */
-public interface IBaseDeviceCofigService {
-
-}

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/service/impl/BaseDeviceCofigServiceImpl.java

@@ -1,20 +0,0 @@
-package com.huimv.env.common.service.impl;
-
-import com.huimv.env.common.dao.entity.BaseDeviceCofig;
-import com.huimv.env.common.mapper.BaseDeviceCofigMapper;
-import com.huimv.env.common.service.IBaseDeviceCofigService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author author
- * @since 2022-10-18
- */
-@Service
-public class BaseDeviceCofigServiceImpl implements IBaseDeviceCofigService {
-
-}

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/service/impl/EnvElectricityDayServiceImpl.java

@@ -2,18 +2,24 @@ package com.huimv.env.common.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
 import com.huimv.env.common.dao.entity.EnvDeviceRegisterEntity;
 import com.huimv.env.common.entity.EnvElectricityDay;
 import com.huimv.env.common.entity.EnvWaterDay;
 import com.huimv.env.common.mapper.EnvElectricityDayMapper;
 import com.huimv.env.common.service.EnvElectricityDayService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.env.common.utils.Const;
+import com.huimv.env.common.utils.DateUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.sql.Date;
 import java.sql.Timestamp;
+import java.text.ParseException;
+import java.util.Map;
 
 /**
  * <p>
@@ -39,6 +45,24 @@ public class EnvElectricityDayServiceImpl extends ServiceImpl<EnvElectricityDayM
     }
 
     @Override
+    public Result getTodayElectricity(Map<String, String> paramsMap) throws ParseException {
+        DateUtil dateUtil = new DateUtil();
+        String farmCode = paramsMap.get("farmCode");
+        String deviceCode = paramsMap.get("deviceCode");
+        QueryWrapper<EnvElectricityDay> queryWrapper = new QueryWrapper();
+        queryWrapper.eq("farm_code", farmCode);
+        queryWrapper.eq("device_code", deviceCode);
+        queryWrapper.eq("add_date", dateUtil.getTodayDate());
+        EnvElectricityDay envElectricityDay = envElectricityDayMapper.selectOne(queryWrapper);
+        if(envElectricityDay == null){
+            return new Result(Const.ERR_TODAY_ELECTRICITY_CODE,Const.ERR_TODAY_ELECTRICITY_INFO,false);
+        }else{
+            return new Result(ResultCode.SUCCESS,envElectricityDay);
+        }
+
+    }
+
+    @Override
     public void saveDayElectricity(JSONObject dataJo, EnvDeviceRegisterEntity envDeviceRegisterEntity, Timestamp nowTimestamp, Date todayDate, String farmCode) {
         String newWaterValue = dataJo.getString("value");
         BigDecimal newElectricityBd = new BigDecimal(newWaterValue).divide(new BigDecimal("100"), 2, BigDecimal.ROUND_HALF_UP);

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/service/impl/EnvElectricityMonthServiceImpl.java

@@ -2,6 +2,8 @@ package com.huimv.env.common.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
 import com.huimv.env.common.dao.entity.EnvDeviceRegisterEntity;
 import com.huimv.env.common.entity.EnvElectricityMonth;
 import com.huimv.env.common.entity.EnvWaterMonth;
@@ -13,6 +15,9 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -74,6 +79,22 @@ public class EnvElectricityMonthServiceImpl extends ServiceImpl<EnvElectricityMo
         System.out.println("编辑记录数="+rows);
     }
 
+    @Override
+    public Result getMonthElectricity(Map<String, String> paramsMap) {
+        String farmCode = paramsMap.get("farmCode");
+        String months = paramsMap.get("months");
+        QueryWrapper<EnvElectricityMonth> queryWrapper = new QueryWrapper();
+        queryWrapper.eq("farm_code", farmCode);
+        queryWrapper.orderByDesc("year").orderByDesc("month");
+        queryWrapper.last("LIMIT "+months);
+        List<EnvElectricityMonth> envElectricityMonthList = envElectricityMonthMapper.selectList(queryWrapper);
+        List monthList = new ArrayList();
+        for(int a=envElectricityMonthList.size()-1;a>=0;a--){
+            monthList.add(envElectricityMonthList.get(a));
+        }
+        return new Result(ResultCode.SUCCESS,monthList);
+    }
+
     //读取环比
     private BigDecimal _getLinkRelativeRatio(BigDecimal newWaterBd, String deviceCode, String sensorSn, String year, String month, String farmCode) {
         QueryWrapper<EnvElectricityMonth> queryWrapper = new QueryWrapper();

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/service/impl/EnvWaterDayServiceImpl.java

@@ -2,18 +2,23 @@ package com.huimv.env.common.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
 import com.huimv.env.common.dao.entity.EnvDeviceRegisterEntity;
 import com.huimv.env.common.entity.EnvWaterDay;
-import com.huimv.env.common.entity.EnvWaterMonth;
 import com.huimv.env.common.mapper.EnvWaterDayMapper;
 import com.huimv.env.common.service.EnvWaterDayService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.env.common.utils.Const;
+import com.huimv.env.common.utils.DateUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.sql.Date;
 import java.sql.Timestamp;
+import java.text.ParseException;
+import java.util.Map;
 
 /**
  * <p>
@@ -39,6 +44,24 @@ public class EnvWaterDayServiceImpl extends ServiceImpl<EnvWaterDayMapper, EnvWa
     }
 
     @Override
+    public Result getTodayWater(Map<String, String> paramsMap) throws ParseException {
+        DateUtil dateUtil = new DateUtil();
+        String farmCode = paramsMap.get("farmCode");
+        String deviceCode = paramsMap.get("deviceCode");
+        QueryWrapper<EnvWaterDay> queryWrapper = new QueryWrapper();
+        queryWrapper.eq("farm_code", farmCode);
+        queryWrapper.eq("device_code", deviceCode);
+        queryWrapper.eq("add_date", dateUtil.getTodayDate());
+        //读取当天的记录
+        EnvWaterDay envWaterDay = envWaterDayMapper.selectOne(queryWrapper);
+        if(envWaterDay == null){
+            return new Result(Const.ERR_TODAY_WATER_CODE,Const.ERR_TODAY_WATER_INFO,false);
+        }else{
+            return new Result(ResultCode.SUCCESS,envWaterDay);
+        }
+    }
+
+    @Override
     public void saveDayWater(JSONObject dataJo, EnvDeviceRegisterEntity envDeviceRegisterEntity, Timestamp nowTimestamp, Date todayDate, String farmCode) {
         String newWaterValue = dataJo.getString("value");
         BigDecimal newWaterBd = new BigDecimal(newWaterValue).divide(new BigDecimal("100"), 2, BigDecimal.ROUND_HALF_UP);

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/service/impl/EnvWaterMonthServiceImpl.java

@@ -2,6 +2,8 @@ package com.huimv.env.common.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
 import com.huimv.env.common.dao.entity.EnvDeviceRegisterEntity;
 import com.huimv.env.common.entity.EnvWaterMonth;
 import com.huimv.env.common.mapper.EnvWaterMonthMapper;
@@ -12,6 +14,9 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -38,6 +43,22 @@ public class EnvWaterMonthServiceImpl extends ServiceImpl<EnvWaterMonthMapper, E
     }
 
     @Override
+    public Result getMonthWater(Map<String, String> paramsMap) {
+        String farmCode = paramsMap.get("farmCode");
+        String months = paramsMap.get("months");
+        QueryWrapper<EnvWaterMonth> queryWrapper = new QueryWrapper();
+        queryWrapper.eq("farm_code", farmCode);
+        queryWrapper.orderByDesc("year").orderByDesc("month");
+        queryWrapper.last("LIMIT "+months);
+        List<EnvWaterMonth> envWaterMonthList = envWaterMonthMapper.selectList(queryWrapper);
+        List monthList = new ArrayList();
+        for(int a=envWaterMonthList.size()-1;a>=0;a--){
+            monthList.add(envWaterMonthList.get(a));
+        }
+        return new Result(ResultCode.SUCCESS,monthList);
+    }
+
+    @Override
     public void saveMonthWater(JSONObject dataJo, EnvDeviceRegisterEntity envDeviceRegisterEntity, Timestamp nowTimestamp, String year, String month, String farmCode) {
         String newWaterValue = dataJo.getString("value");
         BigDecimal newWaterBd = new BigDecimal(newWaterValue).divide(new BigDecimal("100"), 2, BigDecimal.ROUND_HALF_UP);

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/utils/Const.java

@@ -54,11 +54,15 @@ public class Const {
     public final static String QUEUE_WATER_METER = "topic.waterMeter.queue";
     public final static String EXCHANGE_WATER_METER = "topic.waterMeter.exchange";
 
-
     // 电表
     public final static String ROUTING_KEY_ELECTRICITY_METER = "topic.electricityMeter.key";
     public final static String QUEUE_ELECTRICITY_METER = "topic.electricityMeter.queue";
     public final static String EXCHANGE_ELECTRICITY_METER = "topic.electricityMeter.exchange";
 
+    public final static Integer ERR_TODAY_WATER_CODE = 10050;
+    public final static String ERR_TODAY_WATER_INFO = "今天水量数据不存在";
+
+    public final static Integer ERR_TODAY_ELECTRICITY_CODE = 10051;
+    public final static String ERR_TODAY_ELECTRICITY_INFO = "今天电量数据不存在";
 
 }

huimv-env-platform/huimv-env-device/src/main/java/com/huimv/env/device/HuimvDeviceApplication.java

@@ -17,8 +17,7 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
  * @Author : ZhuoNing
  * @Create : 2020-12-25
  **/
-@ComponentScans({@ComponentScan("com.huimv.env.common.utils"),
-@ComponentScan("com.huimv.env.common.service")})
+@ComponentScans({@ComponentScan("com.huimv.env.common.utils"), @ComponentScan("com.huimv.env.common.service")})
 @EntityScan(value = "com.huimv.env.common.dao.entity")
 @EnableJpaRepositories(basePackages = "com.huimv.env.common.dao.repo")
 @EnableConfigurationProperties

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/mapper/LampConfigMapper.java

@@ -1,7 +1,7 @@
-package com.huimv.env.common.mapper;
+package com.huimv.env.lamp.mapper;
 
-import com.huimv.env.common.dao.entity.LampConfig;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.env.common.dao.entity.LampConfig;
 
 /**
  * <p>

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/service/ILampConfigService.java

@@ -1,4 +1,4 @@
-package com.huimv.env.common.service;
+package com.huimv.env.lamp.service;
 
 import com.huimv.env.common.dao.entity.LampConfigEntity;
 

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/service/impl/LampConfigServiceImpl.java

@@ -1,8 +1,8 @@
-package com.huimv.env.common.service.impl;
+package com.huimv.env.lamp.service.impl;
 
 import com.huimv.env.common.dao.entity.LampConfigEntity;
 import com.huimv.env.common.dao.repo.LampConfigEntityRepo;
-import com.huimv.env.common.service.ILampConfigService;
+import com.huimv.env.lamp.service.ILampConfigService;
 import org.springframework.data.domain.Example;
 import org.springframework.stereotype.Service;
 

huimv-env-platform/huimv-env-lamp/src/main/java/com/huimv/env/lamp/service/impl/LampInputHandleServiceImpl.java

@@ -2,10 +2,10 @@ package com.huimv.env.lamp.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.huimv.env.common.dao.entity.LampConfigEntity;
-import com.huimv.env.common.service.ILampConfigService;
 import com.huimv.env.common.service.ILampTempService;
 import com.huimv.env.common.utils.DateUtil;
 import com.huimv.env.common.utils.MathUtil;
+import com.huimv.env.lamp.service.ILampConfigService;
 import com.huimv.env.lamp.service.LampInputHandleService;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;

huimv-env-platform/huimv-env-manage/pom.xml

@@ -148,6 +148,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-amqp</artifactId>
         </dependency>
+        <!-- 一方包统一版本管理 -->
+        <dependency>
+            <groupId>com.huimv</groupId>
+            <artifactId>huimv-env-common</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/controller/EnvElectricityDayController.java

@@ -0,0 +1,47 @@
+package com.huimv.env.manage.controller;
+
+
+import com.huimv.common.utils.Result;
+import com.huimv.env.common.service.EnvElectricityDayService;
+import com.huimv.env.common.service.EnvElectricityMonthService;
+import com.huimv.env.common.service.EnvWaterDayService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.text.ParseException;
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author zn
+ * @since 2022-10-21
+ */
+@RestController
+@RequestMapping("/envElectricity")
+public class EnvElectricityDayController {
+    @Autowired
+    private EnvElectricityDayService envElectricityDayService;
+    @Resource
+    private EnvElectricityMonthService envElectricityMonthService;
+
+    @PostMapping("/getTodayElectricity")
+    public Result getTodayElectricity(@RequestBody Map<String, String> paramsMap) throws ParseException {
+        //
+        return envElectricityDayService.getTodayElectricity(paramsMap);
+    }
+
+    @PostMapping("/getMonthElectricity")
+    public Result getMonthElectricity(@RequestBody Map<String, String> paramsMap) throws ParseException {
+        //
+        return envElectricityMonthService.getMonthElectricity(paramsMap);
+    }
+}
+

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/controller/EnvWaterDayController.java

@@ -1,10 +1,20 @@
 package com.huimv.env.manage.controller;
 
 
+import com.huimv.common.utils.Result;
+import com.huimv.env.common.service.EnvWaterDayService;
+import com.huimv.env.common.service.EnvWaterMonthService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+import java.text.ParseException;
+import java.util.Map;
+
 /**
  * <p>
  *  前端控制器
@@ -14,8 +24,23 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2022-10-20
  */
 @RestController
-@RequestMapping("/env-water-day")
+@RequestMapping("/envWater")
 public class EnvWaterDayController {
+    @Autowired
+    private EnvWaterDayService envWaterDayService;
+    @Resource
+    private EnvWaterMonthService envWaterMonthService;
+
+    @PostMapping("/getTodayWater")
+    public Result getTodayWater(@RequestBody Map<String, String> paramsMap) throws ParseException {
+        //
+        return envWaterDayService.getTodayWater(paramsMap);
+    }
 
+    @PostMapping("/getMonthWater")
+    public Result getMonthWater(@RequestBody Map<String, String> paramsMap) throws ParseException {
+        //
+        return envWaterMonthService.getMonthWater(paramsMap);
+    }
 }
 

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/mapper/EnvWaterDayMapper.java

@@ -1,16 +0,0 @@
-package com.huimv.env.manage.mapper;
-
-import com.huimv.env.manage.entity.EnvWaterDay;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zn
- * @since 2022-10-20
- */
-public interface EnvWaterDayMapper extends BaseMapper<EnvWaterDay> {
-
-}

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/mapper/EnvWaterMonthMapper.java

@@ -1,16 +0,0 @@
-package com.huimv.env.manage.mapper;
-
-import com.huimv.env.manage.entity.EnvWaterMonth;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zn
- * @since 2022-10-20
- */
-public interface EnvWaterMonthMapper extends BaseMapper<EnvWaterMonth> {
-
-}

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/mapper/xml/EnvWaterDayMapper.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huimv.env.manage.mapper.EnvWaterDayMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.huimv.env.manage.entity.EnvWaterDay">
-        <id column="id" property="id" />
-        <result column="device_code" property="deviceCode" />
-        <result column="sensor_sn" property="sensorSn" />
-        <result column="day_water" property="dayWater" />
-        <result column="add_date" property="addDate" />
-        <result column="pigpen_id" property="pigpenId" />
-        <result column="unit_id" property="unitId" />
-        <result column="farm_code" property="farmCode" />
-        <result column="data_unit" property="dataUnit" />
-        <result column="start_warter" property="startWarter" />
-        <result column="end_warter" property="endWarter" />
-        <result column="start_time" property="startTime" />
-        <result column="end_time" property="endTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, device_code, sensor_sn, day_water, add_date, pigpen_id, unit_id, farm_code, data_unit, start_warter, end_warter, start_time, end_time
-    </sql>
-
-</mapper>

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/service/EnvWaterDayService.java

@@ -1,16 +0,0 @@
-package com.huimv.env.manage.service;
-
-import com.huimv.env.manage.entity.EnvWaterDay;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zn
- * @since 2022-10-20
- */
-public interface EnvWaterDayService extends IService<EnvWaterDay> {
-
-}

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/service/EnvWaterMonthService.java

@@ -1,16 +0,0 @@
-package com.huimv.env.manage.service;
-
-import com.huimv.env.manage.entity.EnvWaterMonth;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zn
- * @since 2022-10-20
- */
-public interface EnvWaterMonthService extends IService<EnvWaterMonth> {
-
-}

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/service/impl/EnvWaterDayServiceImpl.java

@@ -1,20 +0,0 @@
-package com.huimv.env.manage.service.impl;
-
-import com.huimv.env.manage.entity.EnvWaterDay;
-import com.huimv.env.manage.mapper.EnvWaterDayMapper;
-import com.huimv.env.manage.service.EnvWaterDayService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author zn
- * @since 2022-10-20
- */
-@Service
-public class EnvWaterDayServiceImpl extends ServiceImpl<EnvWaterDayMapper, EnvWaterDay> implements EnvWaterDayService {
-
-}

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/service/impl/EnvWaterMonthServiceImpl.java

@@ -1,20 +0,0 @@
-package com.huimv.env.manage.service.impl;
-
-import com.huimv.env.manage.entity.EnvWaterMonth;
-import com.huimv.env.manage.mapper.EnvWaterMonthMapper;
-import com.huimv.env.manage.service.EnvWaterMonthService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author zn
- * @since 2022-10-20
- */
-@Service
-public class EnvWaterMonthServiceImpl extends ServiceImpl<EnvWaterMonthMapper, EnvWaterMonth> implements EnvWaterMonthService {
-
-}

huimv-env-platform/huimv-env-manage/src/main/resources/application-dev.yml

@@ -2,10 +2,11 @@ server:
   port: 8096
 spring:
   application:
-    name: huimv-eartag2-manage
+    name: huimv-env-manage
 
   datasource:
-    url: jdbc:mysql://115.238.57.190:3306/huimv-env-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#    url: jdbc:mysql://115.238.57.190:3306/huimv-env-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://192.168.1.7:3306/huimv-env-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver

huimv-env-platform/huimv-env-manage/src/main/resources/application-prod.yml

@@ -6,7 +6,7 @@ server:
     key-store-password: RLKkWail
 spring:
   application:
-    name: huimv-env-input
+    name: huimv-env-manage
 
   datasource:
     url: jdbc:mysql://192.168.1.7:3306/huimv-env-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai