Pārlūkot izejas kodu

修复 若干bug

weiximei 6 gadus atpakaļ
vecāks
revīzija
c71962673a

+ 1
- 1
CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TaVisitorLicenseMapper.java Parādīt failu

@@ -21,5 +21,5 @@ public interface TaVisitorLicenseMapper {
21 21
 
22 22
     void insertTaVistorLicense(TaVisitorLicense taVisitorLicense);
23 23
 
24
-    List<Integer> findTaVistorLicenseById(Integer id);
24
+    List<String> findTaVistorLicenseById(Integer id);
25 25
 }

+ 1
- 1
CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaVistorServiceImpl.java Parādīt failu

@@ -84,7 +84,7 @@ public class TaVistorServiceImpl implements TaVistorServiceI {
84 84
 
85 85
         for (TaVisitor taVisitor : taVisitors){
86 86
             if (Constant.EFFECTIVE.equals(taVisitor.getDrivingStatus())){
87
-                List<Integer> taVisitorLicenses = taVisitorLicenseMapper.findTaVistorLicenseById(taVisitor.getId());
87
+                List<String> taVisitorLicenses = taVisitorLicenseMapper.findTaVistorLicenseById(taVisitor.getId());
88 88
                 taVisitor.setCarLicense(taVisitorLicenses);
89 89
             }
90 90
         }

+ 1
- 1
CODE/smart-community/app-api/src/main/resources/mapper/TaVisitorLicenseMapper.xml Parādīt failu

@@ -126,7 +126,7 @@
126 126
     where id = #{id,jdbcType=INTEGER}
127 127
   </update>
128 128
 
129
-  <select id="findTaVistorLicenseById" resultType="java.lang.Integer" parameterType="java.lang.Integer" >
129
+  <select id="findTaVistorLicenseById" resultType="java.lang.String" parameterType="java.lang.Integer" >
130 130
     select
131 131
       license
132 132
     from ta_visitor_license

Binārs
CODE/smart-community/community-common/target/community-common-0.0.1.jar Parādīt failu


+ 0
- 4
CODE/smart-community/community-common/target/maven-archiver/pom.properties Parādīt failu

@@ -1,4 +0,0 @@
1
-#Created by Apache Maven 3.3.9
2
-version=0.0.1
3
-groupId=com.community
4
-artifactId=community-common

+ 0
- 28
CODE/smart-community/community-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst Parādīt failu

@@ -1,28 +0,0 @@
1
-com\community\commom\redis\RedisTemplate.class
2
-com\community\commom\redis\RedisConfiguration.class
3
-com\community\commom\utils\OssUtil.class
4
-com\community\commom\redis\SingleRedisTemplate.class
5
-com\community\commom\utils\EnumUtils.class
6
-com\community\commom\hk\HttpClientSSLUtils$2.class
7
-com\community\commom\redis\RedisJsonSerializer.class
8
-com\community\commom\utils\BeanTools.class
9
-com\community\commom\hk\HttpClientSSLUtils.class
10
-com\community\commom\session\UserElement.class
11
-com\community\commom\utils\CommonUtils.class
12
-com\community\commom\redis\RedisSerializer.class
13
-com\community\commom\utils\StringConverter.class
14
-com\community\commom\mode\ResponseBean.class
15
-com\community\commom\utils\DESUtils.class
16
-com\community\commom\redis\FastJsonSerializer.class
17
-com\community\commom\utils\DateUtils.class
18
-com\community\commom\utils\HttpClientUtils.class
19
-com\community\commom\constant\Constant.class
20
-com\community\commom\utils\CookieUtil.class
21
-com\community\commom\ailiyun\AESDecode.class
22
-com\community\commom\hk\HttpClientSSLUtils$1.class
23
-com\community\commom\utils\MD5Utils.class
24
-com\community\commom\redis\RedisObjectSerializer.class
25
-com\community\commom\utils\QRCodeGeneratorUtils.class
26
-com\community\commom\redis\SerializationFailedException.class
27
-com\community\commom\hk\Digests.class
28
-com\community\commom\utils\AccountValidatorUtil.class

+ 0
- 26
CODE/smart-community/community-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst Parādīt failu

@@ -1,26 +0,0 @@
1
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\QRCodeGeneratorUtils.java
2
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\OssUtil.java
3
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisObjectSerializer.java
4
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\session\UserElement.java
5
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\CookieUtil.java
6
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\SerializationFailedException.java
7
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\EnumUtils.java
8
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\constant\Constant.java
9
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\mode\ResponseBean.java
10
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisSerializer.java
11
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisTemplate.java
12
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\ailiyun\AESDecode.java
13
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisConfiguration.java
14
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\SingleRedisTemplate.java
15
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\HttpClientUtils.java
16
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\DateUtils.java
17
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\hk\Digests.java
18
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\BeanTools.java
19
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\MD5Utils.java
20
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\CommonUtils.java
21
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\StringConverter.java
22
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\AccountValidatorUtil.java
23
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisJsonSerializer.java
24
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\FastJsonSerializer.java
25
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\DESUtils.java
26
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\hk\HttpClientSSLUtils.java

+ 4
- 0
CODE/smart-community/operate-api/src/main/resources/bootstrap.yml Parādīt failu

@@ -13,6 +13,10 @@ spring:
13 13
         serviceId: config-server
14 14
   session:
15 15
     store-type: jdbc
16
+  servlet:
17
+    multipart:
18
+      max-file-size: 10MB
19
+      max-request-size: 100MB
16 20
 eureka:
17 21
   client:
18 22
     service-url:

+ 4
- 3
VUECODE/smart-operate-manage/src/components/Wangeditor/index.vue Parādīt failu

@@ -1,6 +1,6 @@
1 1
 <template>
2 2
   <div id="wangeditor">
3
-    <E ref="editorElem" style="text-align:left"/>
3
+    <div ref="editorElem" style="text-align:left"/>
4 4
   </div>
5 5
 </template>
6 6
 
@@ -9,10 +9,10 @@ import E from 'wangeditor'
9 9
 import { mapGetters } from 'vuex'
10 10
 export default {
11 11
   name: 'EditorElem',
12
-  props:['catchData'], // 接收父组件的方法
12
+  props:['content'], // 接收父组件的方法
13 13
   data() {
14 14
     return {
15
-      editorContent: '',
15
+      editorContent: this.content, // 内容
16 16
       editorObject: ''
17 17
     }
18 18
   },
@@ -89,6 +89,7 @@ export default {
89 89
       }
90 90
     }
91 91
     editor.create()
92
+    editor.txt.html(this.editorContent)
92 93
   },
