소스 검색

Merge branch 'v3' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3

胡轶钦 5 년 전
부모
커밋
8e02dba0e7

+ 6
- 3
src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java 파일 보기

@@ -143,9 +143,9 @@ public class TaUserController extends BaseController {
143 143
     @RequestMapping(value="/admin/taUser/current",method= RequestMethod.GET)
144 144
     public ResponseBean taUserGet(HttpServletRequest request){
145 145
         ResponseBean responseBean = new ResponseBean();
146
-        String userId = JWTUtils.getSubject(request);
146
+        Map map = JWTUtils.getUserIdAndOrgId(request);
147 147
         try {
148
-            TaUser taUser = iTaUserService.getById(userId);
148
+            TaUser taUser = iTaUserService.getById(map.get("userId").toString());
149 149
             taUser.setLoginPassword("");
150 150
             responseBean.addSuccess(taUser);
151 151
         }catch (Exception e){
@@ -184,7 +184,10 @@ public class TaUserController extends BaseController {
184 184
             return ResponseBean.error("用户状态异常", ResponseBean.ERROR_UNAVAILABLE);
185 185
         }
186 186
         taUser.setLoginPassword("");
187
-        String token = JWTUtils.newToken(taUser.getUserId().toString());
187
+        Map map = new HashMap();
188
+        map.put("userId",taUser.getUserId().toString());
189
+        map.put("orgId",taUser.getOrgId().toString());
190
+        String token = JWTUtils.newTokenByMap(map);
188 191
     
189 192
         //保存token
190 193
         saveToken(token);

+ 21
- 0
src/main/java/com/huiju/estateagents/common/JWTUtils.java 파일 보기

@@ -39,6 +39,27 @@ public class JWTUtils {
39 39
         return null;
40 40
     }
41 41
     
42
+    /**
43
+     * getSubject 获取 jwt subject
44
+     * @param request
45
+     * @return
46
+     */
47
+    public static Map getUserIdAndOrgId(HttpServletRequest request) {
48
+        String jwtHeader = request.getHeader("authorization");
49
+        if (null == jwtHeader || "".equals(jwtHeader.trim())) return null;
50
+        
51
+        String[] jwtAuths = jwtHeader.split("Bearer ");
52
+        if (null == jwtAuths || jwtAuths.length < 2) return null;
53
+        
54
+        try {
55
+            return Jwts.parser().setSigningKey(key).parseClaimsJws(jwtAuths[1]).getBody();
56
+        } catch (Exception e) {
57
+            e.printStackTrace();
58
+        }
59
+        
60
+        return null;
61
+    }
62
+    
42 63
     /**
43 64
      * getSubject 获取 jwt subject
44 65
      * @param request

+ 3
- 1
src/main/java/com/huiju/estateagents/controller/TaBuildingController.java 파일 보기

@@ -23,6 +23,7 @@ import javax.servlet.http.HttpSession;
23 23
 import java.time.LocalDateTime;
24 24
 import java.util.ArrayList;
25 25
 import java.util.List;
26
+import java.util.Map;
26 27
 
27 28
 /**
28 29
  * <p>
@@ -95,7 +96,8 @@ public class TaBuildingController extends BaseController {
95 96
                                      @RequestParam(value = "buildingStatus",required = false)String buildingStatus,
96 97
                                      @RequestParam(value = "marketStatus",required = false)String marketStatus,
97 98
                                      @RequestParam(value = "cityId",required = false)Integer cityId,
98
-                                     @RequestParam(value = "isMain",required = false)Integer isMain){
99
+                                     @RequestParam(value = "isMain",required = false)Integer isMain,HttpServletRequest request){
100
+        Map a = JWTUtils.getUserIdAndOrgId(request);
99 101
         return taBuildingService.buildingListSelect(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain);
100 102
     }
101 103
 

+ 2
- 1
src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java 파일 보기

@@ -74,9 +74,10 @@ public class TaBuildingDynamicController extends BaseController {
74 74
                                              @RequestParam(required = false)String name,
75 75
                                              @RequestParam(required = false)Integer cityId,
76 76
                                              @RequestParam(required = false)String buildingId,
77
+                                             @RequestParam(required = false)String title,
77 78
                                              @RequestParam(required = false)String isEnlist,
78 79
                                              @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime time){
79
-        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId,cityId,isEnlist,time);
80
+        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId,cityId,isEnlist,time,title);
80 81
         return responseBean;
81 82
     }
82 83
 

+ 1
- 1
src/main/java/com/huiju/estateagents/mapper/TaBuildingDynamicMapper.java 파일 보기

@@ -27,7 +27,7 @@ public interface TaBuildingDynamicMapper extends BaseMapper<TaBuildingDynamic> {
27 27
      * @param page
28 28
      * @return
29 29
      */
30
-    IPage<TaBuildingDynamic> buildingDynamicList(Page page, @Param("name") String name, @Param("buildingId") String buildingId,@Param("cityId") Integer cityId,@Param("isEnlist") String isEnlist,@Param("time")LocalDateTime time);
30
+    IPage<TaBuildingDynamic> buildingDynamicList(Page page, @Param("name") String name, @Param("buildingId") String buildingId,@Param("cityId") Integer cityId,@Param("isEnlist") String isEnlist,@Param("time")LocalDateTime time,@Param("title") String title);
31 31
 
32 32
     /**
33 33
      * 详情

+ 1
- 1
src/main/java/com/huiju/estateagents/service/ITaBuildingDynamicService.java 파일 보기

@@ -25,7 +25,7 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
25 25
      * 项目动态管理列表
26 26
      * @return
27 27
      */
28
-    ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time);
28
+    ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time,String title);
29 29
 
30 30
     /**
31 31
      * 项目详情

+ 2
- 2
src/main/java/com/huiju/estateagents/service/impl/TaBuildingDynamicServiceImpl.java 파일 보기

@@ -64,12 +64,12 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
64 64
         binder.registerCustomEditor(Date.class, editor);
65 65
     }
66 66
     @Override
67
-    public ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time) {
67
+    public ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time,String title) {
68 68
         Page<TaBuildingDynamic> page = new Page<>();
69 69
         page.setSize(pageSize == null ? 10 : pageSize);
70 70
         page.setCurrent(pageNum == null ? 1 : pageNum);
71 71
 
72
-        IPage<TaBuildingDynamic> buildingDynamic = buildingDynamicMapper.buildingDynamicList(page, name, buildingId,cityId,isEnlist,time);
72
+        IPage<TaBuildingDynamic> buildingDynamic = buildingDynamicMapper.buildingDynamicList(page, name, buildingId,cityId,isEnlist,time,title);
73 73
         List<TaBuildingDynamic> buildingDynamicList = buildingDynamic.getRecords();
74 74
         for (TaBuildingDynamic taBuildingDynamic:buildingDynamicList){
75 75
             QueryWrapper<TaActivityDynamicEnlist> taActivityDynamicEnlist= new QueryWrapper<>();

+ 3
- 0
src/main/resources/mapper/TaBuildingDynamicMapper.xml 파일 보기

@@ -30,6 +30,9 @@
30 30
         <if test="cityId != 0 and cityId != null">
31 31
             and city_id = #{cityId}
32 32
         </if>
33
+        <if test="title != null and title != ''">
34
+            and title = #{title}
35
+        </if>
33 36
         <if test="time != null">
34 37
             and TO_DAYS(create_date) = TO_DAYS(#{time})
35 38
         </if>