Merge branch 'feature/1026-tenantalbum' into online

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/TenantAlbumController.java

@@ -199,9 +199,10 @@ public class TenantAlbumController {
     @PreAuthorize("@pcs.hasPermissions('tenantAlbum/save')")
     public HttpResponseResult<Boolean> save(@Validated @RequestBody TenantAlbumVo.TenantAlbum album) {
         //判断当前机构是否已经绑定机构专辑
-        Long tenantId = album.getTenantId();
-        List<TenantAlbumMusic> list = tenantAlbumMusicService.lambdaQuery().eq(TenantAlbumMusic::getTenantId, tenantId).list();
-        if (CollectionUtils.isNotEmpty(list)){
+        List<TenantAlbumRef> list = tenantAlbumRefService.lambdaQuery()
+                .eq(TenantAlbumRef::getTenantId, album.getTenantId())
+                .list();
+        if (CollectionUtils.isNotEmpty(list)) {
             throw new BizException("当前机构已有专辑");
         }
 
@@ -227,11 +228,11 @@ public class TenantAlbumController {
                         tenantAlbumSheet.setLevel(m.getLevel());
                         tenantAlbumSheet.setType(m.getType());
                         tenantAlbumSheet.setId(m.getId().toString());
-                       return tenantAlbumSheet;
+                        return tenantAlbumSheet;
                     }).collect(Collectors.toList()));
                     sheetData.setSubjectType(next.getSubjectType());
                     return sheetData;
-        }
+                }
         ).collect(Collectors.toList());
         tenantAlbumService.insertTenantAlbum(album.getTenantId(), tenantAlbum, musicSheetDataList);
         return HttpResponseResult.succeed();
