报修系统测试版本

.idea/workspace.xml

@@ -5,16 +5,13 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="1da94ed8-6954-4dbc-8f54-8617863a9948" name="Default Changelist" comment="">
-<<<<<<< HEAD
       <change beforePath="$PROJECT_DIR$/target/repair_system-0.0.1-SNAPSHOT.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/repair_system-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
-=======
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/core/JwtlnterceptorConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/core/JwtlnterceptorConfig.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairPayRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairPayRecordMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/META-INF/spring-configuration-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/META-INF/spring-configuration-metadata.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairPayRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/repair/RepairPayRecordMapper.xml" afterDir="false" />
->>>>>>> e498a2080f3c73eba053126721f416b19b78a487
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -24,7 +21,6 @@
   <component name="DefaultGradleProjectSettings">
     <option name="isMigrated" value="true" />
   </component>
-<<<<<<< HEAD
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
@@ -116,8 +112,6 @@
       </file>
     </leaf>
   </component>
-=======
->>>>>>> e498a2080f3c73eba053126721f416b19b78a487
   <component name="FindInProjectRecents">
     <findStrings>
       <find>.updateReceiving</find>
@@ -210,7 +204,7 @@
   </component>
   <component name="ProjectFrameBounds">
     <option name="x" value="-7" />
-    <option name="width" value="974" />
+    <option name="width" value="958" />
     <option name="height" value="1039" />
   </component>
   <component name="ProjectId" id="2ahuEEqvb7VL7aZNfgOouNVEGo4" />
@@ -442,16 +436,6 @@
     <option name="showExcludedFiles" value="false" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "WebServerToolWindowFactoryState": "false",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "settings.editor.selected.configurable": "MavenSettings"
-  }
-}]]></component>
   <component name="RebelAgentSelection">
     <selection>jr</selection>
   </component>
@@ -529,16 +513,13 @@
       <workItem from="1703559777337" duration="33320000" />
       <workItem from="1704348824442" duration="277000" />
       <workItem from="1704349398193" duration="82000" />
-<<<<<<< HEAD
       <workItem from="1704767932421" duration="1771000" />
       <workItem from="1704770873140" duration="45000" />
       <workItem from="1704771344487" duration="627000" />
       <workItem from="1704783277575" duration="366000" />
       <workItem from="1704788101380" duration="920000" />
-=======
       <workItem from="1704767932421" duration="1298000" />
       <workItem from="1704783020212" duration="1956000" />
->>>>>>> e498a2080f3c73eba053126721f416b19b78a487
     </task>
     <servers />
   </component>
@@ -618,8 +599,6 @@
           <line>1666</line>
           <option name="timeStamp" value="4" />
         </line-breakpoint>
-<<<<<<< HEAD
-=======
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java</url>
           <line>680</line>
@@ -635,7 +614,6 @@
           <line>574</line>
           <option name="timeStamp" value="8" />
         </line-breakpoint>
->>>>>>> e498a2080f3c73eba053126721f416b19b78a487
       </breakpoints>
     </breakpoint-manager>
   </component>

src/main/resources/application-dev.yml

@@ -12,8 +12,8 @@ spring:
     allow-circular-references: true
   datasource:
     username: root
-    password: root
-    url: jdbc:mysql://localhost:3306/repair_report?useUnicode=tru&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true&allowPublicKeyRetrieval=true&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
+    password: Chuanghai_2023.
+    url: jdbc:mysql://172.16.20.95:3306/repair_test?useUnicode=tru&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true&allowPublicKeyRetrieval=true&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
     driver-class-name: com.mysql.cj.jdbc.Driver
     cache:
       type: redis

src/main/resources/application-prod.yml

@@ -13,7 +13,7 @@ spring:
   datasource:
     username: root
     password: Chuanghai_2023.
-    url: jdbc:mysql://172.16.20.95:3306/repair_report?characterEncoding=UTF-8&share_videosuseSSL=false&useUnicode=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://172.16.20.95:3306/repair_test?useUnicode=tru&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true&allowPublicKeyRetrieval=true&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
     driver-class-name: com.mysql.cj.jdbc.Driver
     cache:
       type: redis

src/main/resources/application.yml

@@ -5,7 +5,7 @@ server:
 
 spring:
   profiles:
-      active: prod
+      active: dev
   servlet:
     multipart:
       max-file-size: 30MB     #单个文件最大限制

target/classes/application-dev.yml

@@ -12,8 +12,8 @@ spring:
     allow-circular-references: true
   datasource:
     username: root
-    password: root
-    url: jdbc:mysql://localhost:3306/repair_report?useUnicode=tru&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true&allowPublicKeyRetrieval=true&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
+    password: Chuanghai_2023.
+    url: jdbc:mysql://172.16.20.95:3306/repair_test?useUnicode=tru&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true&allowPublicKeyRetrieval=true&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
     driver-class-name: com.mysql.cj.jdbc.Driver
     cache:
       type: redis

target/classes/application-prod.yml

@@ -13,7 +13,7 @@ spring:
   datasource:
     username: root
     password: Chuanghai_2023.
-    url: jdbc:mysql://172.16.20.95:3306/repair_report?characterEncoding=UTF-8&share_videosuseSSL=false&useUnicode=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://172.16.20.95:3306/repair_test?useUnicode=tru&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true&allowPublicKeyRetrieval=true&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
     driver-class-name: com.mysql.cj.jdbc.Driver
     cache:
       type: redis

target/classes/application.yml

@@ -5,7 +5,7 @@ server:
 
 spring:
   profiles:
-      active: prod
+      active: dev
   servlet:
     multipart:
       max-file-size: 30MB     #单个文件最大限制

target/classes/mapper/repair/RepairRecordMapper.xml

@@ -781,7 +781,7 @@
 
     <!-- 报表导出获取除已超时外的其他数据获取方式-->
     <select id="queryNotTimeoutReportExport" resultType="com.repair.model.vo.ReportExportVo">
-        select rr.user_id,1 as details,rr.id,rr.record_no,rr.area_id+''+rr.address as area_name,rr.user_name,rr.user_phone,rat.name as
+        select rr.user_id,1 as details,rr.id,rr.record_no,rr.area_id as area_name,rr.user_name,rr.user_phone,rat.name as
         article_name,
         rr.description,rr.report_time,rr.maintenancer_name,rr.maintenance_state
         from repair_record rr
@@ -809,7 +809,7 @@
     <!-- 报表导出获取除已超时数据获取方式-->
     <select id="queryTimeoutReportExport" resultType="com.repair.model.vo.ReportExportVo">
         SELECT * FROM (
-        select rr3.user_id,1 as details,rr3.id,rr3.record_no,rr3.area_id+''+rr3.address as
+        select rr3.user_id,1 as details,rr3.id,rr3.record_no,rr3.area_id as
         area_name,rr3.user_name,rr3.user_phone,rat.name as article_name,
         rr3.description,rr3.report_time,(select user_name from repair_user where id = rdr.users_id) as
         maintenancer_name,rr3.maintenance_state