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

CODE/smart-community/app-api/src/main/java/com/community/huiju/exception/ExceptionHandleAdice.java

@@ -0,0 +1,66 @@
+package com.community.huiju.exception;
+
+import com.community.commom.constant.Constant;
+import com.community.commom.mode.ResponseBean;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.ObjectError;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+
+/**
+ * 统一异常出口
+ * @author weiximei
+ */
+@ControllerAdvice
+@ResponseBody
+@Slf4j
+public class ExceptionHandleAdice {
+
+
+    @ExceptionHandler(Exception.class)
+    public ResponseBean handleException(Exception e){
+        log.error(e.getMessage(),e);
+        ResponseBean response = new ResponseBean();
+        response.addError(Constant.REQUEST_ERROR,"系统异常,请稍后重试!");
+        return response;
+    }
+
+    @ExceptionHandler(RuntimeException.class)
+    public ResponseBean handleException(RuntimeException e){
+        log.error(e.getMessage(),e);
+        ResponseBean response = new ResponseBean();
+        response.addError(e.getMessage());
+        return response;
+    }
+
+
+    @ExceptionHandler(WisdomException.class)
+    public ResponseBean handleException(WisdomException e) {
+        log.error(e.getMessage(),e);
+        ResponseBean response = new ResponseBean();
+        response.addError(e.getMessage());
+        return response;
+    }
+
+
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public ResponseBean handlelllewgalParamException(MethodArgumentNotValidException e){
+        ResponseBean response = new ResponseBean();
+
+        List<ObjectError> errors  =e.getBindingResult().getAllErrors();
+        String message = "参数不合法";
+        if (errors.size() >0) {
+            message = errors.get(0).getDefaultMessage();
+        }
+
+        response.addError(message);
+
+        return response;
+    }
+
+
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/exception/WisdomException.java

@@ -0,0 +1,17 @@
+package com.community.huiju.exception;
+
+
+/**
+ * @author weiximei
+ */
+public class WisdomException extends RuntimeException {
+
+
+    public WisdomException(String msg, Throwable t) {
+        super(msg, t);
+    }
+
+    public WisdomException(String msg) {
+        super(msg);
+    }
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java

@@ -140,9 +140,10 @@ public class TicketServiceImpl implements ITicketService {
                     "房屋质量":"2".equals(repairType)?
                     "户内设施":null;
             tpTicketVO.setRepairName(repairName);
-            tpTicketVO.setStatus(recordList.get(0).getStatus());
-            tpTicketVO.setTicketStatusName(recordList.get(0).getTicketStatusName());
-            tpTicketVO.setTicketRecordDate(recordList.get(0).getCreateDate());
+            tpTicketVO.setStatus(recordList.get(recordList.size()-1).getStatus());
+            tpTicketVO.setTicketStatusName(recordList.get(recordList.size()-1).getTicketStatusName());
+            tpTicketVO.setTicketRecordDate(recordList.get(recordList.size()-1).getCreateDate());
+            tpTicketVO.setTicketStatusContent(recordList.get(recordList.size()-1).getContent());
             if (null != comment) {
                 tpTicketVO.setCommentContent(comment.getContent());
                 tpTicketVO.setCommentCreateDate(comment.getCreateDate());

CODE/smart-community/app-api/src/main/java/com/community/huiju/vo/TpTicketVO.java

@@ -58,6 +58,9 @@ public class TpTicketVO {
     /** 流程状态名称 **/
     private String ticketStatusName;
 
+    /** 流程状态内容 **/
+    private String ticketStatusContent;
+
     /** 流程状态时间 **/
     private Date ticketRecordDate;
 

CODE/smart-community/app-api/src/main/resources/mapper/TpTicketRecordMapper.xml

@@ -122,6 +122,7 @@
         t.status,
         t.ticket_id AS ticketId,
         t.community_id AS communityId,
+        t.content AS content,
         d.NAME AS ticketStatusName
     FROM
         tp_ticket_record t

VUECODE/smart-operate-manage/src/views/banner/addBanner/index.vue

@@ -22,7 +22,7 @@
       <el-form-item :label-width="formLabelWidth" label="banner图">
         <el-upload
           class="avatar-uploader"
-          action="http://localhost:8085/operate-api/uploadimage"
+          action="http://101.132.102.231:8085/operate-api/uploadimage"
           name="uploadFiles"
           :show-file-list="false"
           :on-success="handleAvatarSuccess">

VUECODE/smart-operate-manage/src/views/banner/ediBanner/index.vue

@@ -22,7 +22,7 @@
       <el-form-item :label-width="formLabelWidth" label="banner图">
         <el-upload
           class="avatar-uploader"
-          action="http://localhost:8085/operate-api/uploadimage"
+          action="http://101.132.102.231:8085/operate-api/uploadimage"
           name="uploadFiles"
           :show-file-list="false"
           :on-success="handleAvatarSuccess">