@@ -243,14 +244,12 @@ public class TenantAlbumController {
     public HttpResponseResult<Boolean> update( @RequestBody TenantAlbumVo.TenantAlbum album) {
 
         //判断当前机构是否已经绑定机构专辑
-        Long tenantId = album.getTenantId();
-        List<TenantAlbumMusic> list = tenantAlbumMusicService.lambdaQuery().eq(TenantAlbumMusic::getTenantId, tenantId).list();
-        if (CollectionUtils.isNotEmpty(list)){
-            list.stream().forEach(i->{
-                if (!i.getTenantAlbumId().equals(album.getId())){
-                    throw new BizException("当前机构已有专辑");
-                }
-            });
+        List<TenantAlbumRef> list = tenantAlbumRefService.lambdaQuery()
+                .eq(TenantAlbumRef::getTenantId, album.getTenantId())
+                .ne(TenantAlbumRef::getTenantAlbumId, album.getId())
+                .list();
+        if (CollectionUtils.isNotEmpty(list)) {
+            throw new BizException("当前机构已有专辑");
         }
 
         // 检查曲目重复

cooleshow-app/src/main/java/com/yonge/cooleshow/tenant/controller/TenantInfoController.java

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.tenant.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.entity.TenantInfo;
@@ -107,7 +108,7 @@ public class TenantInfoController extends BaseController {
     public HttpResponseResult<Boolean> updateTenantInfo(@Valid @RequestBody TenantInfoVo.TenantInfo info) {
 
         TenantInfo tenantInfo = JSON.parseObject(info.jsonString(), TenantInfo.class);
-            tenantInfoService.updateById(tenantInfo);
+        tenantInfoService.updateById(tenantInfo);
 
         return  HttpResponseResult.succeed(true);
 
@@ -199,7 +200,8 @@ public class TenantInfoController extends BaseController {
 
                 // 平台员工不允许重复
                 SysUser employee = employeeService.queryUserByMobile(sysUser.getPhone());
-                if (Objects.nonNull(employee)) {
+                if (Objects.nonNull(employee) && employee.getPhone().equals(sysUser.getPhone())
+                        && employee.getUserType().contains(ClientEnum.SYSTEM.getCode())) {
                     throw new BizException("当前手机号已绑定平台员工");
                 }
 
@@ -308,6 +310,20 @@ public class TenantInfoController extends BaseController {
 
         }
 
+        // 修改了手机号码，清理token和WXOpenId
+        if (StringUtils.isNotEmpty(sysUser.getPhone()) && !user.getPhone().equals(sysUser.getPhone())) {
+            // 清除登录token信息,有wxOpenId说明登陆过
+            if (StringUtils.isNotEmpty(staff.getWxOpenid())) {
+                TenantStaff newStaff = tenantStaffService.getByPhone(sysUser.getPhone());
+                sysUserFeignService.exitByPhoneAndOpenId(ClientEnum.ORGANIZATION.getCode().toLowerCase(),
+                        user.getPhone(), staff.getWxOpenid());
+                // 清除WXOpenId
+                tenantStaffService.update(null, Wrappers.<TenantStaff>lambdaUpdate()
+                        .set(TenantStaff::getWxOpenid, null)
+                        .eq(TenantStaff::getUserId, newStaff.getUserId()));
+            }
+        }
+
         return HttpResponseResult.succeed(true);
     }
 }

cooleshow-app/src/main/java/com/yonge/cooleshow/tenant/controller/TenantStaffController.java

@@ -0,0 +1,52 @@
+package com.yonge.cooleshow.tenant.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.microsvc.toolkit.common.response.template.R;
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.entity.TenantStaff;
+import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
+import com.yonge.cooleshow.biz.dal.service.TenantStaffService;
+import com.yonge.cooleshow.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+
+@RestController
+@RequestMapping("${app-config.url.tenant:}/tenantStaff")
+@Api(value = "机构员工表", tags = "机构员工信息")
+public class TenantStaffController extends BaseController {
+
+    @Resource
+    SysUserFeignService sysUserFeignService;
+
+    @Autowired
+    private TenantStaffService tenantStaffService;
+
+    @PostMapping("/logout")
+    @ApiOperation(value = "退出登录", notes = "传入TenantInfo")
+    public R<JSONObject> logout() {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return R.defaultR();
+        }
+        // 清理token和WXOpenId
+        TenantStaff tenantStaff = tenantStaffService.getByUserId(sysUser.getId());
+        if (tenantStaff != null) {
+            sysUserFeignService.exitByPhoneAndOpenId(ClientEnum.ORGANIZATION.getCode().toLowerCase(),
+                    sysUser.getPhone(), tenantStaff.getWxOpenid());
+            // 清除WXOpenId
+            tenantStaffService.update(null, Wrappers.<TenantStaff>lambdaUpdate()
+                    .set(TenantStaff::getWxOpenid, null)
+                    .eq(TenantStaff::getUserId, sysUser.getId()));
+        }
+        return R.defaultR();
+    }
+}

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/TenantAlbumController.java

@@ -186,9 +186,10 @@ public class TenantAlbumController {
     @PreAuthorize("@pcs.hasPermissions('tenantAlbum/save')")
     public HttpResponseResult<Boolean> save(@Validated @RequestBody TenantAlbumVo.TenantAlbum album) {
         //判断当前机构是否已经绑定机构专辑
-        Long tenantId = album.getTenantId();
-        List<TenantAlbumMusic> list = tenantAlbumMusicService.lambdaQuery().eq(TenantAlbumMusic::getTenantId, tenantId).list();
-        if (CollectionUtils.isNotEmpty(list)){
+        List<TenantAlbumRef> list = tenantAlbumRefService.lambdaQuery()
+                .eq(TenantAlbumRef::getTenantId, album.getTenantId())
+                .list();
+        if (CollectionUtils.isNotEmpty(list)) {
             throw new BizException("当前机构已有专辑");
         }
 
@@ -230,14 +231,12 @@ public class TenantAlbumController {
     public HttpResponseResult<Boolean> update( @RequestBody TenantAlbumVo.TenantAlbum album) {
 
         //判断当前机构是否已经绑定机构专辑
-        Long tenantId = album.getTenantId();
-        List<TenantAlbumMusic> list = tenantAlbumMusicService.lambdaQuery().eq(TenantAlbumMusic::getTenantId, tenantId).list();
-        if (CollectionUtils.isNotEmpty(list)){
-            list.stream().forEach(i->{
-                if (!i.getTenantAlbumId().equals(album.getId())){
-                    throw new BizException("当前机构已有专辑");
-                }
-            });
+        List<TenantAlbumRef> list = tenantAlbumRefService.lambdaQuery()
+                .eq(TenantAlbumRef::getTenantId, album.getTenantId())
+                .ne(TenantAlbumRef::getTenantAlbumId, album.getId())
+                .list();
+        if (CollectionUtils.isNotEmpty(list)) {
+            throw new BizException("当前机构已有专辑");
         }
 
         // 检查曲目重复

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TenantInfoServiceImpl.java

@@ -436,6 +436,10 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoMapper, TenantI
             if(tenantStaff != null){
                 sysUserFeignService.exitByPhoneAndOpenId(ClientEnum.ORGANIZATION.getCode().toLowerCase(),
                         oldTenantInfo.getPhone(),tenantStaff.getWxOpenid());
+                // 清除WXOpenId
+                tenantStaffMapper.update(null, Wrappers.<TenantStaff>lambdaUpdate()
+                        .set(TenantStaff::getWxOpenid, null)
+                        .eq(TenantStaff::getUserId, sysUser.getId()));
             }
         }
         tenantInfoMapper.update(null, Wrappers.<TenantInfo>lambdaUpdate()

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/TenantInfoController.java

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.tenant.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.entity.TenantInfo;
@@ -199,7 +200,8 @@ public class TenantInfoController extends BaseController {
 
                 // 平台员工不允许重复
                 SysUser employee = employeeService.queryUserByMobile(sysUser.getPhone());
-                if (Objects.nonNull(employee)) {
+                if (Objects.nonNull(employee) && employee.getPhone().equals(sysUser.getPhone())
+                        && employee.getUserType().contains(ClientEnum.SYSTEM.getCode())) {
                     throw new BizException("当前手机号已绑定平台员工");
                 }
 
@@ -308,6 +310,20 @@ public class TenantInfoController extends BaseController {
 
         }
 
+        // 修改了手机号码，清理token和WXOpenId
+        if (StringUtils.isNotEmpty(sysUser.getPhone()) && !user.getPhone().equals(sysUser.getPhone())) {
+            // 清除登录token信息,有wxOpenId说明登陆过
+            if (StringUtils.isNotEmpty(staff.getWxOpenid())) {
+                TenantStaff newStaff = tenantStaffService.getByPhone(sysUser.getPhone());
+                sysUserFeignService.exitByPhoneAndOpenId(ClientEnum.ORGANIZATION.getCode().toLowerCase(),
+                        user.getPhone(), staff.getWxOpenid());
+                // 清除WXOpenId
+                tenantStaffService.update(null, Wrappers.<TenantStaff>lambdaUpdate()
+                        .set(TenantStaff::getWxOpenid, null)
+                        .eq(TenantStaff::getUserId, newStaff.getUserId()));
+            }
+        }
+
         return HttpResponseResult.succeed(true);
     }
 }

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/TenantStaffController.java

@@ -0,0 +1,52 @@
+package com.yonge.cooleshow.tenant.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.microsvc.toolkit.common.response.template.R;
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.entity.TenantStaff;
+import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
+import com.yonge.cooleshow.biz.dal.service.TenantStaffService;
+import com.yonge.cooleshow.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+
+@RestController
+@RequestMapping("/tenantStaff")
+@Api(value = "机构员工表", tags = "机构员工信息")
+public class TenantStaffController extends BaseController {
+
+    @Resource
+    SysUserFeignService sysUserFeignService;
+
+    @Autowired
+    private TenantStaffService tenantStaffService;
+
+    @PostMapping("/logout")
+    @ApiOperation(value = "退出登录", notes = "传入TenantInfo")
+    public R<JSONObject> logout() {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return R.defaultR();
+        }
+        // 清理token和WXOpenId
+        TenantStaff tenantStaff = tenantStaffService.getByUserId(sysUser.getId());
+        if (tenantStaff != null) {
+            sysUserFeignService.exitByPhoneAndOpenId(ClientEnum.ORGANIZATION.getCode().toLowerCase(),
+                    sysUser.getPhone(), tenantStaff.getWxOpenid());
+            // 清除WXOpenId
+            tenantStaffService.update(null, Wrappers.<TenantStaff>lambdaUpdate()
+                    .set(TenantStaff::getWxOpenid, null)
+                    .eq(TenantStaff::getUserId, sysUser.getId()));
+        }
+        return R.defaultR();
+    }
+}