no message

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BuildingOwnerInfoServiceImpl.java

@@ -157,7 +157,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         boolean phoneBool = false;
 
         // 校验楼栋信息表
-        TpBuildingOwnerInfo selectBuild = getBuildingInfo(tpBuildingOwnerInfo, tpBuildingOwnerInfo.getCommunityId());
+        TpBuildingOwnerInfo selectBuild = getBuildingInfo(tpBuildingOwnerInfo, oldTpBuildingOwnerInfo.getCommunityId());
         // 如果数据查询到了, 并且手机号和传上来的手机号是一样的是, 代表就是原数据, 直接返回操作成功
         if (null != selectBuild && selectBuild.getOwnerTel().equals(tpBuildingOwnerInfo.getOwnerTel())) {
             tpBuildingOwnerInfoMapper.updateById(tpBuildingOwnerInfo);
@@ -170,10 +170,10 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
             // 校验楼栋信息表里面的业主手机号
             QueryWrapper<TpBuildingOwnerInfo> queryWrapperPhone = new QueryWrapper<>();
             queryWrapperPhone.eq("owner_tel", tpBuildingOwnerInfo.getOwnerTel());
-            TpBuildingOwnerInfo selectBuildPhone = getBuildingInfo(tpBuildingOwnerInfo, tpBuildingOwnerInfo.getCommunityId());
+            TpBuildingOwnerInfo selectBuildPhone = tpBuildingOwnerInfoMapper.selectOne(queryWrapperPhone);
 
-            // 如果 通过手机号查询出来的楼栋信息数据的 id 和 传上来的 楼栋,单元,楼层,单元,户号 查询出来的数据的id 匹配, 那么就表示这个手机号已经绑定了其他的楼栋信息
-            if (selectBuildPhone.getId().intValue() != selectBuild.getId().intValue()){
+            // 如果 通过手机号查询出来的楼栋信息数据的 id 和 传上来的 楼栋,单元,楼层,单元,户号 查询出来的数据的id 不匹配, 那么就表示这个手机号已经绑定了其他的楼栋信息
+            if (null != selectBuildPhone && selectBuildPhone.getId().intValue() != selectBuild.getId().intValue()){
                 responseBean.addError("该手机号已存在!");
                 return responseBean;
             }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpActivityServiceImpl.java

@@ -1,5 +1,6 @@
 package com.community.huiju.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -102,7 +103,8 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
         ResponseBean responseBean = new ResponseBean();
         JSONObject jsonObject = JSONObject.parseObject(parameter);
         // 活动配图
-        String [] contentImgArray = (String[]) jsonObject.get("contentImg");
+        JSONArray jsonArray = jsonObject.getJSONArray("contentImg");
+        String [] contentImgArray = jsonArray.toArray(new String[]{});
         TpActivity tpActivity = jsonObject.toJavaObject(TpActivity.class);
         tpActivity.setCommunityId(userElement.getCommunityId());
         tpActivity.setUpdateDate(LocalDateTime.now());

CODE/smart-community/zuul/src/main/resources/bootstrap.yml

@@ -40,6 +40,11 @@ hystrix:
           thread:
             timeoutInMilliseconds: 180000
 
+ribbon:
+  ReadTimeout: 38000
+  ConnectTimeout: 38000
+  eureka.enabled: true
+
 
 ## Mybatis
 mybatis:

VUECODE/smart-property-manage/src/components/chart/chart3.vue

@@ -38,17 +38,17 @@ export default {
     })
   },
   created() {
-    this.GetHardData().then(() => {
-      console.log(this.hardData)
-      this.hardData.forEach(item => {
-        if (item.message === '小区开门次数') {
-          this.arr[0].num = item.count + '次'
-        } else if (item.message === '单元门开门次数') {
-          this.arr[1].num = item.count + '次'
-        }
-      })
-      this.arr = JSON.parse(JSON.stringify(this.arr))
-    })
+    // this.GetHardData().then(() => {
+    //   console.log(this.hardData)
+    //   this.hardData.forEach(item => {
+    //     if (item.message === '小区开门次数') {
+    //       this.arr[0].num = item.count + '次'
+    //     } else if (item.message === '单元门开门次数') {
+    //       this.arr[1].num = item.count + '次'
+    //     }
+    //   })
+    //   this.arr = JSON.parse(JSON.stringify(this.arr))
+    // })
   },
   methods: {
     ...mapActions('trunkIndex', [

VUECODE/smart-property-manage/src/components/chart/chart5.vue

@@ -13,9 +13,9 @@ export default {
     })
   },
   mounted() {
-    this.GetSignUser().then(() => {
-      this.rander()
-    })
+    // this.GetSignUser().then(() => {
+    //   this.rander()
+    // })
   },
   methods: {
     ...mapActions('trunkIndex', [

VUECODE/smart-property-manage/src/utils/request.js

@@ -31,30 +31,50 @@ service.interceptors.response.use(
     /**
      * code为非0是抛错
      */
-    const res = response.data
-    if (res.code !== '0') {
-      Message({
-        message: res.message,
-        type: 'error',
-        duration: 5 * 1000
-      })
+    // const res = response.data
+    // if (res.code !== '0') {
+    //   Message({
+    //     message: res.message,
+    //     type: 'error',
+    //     duration: 5 * 1000
+    //   })
+    //   // 802:Token 身份凭证不存在; 50012:其他客户端登录了;  803:Token 过期了;
+    //   if (res.code === '802' || res.code === '50012' || res.code === '803') {
+    //     MessageBox.confirm(
+    //       '你已被登出，可以取消继续留在该页面，或者重新登录',
+    //       '确定登出',
+    //       {
+    //         confirmButtonText: '重新登录',
+    //         cancelButtonText: '取消',
+    //         type: 'warning'
+    //       }
+    //     ).then(() => {
+    //       store.dispatch('FedLogOut').then(() => {
+    //         location.reload() // 为了重新实例化vue-router对象 避免bug
+    //       })
+    //     })
+    //   }
+    //   return Promise.reject('error')
+    // } else {
+    //   return response.data
+    // }
 
-      // 802:Token 身份凭证不存在; 50012:其他客户端登录了;  803:Token 过期了;
-      if (res.code === '802' || res.code === '50012' || res.code === '803') {
-        MessageBox.confirm(
-          '你已被登出，可以取消继续留在该页面，或者重新登录',
-          '确定登出',
-          {
-            confirmButtonText: '重新登录',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }
-        ).then(() => {
-          store.dispatch('FedLogOut').then(() => {
-            location.reload() // 为了重新实例化vue-router对象 避免bug
-          })
+    const res = response.data
+    // 802:Token 身份凭证不存在; 50012:其他客户端登录了;  803:Token 过期了;
+    if (res.code === '802' || res.code === '50012' || res.code === '803') {
+      MessageBox.confirm(
+        '你已被登出，可以取消继续留在该页面，或者重新登录',
+        '确定登出',
+        {
+          confirmButtonText: '重新登录',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        store.dispatch('FedLogOut').then(() => {
+          location.reload() // 为了重新实例化vue-router对象 避免bug
         })
-      }
+      })
       return Promise.reject('error')
     } else {
       return response.data

VUECODE/smart-property-manage/src/views/building/edi/index.vue

@@ -23,7 +23,7 @@
         <el-input v-model="ruleForm.ownerTel" :disabled="isOwnerTel"/>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="submitForm('ruleForm')">立即创建</el-button>
+        <el-button type="primary" @click="submitForm('ruleForm')">修改</el-button>
         <el-button @click="backIndex">返回</el-button>
       </el-form-item>
     </el-form>

VUECODE/smart-property-manage/src/views/social/activity/add/index.vue

@@ -33,19 +33,29 @@
           <img :src="dialogImageUrl" width="100%" alt="">
         </el-dialog>
       </el-form-item>
-      <el-form-item label="报名人数上限" prop="signUpMax">
-        <el-input v-model="ruleForm.signUpMax" placeholder="填写0则不限制报名人数"/>
+      <el-form-item prop="signUpMax">
+        <div style="display: flex;">
+          <span style="width: 140px;">报名人数上限</span>
+          <el-input v-model="ruleForm.signUpMax" placeholder="填写0则不限制报名人数"/>
+        </div>
       </el-form-item>
-      <el-form-item label="报名截止时间" prop="registrationEndTime">
-        <el-date-picker
-          v-model="ruleForm.registrationEndTime"
-          type="date"
-          placeholder="选择日期"/>
+      <el-form-item prop="registrationEndTime">
+        <div style="display: flex;">
+          <span style="width: 120px;">报名截止时间</span>
+          <el-date-picker
+            v-model="ruleForm.registrationEndTime"
+            value-format="timestamp"
+            type="date"
+            placeholder="选择日期"/>
+        </div>
       </el-form-item>
-      <el-form-item label="权重值" prop="sort">
-        <el-input-number v-model="ruleForm.sort" :min="1" :max="10" label="权重值" @change="sortHandleChange"/>
+      <el-form-item prop="sort">
+        <div style="display: flex; justify-content: flex-start;">
+          <span style="width: 120px;">权重值</span>
+          <el-input-number v-model="ruleForm.sort" :min="1" :max="10" label="权重值" @change="sortHandleChange"/>
+        </div>
       </el-form-item>
-      <el-form-item>
+      <el-form-item style="display: flex; justify-content: center;">
         <el-button @click="resetForm('ruleForm')">存为草稿</el-button>
         <el-button type="primary" @click="submitForm('ruleForm')">发布</el-button>
       </el-form-item>
@@ -69,6 +79,8 @@ export default {
         status: '' // 状态 0 是已作废 1 是已发布   2 是草稿 3 是已修改
       },
       imageUrl: '', // 轮播图预览
+      dialogVisible: false, // 活动配图, 默认不显示 (以单张为单位)
+      dialogImageUrl: '', // 活动配图, 图片链接 (以单张为单位)
       rules: {
         activityTitle: [
           { required: true, message: '请输入活动名称', trigger: 'blur' },
@@ -116,16 +128,16 @@ export default {
               return
             }
             this.$message.error(res.message)
-            loading.close()
           }).catch(() => {
             console.log('error AddActivity')
           })
         } else {
           console.log('error submit!!')
-          loading.close()
           return false
         }
       })
+      // 关闭加载框
+      loading.close()
     },
     resetForm(formName) {
       this.$refs[formName].resetFields()

VUECODE/smart-property-manage/src/views/social/activity/edi/index.vue

@@ -39,6 +39,7 @@
       <el-form-item label="报名截止时间" prop="registrationEndTime">
         <el-date-picker
           v-model="ruleForm.registrationEndTime"
+          value-format="yyyy-MM-dd"
           type="date"
           placeholder="选择日期"/>
       </el-form-item>