修复 用户问题, 网关 提示乱码问题

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

@@ -128,6 +128,7 @@ public class TaUserServiceImpl implements ITaUserService {
 
         Map<String,Object> map = Maps.newHashMap();
         map.put("loginName",loginName);
+        map.put("communityId", communityId);
         TaUser currentUser = taUserMapper.selectByLoginName(map);
         TaUserVO taUserVO = new TaUserVO();
         if (null != currentUser){

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

@@ -303,7 +303,7 @@
     select
     <include refid="Base_Column_List" />
     from ta_user
-    where login_name=#{loginName,jdbcType=VARCHAR}
+    where login_name=#{loginName,jdbcType=VARCHAR} and community_id = #{communityId,jdbcType=INTEGER}
   </select>
 
   <select id="updateLongName" parameterType="com.community.huiju.model.TaUser" resultMap="BaseResultMap">

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/ActivityController.java

@@ -128,4 +128,23 @@ public class ActivityController extends BaseController {
         return responseBean;
     }
 
+    @ApiOperation(value = "删除 活动报名人", notes = "删除 活动报名人")
+    @ApiImplicitParams({
+//            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+            @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "id", value = "编号id"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Boolean.class, name = "sendSMS", value = "true表示发送短信;false表示不发送短信"),
+    })
+    @RequestMapping(value = "/signUp/{id}", method = RequestMethod.DELETE)
+    public ResponseBean deleteSignUp(@PathVariable("id") Integer id,
+                                     @RequestParam("sendSMS") Boolean sendSMS,
+                                     HttpSession session) {
+
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iTpActivitySignUpService.deleteSignUp(id, sendSMS);
+        return responseBean;
+    }
+
+
+
 }

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

@@ -2,6 +2,7 @@ package com.community.huiju.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
 import com.community.huiju.model.TpActivitySignUp;
 
 /**
@@ -21,4 +22,12 @@ public interface ITpActivitySignUpService extends IService<TpActivitySignUp> {
      */
     ResponseBean getSignUpUser(String parameter);
 
+    /**
+     * 删除 活动人员
+     * @param id
+     * @param isSend 是否发送短信
+     * @return
+     */
+    ResponseBean deleteSignUp(Integer id, Boolean isSend);
+
 }

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
 import com.community.commom.utils.BeanTools;
 import com.community.huiju.dao.*;
 import com.community.huiju.model.*;
@@ -14,6 +15,7 @@ import com.community.huiju.vo.ActivitySignUpVO;
 import com.google.common.collect.Maps;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
@@ -99,4 +101,33 @@ public class TpActivitySignUpServiceImpl extends ServiceImpl<TpActivitySignUpMap
         responseBean.addSuccess(map);
         return responseBean;
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseBean deleteSignUp(Integer id, Boolean isSend) {
+        ResponseBean responseBean = new ResponseBean();
+
+        TpActivitySignUp tpActivitySignUp = tpActivitySignUpMapper.selectById(id);
+        if (null == tpActivitySignUp) {
+            responseBean.addError("该记录不存在!");
+            return responseBean;
+        }
+
+        TaUser taUser = taUserMapper.selectByPrimaryKey(tpActivitySignUp.getTaUserId());
+        if (null == taUser) {
+            responseBean.addError("APP端 用户不存在!");
+            return responseBean;
+        }
+
+        tpActivitySignUpMapper.deleteById(tpActivitySignUp);
+
+        // 发送短信
+        // TODO 删除成功后, 发送短信通知用户
+        if (isSend) {
+            // 开始发送
+        }
+
+        responseBean.addSuccess("操作成功!");
+        return responseBean;
+    }
 }

CODE/smart-community/zuul/src/main/java/com/community/huiju/constant/Status.java