93 94
   methods: {
94 95
     childWangeditorValue() {

+ 4
- 2
VUECODE/smart-operate-manage/src/views/banner/ediBanner/index.vue Parādīt failu

@@ -1,5 +1,5 @@
1 1
 <template>
2
-  <div class="app-container">
2
+  <div id="app" class="app-container">
3 3
     <el-form ref="form" :model="form">
4 4
       <el-form-item :label-width="formLabelWidth" label="标题">
5 5
         <el-input v-model="form.title"/>
@@ -157,6 +157,9 @@ export default {
157 157
     this.getByBannerId(this.$route.params.id)
158 158
     this.listQuery = this.$route.params.listQuery
159 159
   },
160
+  updated() {
161
+    this.$refs.refEditor.setWangeditorValue(this.form.bannerContent)
162
+  },
160 163
   methods: {
161 164
     ...mapActions('community', [
162 165
       'FetchCommunityList',
@@ -224,7 +227,6 @@ export default {
224 227
       this.$store.dispatch('GetByBannerId', bannerId).then(res => {
225 228
         this.form = res
226 229
         // this.catchData(this.form.bannerContent)
227
-        this.$refs.refEditor.setWangeditorValue(this.form.bannerContent)
228 230
         this.showContent()
229 231
       })
230 232
     },