1

.idea/compiler.xml

@@ -7,10 +7,11 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <module name="ruoyi-common" />
         <module name="ruoyi-framework" />
-        <module name="ruoyi-generator" />
         <module name="ruoyi-system" />
+        <module name="ruoyi-powerdistribution" />
+        <module name="ruoyi-common" />
+        <module name="ruoyi-generator" />
         <module name="ruoyi-quartz" />
         <module name="ruoyi-admin" />
       </profile>

.idea/encodings.xml

@@ -9,6 +9,8 @@
     <file url="file://$PROJECT_DIR$/ruoyi-framework/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/ruoyi-generator/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/ruoyi-generator/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/ruoyi-powerdistribution/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/ruoyi-powerdistribution/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/ruoyi-quartz/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/ruoyi-quartz/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/ruoyi-system/src/main/java" charset="UTF-8" />

.idea/jarRepositories.xml

@@ -9,12 +9,12 @@
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="Central Repository" />
-      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
+      <option name="url" value="https://repo.maven.apache.org/maven2" />
     </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="Central Repository" />
-      <option name="url" value="https://repo.maven.apache.org/maven2" />
+      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
     </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
@@ -39,6 +39,11 @@
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="Central Repository" />
+      <option name="url" value="https://maven.aliyun.com/repository/public" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
       <option name="url" value="https://maven.aliyun.com/repository/central" />
     </remote-repository>
   </component>

.idea/misc.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="MavenProjectsManager">

.idea/workspace.xml

@@ -4,67 +4,7 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="9facbf72-701c-4047-ae32-5db472826bac" name="更改" comment="配置">
-      <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/common/enums/StampWarningTypeEnum.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/controller/HomeController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/controller/stamp/tax/AdsMatHyxtStampTaxContractInvoiceDController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/controller/stamp/tax/AdsMatHyxtStampTaxZhptInvoiceDController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/entity/AdsMatHyxtStampTaxContractInvoiceD.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/entity/AdsMatHyxtStampTaxZhptInvoiceD.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/entity/AdsMatHyxtStampTaxZhptInvoiceItemD.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/entity/po/HomeStampTaxCountPO.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/entity/vo/stamp/tax/HomeStampTaxCountVO.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/entity/vo/stamp/tax/WarningDataVo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/mapper/AdsMatHyxtStampTaxContractInvoiceDMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/mapper/AdsMatHyxtStampTaxZhptInvoiceDMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/mapper/AdsMatHyxtStampTaxZhptInvoiceItemDMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/service/IAdsMatHyxtStampTaxContractInvoiceDService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/service/IAdsMatHyxtStampTaxZhptInvoiceDService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/service/IAdsMatHyxtStampTaxZhptInvoiceItemDService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/service/impl/AdsMatHyxtStampTaxContractInvoiceDServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/service/impl/AdsMatHyxtStampTaxZhptInvoiceDServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/service/impl/AdsMatHyxtStampTaxZhptInvoiceItemDServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/excelTemplate/stampTax/stampTaxWarningExport.xlsx" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/excelTemplate/stampTax/stampTaxZhptInvoiceImport.xlsx" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/excelTemplate/stampTax/stampTaxZhptInvoiceItemImport.xlsx" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/mapper/hywz/AdsMatHyxtStampTaxContractInvoiceDMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/mapper/hywz/AdsMatHyxtStampTaxZhptInvoiceDMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/mapper/hywz/AdsMatHyxtStampTaxZhptInvoiceItemDMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/common/constants/StampWarningCheckRule.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/common/constants/StampWarningCheckRule.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/common/enums/StampBusinessTypeEnum.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/common/enums/StampBusinessTypeEnum.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/controller/stamp/tax/AdsMatHyxtStampTaxComputeDController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/controller/stamp/tax/AdsMatHyxtStampTaxComputeDController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/controller/stamp/tax/AdsMatHyxtStampTaxContractDController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/controller/stamp/tax/AdsMatHyxtStampTaxContractDController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/controller/stamp/tax/AdsMatHyxtStampTaxInvoiceDController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/controller/stamp/tax/AdsMatHyxtStampTaxInvoiceDController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/controller/stamp/tax/AdsMatHyxtStampTaxItemDController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/controller/stamp/tax/AdsMatHyxtStampTaxItemDController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/controller/stamp/tax/AdsMatHyxtStampTaxWarningDController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/controller/stamp/tax/AdsMatHyxtStampTaxWarningDController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/entity/AdsMatHyxtStampTaxComputeD.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/entity/AdsMatHyxtStampTaxComputeD.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/entity/AdsMatHyxtStampTaxContractD.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/entity/AdsMatHyxtStampTaxContractD.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/entity/AdsMatHyxtStampTaxInvoiceD.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/entity/AdsMatHyxtStampTaxInvoiceD.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/entity/AdsMatHyxtStampTaxItemD.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/entity/AdsMatHyxtStampTaxItemD.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/entity/AdsMatHyxtStampTaxWarningD.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/entity/AdsMatHyxtStampTaxWarningD.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/entity/AdsMatHyxtStampTaxWarningRuleD.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/entity/AdsMatHyxtStampTaxWarningRuleD.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/entity/po/DateQueryPO.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/entity/po/DateQueryPO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/entity/po/StampTaxComputeSavePO.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/entity/po/StampTaxComputeSavePO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/service/IAdsMatHyxtStampTaxComputeDService.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/service/IAdsMatHyxtStampTaxComputeDService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/service/IAdsMatHyxtStampTaxContractDService.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/service/IAdsMatHyxtStampTaxContractDService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/service/IAdsMatHyxtStampTaxInvoiceDService.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/service/IAdsMatHyxtStampTaxInvoiceDService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/service/IAdsMatHyxtStampTaxItemDService.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/service/IAdsMatHyxtStampTaxItemDService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/service/IAdsMatHyxtStampTaxWarningDService.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/service/IAdsMatHyxtStampTaxWarningDService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/service/IAdsMatHyxtStampTaxWarningRuleDService.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/service/IAdsMatHyxtStampTaxWarningRuleDService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/service/impl/AdsMatHyxtInvoiceApplyDServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/service/impl/AdsMatHyxtInvoiceApplyDServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/service/impl/AdsMatHyxtStampTaxComputeDServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/service/impl/AdsMatHyxtStampTaxComputeDServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/service/impl/AdsMatHyxtStampTaxContractDServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/service/impl/AdsMatHyxtStampTaxContractDServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/service/impl/AdsMatHyxtStampTaxInvoiceDServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/service/impl/AdsMatHyxtStampTaxInvoiceDServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/service/impl/AdsMatHyxtStampTaxItemDServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/service/impl/AdsMatHyxtStampTaxItemDServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/service/impl/AdsMatHyxtStampTaxWarningDServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/service/impl/AdsMatHyxtStampTaxWarningDServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/service/impl/AdsMatHyxtStampTaxWarningRuleDServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/service/impl/AdsMatHyxtStampTaxWarningRuleDServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/utils/DateUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/utils/DateUtil.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/utils/ScheduleTaskUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/hywz/utils/ScheduleTaskUtils.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/application-dev.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/excelTemplate/stampTax/stampTaxInvoiceExport.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/excelTemplate/stampTax/stampTaxInvoiceExport.xlsx" afterDir="false" />
-    </list>
+    <list default="true" id="9facbf72-701c-4047-ae32-5db472826bac" name="更改" comment="配置" />
     <list id="772f3166-c3ce-4d8f-9e2a-cca9497c312f" name="Changes" comment="" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -89,9 +29,8 @@
   <component name="MavenImportPreferences">
     <option name="generalSettings">
       <MavenGeneralSettings>
