修复 页面 和 后端Bug

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/TicketController.java

@@ -81,7 +81,12 @@ public class TicketController extends BaseController {
         }
 
         TpTicket ticket = iTicketService.getTicketSchedule(String.valueOf(communityId), ticketId);
-        responseBean.addSuccess(ticket);
+        if (null != ticket) {
+            responseBean.addSuccess(ticket);
+        }else {
+            responseBean.addError("没有该工单!");
+        }
+
         return responseBean;
     }
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpMessageMapper.java

@@ -26,4 +26,14 @@ public interface TpMessageMapper {
     List<TpMessage> getMessages(@Param(value = "userId") Integer userId,@Param(value = "communityId") Integer communityId, @Param(value = "modelType") Integer modelType);
 
     void updateReadStatus(@Param(value = "communityId")Integer communityId, @Param(value = "userId")Integer userId);
+
+    /**
+     * 查询工单消息
+     *
+     *  根据工单ID,模板类型 进行查询
+     *
+     * @param tpMessage
+     * @return
+     */
+    TpMessage selectTicketMessage(TpMessage tpMessage);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpMessage.java

@@ -38,6 +38,9 @@ public class TpMessage {
     private Integer updateUser;
 
     private Date updateDate;
+
+    /** 缴费项ID **/
+    private Integer billId;
     
     /**
      * 工单状态
@@ -257,4 +260,12 @@ public class TpMessage {
     public void setMessageIconTitle(String messageIconTitle) {
         this.messageIconTitle = messageIconTitle;
     }
+
+    public Integer getBillId() {
+        return billId;
+    }
+
+    public void setBillId(Integer billId) {
+        this.billId = billId;
+    }
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpTicket.java

@@ -39,7 +39,7 @@ public class TpTicket {
 
     private Date updateDate;
 
-    private List<TdImages> tdImagesList;
+    private String [] tdImagesList;
 
     private List<TpTicketRecord> ticketRecordList;
 
@@ -180,11 +180,11 @@ public class TpTicket {
         this.ticketRecordList = ticketRecordList;
     }
 
-    public List<TdImages> getTdImagesList() {
+    public String[] getTdImagesList() {
         return tdImagesList;
     }
 
-    public void setTdImagesList(List<TdImages> tdImagesList) {
+    public void setTdImagesList(String[] tdImagesList) {
         this.tdImagesList = tdImagesList;
     }
 }

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

@@ -197,6 +197,7 @@ public class TicketServiceImpl implements ITicketService {
      * @return
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public TpTicket getTicketSchedule(String communityId, Integer ticketId) {
         //查看工单详情
         TpTicket ticket = tpTicketMapper.selectByTicketId(communityId, ticketId);
@@ -214,9 +215,27 @@ public class TicketServiceImpl implements ITicketService {
             map.put("type","service");
             List<TdImages> tdImagesList = tdImagesMapper.getByUUIDAndByType(map);
 
-            ticket.setTdImagesList(tdImagesList);
+            // 图片数组
+            String [] imgageArr = new String[tdImagesList.size()];
+
+            for (int i=0;i < tdImagesList.size(); i++) {
+                imgageArr[i]=tdImagesList.get(i).getImageUrl();
+            }
+
+            ticket.setTdImagesList(imgageArr);
             ticket.setTicketRecordList(ticketRecordList);
 
+            // 把该工单的消息变为 已读
+            TpMessage tpMessage = new TpMessage();
+            tpMessage.setTicketId(ticket.getId());
+            tpMessage.setModelType("1");
+
+            tpMessage = tpMessageMapper.selectTicketMessage(tpMessage);
+            tpMessage.setReadStatus("1");
+
+            //  变为已读
+            tpMessageMapper.updateByPrimaryKeySelective(tpMessage);
+
         }
         return ticket;
     }
@@ -283,16 +302,21 @@ public class TicketServiceImpl implements ITicketService {
      * @throws IOException
      */
     private void insertTdImage(TpTicket tpTicket, String imageUrl, Integer userId) throws IOException {
-        TdImages tdImages = new TdImages();
-        Integer uuId = tpTicket.getId();
-        tdImages.setImageUrl(imageUrl);
-        tdImages.setType(Constant.SERVICE);
-        tdImages.setUuid(uuId);
-        tdImages.setCreateUser(userId);
-        tdImages.setCreateTime(new Date());
-        tdImagesMapper.insertSelective(tdImages);
+        String [] imgArr = imageUrl.split(",");
+        for (String img : imgArr) {
+            TdImages tdImages = new TdImages();
+            Integer uuId = tpTicket.getId();
+            tdImages.setImageUrl(img);
+            tdImages.setType(Constant.SERVICE);
+            tdImages.setUuid(uuId);
+            tdImages.setCreateUser(userId);
+            tdImages.setCreateTime(new Date());
+            tdImagesMapper.insertSelective(tdImages);
+        }
+
     }
 
+
     /**
      * 回复工单
      * @param tpTicketRecordComment
@@ -324,13 +348,24 @@ public class TicketServiceImpl implements ITicketService {
         tdImagesMapper.deleteByUuidAndType(map);
 
         // 获取图片
-        List<TdImages> tdImagesList = tpTicket.getTdImagesList();
-        if (null != tdImagesList && tdImagesList.size() > 0) {
-            tdImagesList.stream().forEach(e->e.setCreateUser(userId));
+        String [] tdImagesArr = tpTicket.getTdImagesList();
+        List<TdImages> tdImagesList = Lists.newArrayList();
+        if (null != tdImagesArr && tdImagesArr.length > 0) {
+            for (String img : tdImagesArr) {
+                TdImages tdImages = new TdImages();
+                tdImages.setImageUrl(img);
+                tdImages.setCreateTime(new Date());
+                tdImages.setCreateUser(userId);
+                tdImages.setType("service");
+                tdImages.setUuid(ticketId);
+
+                tdImagesList.add(tdImages);
+            }
             // 插入图片链接
             tdImagesMapper.insertBatch(tdImagesList);
         }
 
+
         TpTicket ticket = tpTicketMapper.selectByPrimaryKey(ticketId);
         ticket.setTicketTitle(tpTicket.getTicketTitle());
         ticket.setTicketContent(tpTicket.getTicketContent());
@@ -378,7 +413,8 @@ public class TicketServiceImpl implements ITicketService {
         TpMessage tpMessage = new TpMessage();
         tpMessage.setCommunityId(tpTicket.getCommunityId());
         tpMessage.setTicketId(tpTicket.getId());
-        tpMessage.setMessageType(tpTicket.getType());
+        // 消息类型  1：工单类型  2：认证类型  3：管理类型  4： 下载类型
+        tpMessage.setMessageType("1");
         // 通知方式: APP 内通知
         tpMessage.setAdviceType("1");
         // 模板类型为 消息模板

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

@@ -26,11 +26,12 @@
     <result column="unread_message_icon" property="unreadMessageIcon" jdbcType="VARCHAR" />
     <result column="message_detail_url" property="messageDetailUrl" jdbcType="VARCHAR" />
     <result column="message_icon_title" property="messageIconTitle" jdbcType="VARCHAR" />
+    <result column="bill_id" property="billId" jdbcType="INTEGER" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, ticket_id,community_id, message_type, advice_type, model_type, uuid, uuid_type, source,
     message_content, status, result, meaasge_type_id, read_status, create_user, create_date, 
-    update_user, update_date
+    update_user, update_date, bill_id
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
@@ -48,13 +49,13 @@
       uuid_type, source, message_content, 
       status, result, meaasge_type_id, 
       read_status, create_user, create_date, 
-      update_user, update_date)
+      update_user, update_date, bill_id)
     values (#{id,jdbcType=INTEGER}, #{ticketId,jdbcType=INTEGER},#{communityId,jdbcType=INTEGER}, #{messageType,jdbcType=CHAR},
       #{adviceType,jdbcType=CHAR}, #{modelType,jdbcType=CHAR}, #{uuid,jdbcType=INTEGER}, 
       #{uuidType,jdbcType=CHAR}, #{source,jdbcType=CHAR}, #{messageContent,jdbcType=VARCHAR}, 
       #{status,jdbcType=CHAR}, #{result,jdbcType=VARCHAR}, #{meaasgeTypeId,jdbcType=VARCHAR}, 
       #{readStatus,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, 
-      #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP})
+      #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP}, #{billId,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.community.huiju.model.TpMessage" useGeneratedKeys="true" keyProperty="id" >
     insert into tp_message
@@ -113,6 +114,9 @@
       <if test="updateDate != null" >
         update_date,
       </if>
+      <if test="billId != null">
+        bill_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -169,6 +173,9 @@
       <if test="updateDate != null" >
         #{updateDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="billId != null">
+        #{billId,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpMessage" >
@@ -225,6 +232,9 @@
       <if test="updateDate != null" >
         update_date = #{updateDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="billId != null">
+        bill_id = #{billId,jdbcType=INTEGER}
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -246,7 +256,8 @@
       create_user = #{createUser,jdbcType=INTEGER},
       create_date = #{createDate,jdbcType=TIMESTAMP},
       update_user = #{updateUser,jdbcType=INTEGER},
-      update_date = #{updateDate,jdbcType=TIMESTAMP}
+      update_date = #{updateDate,jdbcType=TIMESTAMP},
+      bill_id = #{billId,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
 
@@ -320,4 +331,17 @@
     and uuid = #{userId}
   </update>
 
+  <select id="selectTicketMessage" resultMap="BaseResultMap" parameterType="com.community.huiju.model.TpMessage">
+    select
+    <include refid="Base_Column_List"/>
+    from tp_message
+    where message_type=1
+    <if test="ticketId != null and ticketId !=''">
+        and ticket_id=#{ticketId}
+    </if>
+    <if test="modelType != null and modelType !=''">
+        and model_type=#{modelType}
+    </if>
+  </select>
+
 </mapper>

CODE/smart-community/operate-api/src/main/java/com/community/huiju/controller/CodeController.java

@@ -41,7 +41,7 @@ public class CodeController {
 
         log.info("{} 手机号校验结果: {}",phone, AccountValidatorUtil.isPhone(phone));
         if (!AccountValidatorUtil.isPhone(phone)){
-            response.addError("请输入正取的手机号!");
+            response.addError("请输入正确的手机号!");
             return response;
         }
 

CODE/smart-community/operate-api/src/main/resources/mapper/ToBannerMapper.xml

@@ -12,7 +12,7 @@
     <result column="eff_time" property="effTime" jdbcType="TIMESTAMP" />
     <result column="exp_time" property="expTime" jdbcType="TIMESTAMP" />
     <result column="banner_type" property="bannerType" jdbcType="CHAR" />
-    <result column="external_link" property="externalLink" jdbcType="VARCHAR" />
+    <result column="external_link" property="externalLink" jdbcType="LONGVARCHAR" />
     <result column="banner_title" property="bannerTitle" jdbcType="VARCHAR" />
     <result column="create_user" property="createUser" jdbcType="INTEGER" />
     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />

CODE/smart-community/zuul/src/main/java/com/community/huiju/filter/DomainZuulPreFilter.java → CODE/smart-community/zuul/src/main/java/com/community/huiju/filter/DomainZuulPostFilter.java

@@ -10,6 +10,7 @@ import com.netflix.zuul.ZuulFilter;
 import com.netflix.zuul.context.RequestContext;
 import com.netflix.zuul.exception.ZuulException;
 import org.apache.commons.lang.StringUtils;
+import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Component;
 
@@ -17,11 +18,11 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 /**
- * 跨域
+ * 拦截Token
  * @author weiximei
  */
 //@Component
-public class DomainZuulPreFilter extends ZuulFilter {
+public class DomainZuulPostFilter extends ZuulFilter {
 
     @Override
     public String filterType() {
@@ -35,6 +36,11 @@ public class DomainZuulPreFilter extends ZuulFilter {
 
     @Override
     public boolean shouldFilter() {
+        RequestContext ctx = RequestContext.getCurrentContext();
+        HttpServletRequest request = ctx.getRequest();
+        if (request.getMethod().equals("OPTIONS")) {
+            return false;
+        }
         return true;
     }
 

CODE/smart-community/zuul/src/main/java/com/community/huiju/filter/IgnoreZuulPreFilter.java

@@ -0,0 +1,49 @@
+package com.community.huiju.filter;
+
+import com.alibaba.fastjson.JSONObject;
+import com.community.commom.constant.Constant;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.constant.Header;
+import com.netflix.zuul.ZuulFilter;
+import com.netflix.zuul.context.RequestContext;
+import com.netflix.zuul.exception.ZuulException;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 忽略拦截
+ * @author weiximei
+ */
+//@Component
+public class IgnoreZuulPreFilter extends ZuulFilter {
+
+    @Override
+    public String filterType() {
+        return "pre";
+    }
+
+    @Override
+    public int filterOrder() {
+        return 0;
+    }
+
+    @Override
+    public boolean shouldFilter() {
+        RequestContext ctx = RequestContext.getCurrentContext();
+        HttpServletRequest request = ctx.getRequest();
+        System.out.println(request.getMethod());
+        if (request.getMethod().equals("OPTIONS") || request.getMethod().equals("PUT")) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public Object run() throws ZuulException {
+        return null;
+    }
+}

VUECODE/smart-operate-manage/src/components/Wangeditor/index.vue

@@ -9,7 +9,7 @@ import E from 'wangeditor'
 import { mapGetters } from 'vuex'
 export default {
   name: 'EditorElem',
-  props:['content'], // 接收父组件的方法
+  props: ['content'], // 接收父组件的方法
   data() {
     return {
       editorContent: this.content, // 内容

VUECODE/smart-operate-manage/src/store/modules/user.js

@@ -68,8 +68,9 @@ const user = {
     SendCode({ commit, state }, userName) {
       return new Promise((resolve, reject) => {
         sendCode(userName).then(response => {
-          const data = response.message
-          resolve(data)
+          //const data = response.message
+          // resolve(data)
+          resolve(response)
         }).catch(error => {
           reject(error)
         })

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

@@ -124,6 +124,15 @@ export default {
       listLoading: true,
       importanceOptions: [1, 2, 3],
       calendarTypeOptions,
+      communityQuery: {
+        pageNum: 1,
+        pageSize: 300,
+        communityId: undefined,
+        communityName: undefined,
+        provinceId: undefined,
+        cityId: undefined,
+        districtId: undefined
+      },
       imageUrl: '', // 图片预览
       listQuery: [], // 接收查询参数,在返回给首页
       addForm: {
@@ -228,7 +237,7 @@ export default {
     },
     getCommuniryList() {
       this.listLoading = true
-      this.FetchCommunityList().then(() => {
+      this.FetchCommunityList(this.communityQuery).then(() => {
         this.listLoading = false
       }).catch(() => {
         this.loading = false

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

@@ -127,6 +127,15 @@ export default {
       imageUrl: '', // 图片预览
       importanceOptions: [1, 2, 3],
       calendarTypeOptions,
+      communityQuery: {
+        pageNum: 1,
+        pageSize: 300,
+        communityId: undefined,
+        communityName: undefined,
+        provinceId: undefined,
+        cityId: undefined,
+        districtId: undefined
+      },
       listQuery: [],
       form: {
         id: '',
@@ -242,7 +251,7 @@ export default {
     },
     getCommuniryList() {
       this.listLoading = true
-      this.FetchCommunityList().then(() => {
+      this.FetchCommunityList(this.communityQuery).then(() => {
         this.listLoading = false
       }).catch(() => {
         this.loading = false

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

@@ -37,7 +37,8 @@
       <el-table-column label="标题" align="center" min-width="250px">
         <template slot-scope="scope">
           <!-- <span class="link-type" @click="handleUpdate(scope.row)">{{ scope.row.title }}</span> -->
-          <span class="link-type title-span" @click="infoBanner(scope.row.id)">{{ scope.row.title }}</span>
+          <!-- style="color: #409EFF;cursor: pointer" -->
+          <span class="link-type" style="color: #409EFF;cursor: pointer" @click="infoBanner(scope.row.id)">{{ scope.row.title }}</span>
         </template>
       </el-table-column>
       <el-table-column label="适用社区" align="center">

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

@@ -35,7 +35,7 @@
         <span v-show="showContentVisible" label="2" @change="showContent">自写文章</span>
       </el-form-item>
       <el-form-item v-if="showURLVisible" :label-width="formLabelWidth" label="跳转链接">
-        <span><a :href="form.externalLink" target="_blank">{{ form.externalLink }}</a></span>
+        <span><a :href="form.externalLink" style="color: #409EFF;cursor: pointer" target="_blank">{{ form.externalLink }}</a></span>
       </el-form-item>
       <div v-if="showContentVisible">
         <el-form-item :label-width="formLabelWidth" label="内容标题">
@@ -44,7 +44,7 @@
         <!-- <el-form-item :label-width="formLabelWidth" label="内容详情">
           <el-input v-model="form.bannerContent" placeholder="内容详情"/>
         </el-form-item> -->
-        <el-form-item :label-width="formLabelWidth" label="内容详情">
+        <el-form-item :label-width="formLabelWidth" label="内容详情" id="bannerContent">
           <div id="father" v-html="this.form.bannerContent"></div>
         </el-form-item>
       </div>
@@ -99,6 +99,15 @@ export default {
       imageUrl: '', // 图片预览
       importanceOptions: [1, 2, 3],
       calendarTypeOptions,
+      communityQuery: {
+        pageNum: 1,
+        pageSize: 300,
+        communityId: undefined,
+        communityName: undefined,
+        provinceId: undefined,
+        cityId: undefined,
+        districtId: undefined
+      },
       listQuery: [],
       form: {
         id: '',
@@ -234,7 +243,7 @@ export default {
     },
     getCommuniryList() {
       this.listLoading = true
-      this.FetchCommunityList().then(() => {
+      this.FetchCommunityList(this.communityQuery).then(() => {
         this.listLoading = false
       }).catch(() => {
         this.loading = false
@@ -292,6 +301,7 @@ export default {
   height: 178px;
   display: block;
 }
+
 </style>
 
 

VUECODE/smart-operate-manage/src/views/login/index.vue

@@ -39,7 +39,7 @@
           />
         </el-form-item>
         <el-button type="primary" @click="sendCode();" v-if="isCodeNum == false">发送验证码</el-button>
-        <el-button type="primary" disabled v-else>{{ codeNum }}</el-button>
+        <el-button type="primary" disabled v-else>{{ codeNum + '秒后重新获取' }}</el-button>
       </div>
       <el-button
         :loading="loading"
@@ -61,7 +61,7 @@ export default {
   data () {
     const validateUsername = (rule, value, callback) => {
       if (!isvalidUsername(value)) {
-        callback(new Error('该手机号不合法'))
+        callback(new Error('请输入正确的手机号'))
       } else {
         callback()
       }
@@ -121,21 +121,27 @@ export default {
       // this.$router.push({ path: this.redirect || '/index' })
     },
     sendCode () {
+      // 默认为1, 1表示不成功
+      let resCode = 1;
       this.$store.dispatch('SendCode', this.loginForm.username).then((res) => {
+        // 成功则为 0 
+        resCode = res.code
+        // 为0发送成功
+        if (resCode === '0') {
+          this.codeNum = 60
+          this.isCodeNum = true
+          let time = setInterval(()=> {
+            if (this.codeNum === 1) {
+              clearInterval(time)
+              this.isCodeNum = false
+            }
+            this.codeNum --
+          }, 1000)
+        }
       }).catch(() => {
         console.log('error sendcode')
       })
 
-      this.codeNum = 60
-      this.isCodeNum = true
-      let time = setInterval(()=> {
-        if (this.codeNum === 1) {
-          clearInterval(time)
-          this.isCodeNum = false
-        }
-        this.codeNum --
-      }, 1000)
-
     }
   }
 }
@@ -220,12 +226,13 @@ $light_gray: #eee;
       float: left;
       .el-form-item {
         float: left;
+        width: 158px;
         .el-input {
           float: left;
         }
       }
       .el-button {
-        margin-left: 20px;
+        margin-left: 10px;
       }
     }
   }