@@ -17,7 +17,8 @@ public enum Status {
 
     RESPONSE_STATUS_802("802","身份凭证不存在!"),
 
-    RESPONSE_STATUS_803("803","Token已过期!"),
+    // Token 已过期!
+    RESPONSE_STATUS_803("803","您长时间未登录，需要重新登录。"),
     /** 状态码 end **/
 
     ;

CODE/smart-community/zuul/src/main/java/com/community/huiju/dao/TaUserMapper.java

@@ -28,7 +28,7 @@ public interface TaUserMapper {
     TaUser selectByLoginNameAndByLoginPassword(Map<String, Object> map);
 
     /**
-     * 根据loginName 查询用户
+     * 根据loginName 和 小区id 查询用户
      * @param map
      * @return 用户
      */

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

@@ -9,6 +9,7 @@ import com.community.huiju.constant.Status;
 import com.netflix.zuul.ZuulFilter;
 import com.netflix.zuul.context.RequestContext;
 import com.netflix.zuul.exception.ZuulException;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
@@ -22,6 +23,7 @@ import javax.servlet.http.HttpServletResponse;
  * @author weiximei
  */
 @Component
+@Slf4j
 public class DomainZuulPostFilter extends ZuulFilter {
 
     @Override
@@ -49,18 +51,20 @@ public class DomainZuulPostFilter extends ZuulFilter {
 
         RequestContext ctx = RequestContext.getCurrentContext();
         HttpServletResponse response = ctx.getResponse();
+        response.setContentType("application/json;charset=UTF-8");
         HttpServletRequest request = ctx.getRequest();
         String token = request.getHeader(Header.REQUEST_X_AUTH_TOKEN.getValue());
         String loginType = request.getHeader(Header.LOGIN_TYPE.getValue());
         if (StringUtils.isBlank(token)) {
 
         }else {
+            log.info("获取的token: {}", token);
             ResponseBean responseBean = new ResponseBean();
             // APP 端
             if (Constant.APP_LOGIN_TYPE.equals(loginType.trim())){
                 UserElement appElement = (UserElement) request.getSession().getAttribute(Constant.APP_USER_SESSION);
                 if (null == appElement) {
-                    responseBean.addError("803","Token已过期!");
+                    responseBean.addError(Status.RESPONSE_STATUS_803.getValue(),Status.RESPONSE_STATUS_803.getComment());
                     ctx.setResponseBody(JSONObject.toJSONString(responseBean));
                 }
 
@@ -68,7 +72,7 @@ public class DomainZuulPostFilter extends ZuulFilter {
             } else {
                 UserElement webOperateElement = (UserElement) request.getSession().getAttribute(Constant.WEB_USER_SESSION);
                 if (null == webOperateElement) {
-                    responseBean.addError("803","Token已过期!");
+                    responseBean.addError(Status.RESPONSE_STATUS_803.getValue(),Status.RESPONSE_STATUS_803.getComment());
                     ctx.setResponseBody(JSONObject.toJSONString(responseBean));
                 }
             }

VUECODE/smart-property-manage/src/api/activity.js

@@ -82,3 +82,14 @@ export function getSignUp(data) {
     }
   })
 }
+
+// 删除活动报名人
+export function deleteSignUp(data) {
+  return request({
+    url: '/signUp/' + data.deleteId,
+    method: 'delete',
+    param: {
+      sendSMS: data.sendSMS
+    }
+  })
+}

VUECODE/smart-property-manage/src/store/modules/activity.js

@@ -1,4 +1,4 @@
-import { activityList, addActivity, updateActivity, activityById, invalidActivity, getSignUp } from '@/api/activity'
+import { activityList, addActivity, updateActivity, activityById, invalidActivity, getSignUp, deleteSignUp } from '@/api/activity'
 
 const activityInfo = {
   state: {
@@ -59,6 +59,15 @@ const activityInfo = {
           reject(error)
         })
       })
+    },
+    DeleteSignUp({ commit, state }, data) { // 删除 活动报名人员
+      return new Promise((resolve, reject) => {
+        deleteSignUp(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
     }
 
   }

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

@@ -83,6 +83,19 @@
     <el-dialog :visible.sync="dialogTableVisible" title="收货地址">
       <div>{{ dialogContent }}</div>
     </el-dialog>
+    <el-dialog
+      :visible.sync="dialogSMSVisible"
+      title="提示"
+      width="30%">
+      <div style="width: 400px;height: 100px;margin-left: auto;margin-right: auto; margin-top: 10px;align-content: center;">
+        <span>确定要删除此人报名吗？</span>
+        <p><el-checkbox v-model="deleteData.sendSMS">发送短信通知报名人已取消他的报名</el-checkbox></p>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogSMSVisible = false">取 消</el-button>
+        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -96,12 +109,16 @@ export default {
         pageNum: 1,
         pageSize: 10
       },
+      deleteData: {
+        deleteId: '', // 需要删除的id
+        sendSMS: false // 是否发生短信
+      },
       total: 0, // 数据总数
       list: [],
       listLoading: true, // 表格加载框
       dialogTableVisible: false, // 是否显示弹框
       dialogContent: '提示信息', // 弹框内容
-      sendSMS: false // 是否发生短信
+      dialogSMSVisible: false // 是否删除报名弹框
     }
   },
   mounted() {
@@ -185,36 +202,21 @@ export default {
       this.dialogTableVisible = true
     },
     deleteSignUp(id) {
-      const h = this.$createElement
-      this.sendSMS = false // 默认不发送
+      this.dialogSMSVisible = true
+      this.deleteData.sendSMS = false // 默认不发送
+      this.deleteData.deleteId = id
+    },
+    deleteById() {
+      // 发送请求
+      this.$store.dispatch('DeleteSignUp', this.deleteData).then((res) => {
 
-      this.$msgbox({
-        title: '删除确认',
-        message: h('div', { style: 'width: 400px;height: 100px;line-height: 50px;align-content: center;' }, [
-          h('span', null, '确定要删除此人报名吗？'),
-          h('p', { style: 'color: teal' }, [
-            h('el-checkbox', { vModel: this.sendSMS }, '发送短信通知报名人已取消他的报名')
-          ])
-        ]),
-        showCancelButton: true,
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        beforeClose: (action, instance, done) => {
-          if (action === 'confirm') {
-            instance.confirmButtonLoading = true
-            // 发送
-            console.log(this.sendSMS)
-            done()
-          } else {
-            done()
-          }
-        }
-      }).then(action => {
-        this.$message({
-          type: 'info',
-          message: 'action: ' + action
-        })
+      }).catch(() => {
+        console.log('error DeleteSignUp')
       })
+
+      this.deleteData.deleteId = ''
+      // 获取密码
+      this.signUpList()
     }
   }
 }