-        <option name="localRepository" value="D:\maven\maven_cwzjgk" />
-        <option name="mavenHome" value="$PROJECT_DIR$/../../../apache-maven-3.8.6-bin/apache-maven-3.8.6-bin" />
-        <option name="userSettingsFile" value="D:\apache-maven-3.8.6-bin\apache-maven-3.8.6-bin\conf\settings_cwzjgk.xml" />
+        <option name="mavenHome" value="D:/app/apache-maven-3.6.1" />
+        <option name="userSettingsFile" value="D:\app\apache-maven-3.6.1\conf\settings.xml" />
         <option name="workOffline" value="true" />
       </MavenGeneralSettings>
     </option>
@@ -99,6 +38,10 @@
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
   </component>
+  <component name="ProjectColorInfo"><![CDATA[{
+  "customColor": "",
+  "associatedIndex": 2
+}]]></component>
   <component name="ProjectId" id="2enVrb5xHmHXra7KLoXC5VNJ2kQ" />
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
@@ -362,6 +305,7 @@
       <workItem from="1731050095225" duration="643000" />
       <workItem from="1731162016448" duration="1243000" />
       <workItem from="1731163911004" duration="4000" />
+      <workItem from="1732780966010" duration="1229000" />
     </task>
     <task id="LOCAL-00001" summary="开票申请相关接口">
       <created>1712657818906</created>

pom.xml

@@ -179,6 +179,7 @@
         <module>ruoyi-quartz</module>
         <module>ruoyi-generator</module>
         <module>ruoyi-common</module>
+		<module>ruoyi-powerdistribution</module>
 
     </modules>
     <packaging>pom</packaging>

ruoyi-admin/pom.xml

@@ -84,7 +84,11 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-generator</artifactId>
         </dependency>
-
+        <!-- 配电模块-->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-powerdistribution</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>