Merge branch '2.0.0' of http://git.ycjcjy.com/fuxingfan/smartCommunity into 2.0.0

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/CommunityServiceImpl.java

@@ -87,10 +87,6 @@ public class CommunityServiceImpl implements CommunityServiceI {
 		//	taUserMapper.insert(taUser);
 		//}
 
-
-
-
-
 		//构建用户信息
 		TpUser tpUser = new TpUser();
 		tpUser.setUserName(toCommunities.getUserName());

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

@@ -211,7 +211,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         message.setModelType("1");
         message.setUuidType("1");
         message.setSource("2");
-        message.setMessageContent(content);
+        message.setMessageContent("物业回复您:"+content);
         message.setStatus("1");
         message.setReadStatus("0");
         message.setCreateUser(tpTicket.getCreateUser());
@@ -318,16 +318,36 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         ticketRecordComment.setContent("拒绝受理，原因——"+textContent);
         ticketRecordComment.setUserName(userName);
         ticketRecordComment.setCreateDate(LocalDateTime.now());
-        response.addSuccess("成功");
         tpTicketRecordCommentMapper.insert(ticketRecordComment);
 
         //维护1.5版本
         Message message = new Message();
+//        message.setTicketId(ticketId);
+//        message.setUpdateUser(id);
+//        message.setUpdateDate(LocalDateTime.now());
+//        message.setStatus("0");
+//        messageMapper.updateTicketMessage(message);
+
+        QueryWrapper<TpTicket> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("id", ticketId);
+        queryWrapper.eq("community_id", communityId);
+        TpTicket ticket = tpTicketMapper.selectOne(queryWrapper);
+        message.setCommunityId(communityId);
+        message.setMessageType(ticket.getType());
+        message.setTicketId(ticket.getId());
+        message.setAdviceType("1");
+        message.setUuid(ticket.getCreateUser());
+        message.setModelType("1");
+        message.setUuidType("1");
+        message.setSource("2");
+        message.setMessageContent("您的工单“" + ticket.getTicketTitle() + "”已被拒绝受理");
+        message.setStatus("1");
+        message.setReadStatus("0");
+        message.setCreateUser(id);
+        message.setCreateDate(LocalDateTime.now());
         message.setTicketId(ticketId);
-        message.setUpdateUser(id);
-        message.setUpdateDate(LocalDateTime.now());
-        message.setStatus("0");
-        messageMapper.updateTicketMessage(message);
+        messageMapper.insert(message);
+        response.addSuccess("成功");
         return response;
     }
 
@@ -382,6 +402,27 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         //分配成功后这只messgae消息表status为无效
         messageMapper.updateTickMessageStatus(ticketId);
 
+        // 处理完成后推送app
+        QueryWrapper<TpTicket> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("id", ticketId);
+        queryWrapper.eq("community_id", communityId);
+        TpTicket ticket = tpTicketMapper.selectOne(queryWrapper);
+        Message message= new Message();
+        message.setCommunityId(communityId);
+        message.setMessageType(ticket.getType());
+        message.setTicketId(ticket.getId());
+        message.setAdviceType("1");
+        message.setUuid(ticket.getCreateUser());
+        message.setModelType("1");
+        message.setUuidType("1");
+        message.setSource("2");
+        message.setMessageContent("您的工单“" + ticket.getTicketTitle() + "”已处理完成，请查看详情");
+        message.setStatus("1");
+        message.setReadStatus("0");
+        message.setCreateUser(id);
+        message.setCreateDate(LocalDateTime.now());
+        message.setTicketId(ticketId);
+        messageMapper.insert(message);
         response.addSuccess("成功");
         return response;
     }

VUECODE/smart-property-manage/src/components/XUploader/index.vue

@@ -0,0 +1,133 @@
+<template>
+  <el-upload
+    :class="{ 'avatar-uploader': !multi }"
+    :action="apiURL"
+    :show-file-list="multi"
+    :list-type="multi ? 'picture-card' : undefined"
+    :file-list="imgList"
+    :before-upload="beforeImgUpload"
+    :headers="headers"
+    :on-success="handleSuccess"
+    :on-remove="handleRemove"
+    >
+    <template v-if="multi">
+      <i class="el-icon-plus"></i>
+    </template>
+    <template v-else>
+      <img v-if="value" :src="value" class="avatar">
+      <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+    </template>
+  </el-upload>
+</template>
+
+<script>
+export default {
+  name: 'XUploader',
+  props: [
+    'multi',
+    'value',
+  ],
+  data () {
+    return {
+      loadding: false,
+    }
+  },
+  computed: {
+    apiURL () {
+      return '/property-api/uploadimage'
+    },
+    imgList () {
+      if (!this.value) return undefined
+
+      const imgs = Array.isArray(this.value) ? this.value : [this.value]
+      return imgs.map(img => ({ name: this.getFileName(img), url: img }))
+    },
+    headers () {
+      return {}
+    }
+  },
+  methods: {
+    getFileName(fullName) {
+      const nm = (fullName || '').split('/')
+      return !nm.length ? '' : nm[nm.length - 1]
+    },
+    beforeImgUpload (file) {
+      if (file.type !== 'image/jpeg' && file.type !== 'image/png') {
+        this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
+        return false
+      }
+      // if (file.size / 1024 > 300) {
+      //   this.$message.error('图片大小不允许超过300k!')
+      //   return false
+      // }
+      this.loading = this.$loading({
+        lock: true,
+        text: '上传中...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.8)'
+      })
+
+      return true
+    },
+    handleSuccess (res) {
+      this.loading.close()
+
+      if (res.code - 0 !== 0) {
+        this.$notify.error({
+          title: '上传失败',
+          message: res.code.message
+        })
+        return
+      }
+
+      let newVals = res.data[0]
+      if (this.multi) {
+        newVals = [
+          ...(this.value || []),
+          newVals
+        ]
+      }
+
+      this.$emit('input', newVals)
+    },
+    handleRemove (file, fileList) {
+      if (!this.multi) {
+        this.$emit('input', '')
+      } else {
+        const leftImgs = fileList.map(({ url }) => url)
+        this.$emit('input', leftImgs)
+      }
+      return true
+    },
+  }
+}
+</script>
+
+<style>
+  .avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+
+  .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 178px;
+    line-height: 178px;
+    text-align: center;
+  }
+  
+  .avatar {
+    width: 178px;
+    height: 178px;
+    display: block;
+  }
+</style>

VUECODE/smart-property-manage/src/main.js

@@ -16,6 +16,8 @@ import '@/permission' // permission control
 
 import VueAMap from 'vue-amap'
 
+import XUploader from './components/XUploader'
+
 // Vue.use(ElementUI, { locale })
 Vue.use(ElementUI)
 Vue.use(VueAMap)
@@ -32,6 +34,9 @@ VueAMap.initAMapApiLoader({
   // 默认高德 sdk 版本为 1.4.10
   v: '1.4.10'
 })
+
+Vue.component('x-uploader', XUploader)
+
 new Vue({
   el: '#app',
   router,

VUECODE/smart-property-manage/src/views/social/transaction/transactionAdd.vue

@@ -44,7 +44,7 @@
         </div>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="submitForm('ruleForm','1')">发布</el-button>
+        <el-button type="primary" style="margin-left:13%"  @click="submitForm('ruleForm','1')">发布</el-button>
       </el-form-item>
     </el-form>
   </div>