chore: casUserId move sysUserId

kicc-auth/src/main/java/com/cloud/kicc/auth/endpoint/KiccTokenEndpoint.java

@@ -3,9 +3,9 @@ package com.cloud.kicc.auth.endpoint;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.cloud.kicc.common.core.api.R;
 import com.cloud.kicc.common.core.constant.CacheConstants;
 import com.cloud.kicc.common.core.constant.CommonConstants;
-import com.cloud.kicc.common.core.api.R;
 import com.cloud.kicc.common.core.util.SpringContextHolderUtil;
 import com.cloud.kicc.common.security.annotation.Inner;
 import com.cloud.kicc.common.security.util.SecurityUtils;
@@ -14,7 +14,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.CacheManager;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.http.HttpHeaders;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.authentication.event.LogoutSuccessEvent;
 import org.springframework.security.oauth2.common.OAuth2AccessToken;
 import org.springframework.security.oauth2.common.OAuth2RefreshToken;
@@ -85,7 +84,7 @@ public class KiccTokenEndpoint {
 			AuthorizationRequest authorizationRequest = (AuthorizationRequest) auth;
 			ClientDetails clientDetails = clientDetailsService.loadClientByClientId(authorizationRequest.getClientId());
 			modelAndView.addObject("app", clientDetails.getAdditionalInformation());
-			modelAndView.addObject("user", SecurityUtils.getCasUser());
+			modelAndView.addObject("user", SecurityUtils.getUser());
 		}
 
 		modelAndView.setViewName("ftl/confirm");

kicc-common/kicc-common-security/src/main/java/com/cloud/kicc/common/security/exp/KiccLocalResourceServerTokenServices.java

@@ -1,7 +1,6 @@
 package com.cloud.kicc.common.security.exp;
 
 import com.cloud.kicc.common.data.entity.CasUser;
-import com.cloud.kicc.common.data.entity.KiccUser;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapLogisticController.java

@@ -98,7 +98,7 @@ public class MapLogisticController {
     @PostMapping("/uploadGps")
     @ApiOperation(value = "安卓定时上传GPS定位")
     public R uploadGps(@RequestBody MapLogistic mapLogistic) {
-        iMapLogisticSseService.sendMessage(SecurityUtils.getCasUser().getId(),item -> {
+        iMapLogisticSseService.sendMessage(SecurityUtils.getUser().getId(),item -> {
             item.getSseEmitter().send(mapLogistic);
         });
         return R.ok(mapLogistic);

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapTaskController.java

@@ -98,7 +98,7 @@ public class MapTaskController {
             jsonObject.put("officeId", 0);
             jsonObject.put("doctorId", 0);
 
-            jsonObject.put("syUserId", user.getData().getCasUserId());
+            jsonObject.put("syUserId", user.getData().getId());
             jsonObject.put("batchCode", mapTask.getBatchCode());
             jsonObject.put("taskType", mapTask.getTaskType());
             jsonObject.put("originImages", mapTask.getReceiptFileId());
@@ -129,7 +129,7 @@ public class MapTaskController {
         String content = JSONObject.toJSONString(mapLogisticPoint);
         PushChatMessage pushChatMessage = new PushChatMessage();
         pushChatMessage.setRemarks(content);
-        pushChatMessage.setTitle(SecurityUtils.getCasUser().getUsername() + "与你对接预设点");
+        pushChatMessage.setTitle(SecurityUtils.getUser().getUsername() + "与你对接预设点");
         // 保存交接消息
         iPushChatMessageService.save(pushChatMessage);
         // todo: 调用友盟推送接口,目前未测试需要安卓上线平台,后面处理

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapTaskPresetController.java

@@ -97,7 +97,7 @@ public class MapTaskPresetController {
             jsonObject.put("officeId", 0);
             jsonObject.put("doctorId", 0);
 
-            jsonObject.put("syUserId", user.getData().getCasUserId());
+            jsonObject.put("syUserId", user.getData().getId());
             jsonObject.put("batchCode", mapTaskPreset);
             jsonObject.put("taskType", 1);
             jsonObject.put("originImages", mapTaskPreset.getReceiptFileId());

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushApplicationController.java

@@ -46,7 +46,7 @@ public class PushApplicationController {
 
     private LambdaQueryWrapper<PushApplication> getQueryWrapper(PushApplication pushApplication) {
         return new LambdaQueryWrapper<PushApplication>()
-                .eq(PushApplication::getCreateById, SecurityUtils.getCasUser().getId())
+                .eq(PushApplication::getCreateById, SecurityUtils.getUser().getId())
                 .eq(StrUtil.isNotBlank(pushApplication.getName()), PushApplication::getName, pushApplication.getName())
                 .eq(StrUtil.isNotBlank(pushApplication.getStatus()), PushApplication::getStatus, pushApplication.getStatus())
                 .orderByAsc(PushApplication::getCreateTime);
@@ -72,7 +72,7 @@ public class PushApplicationController {
         if (StrUtil.equals(SecurityUtils.getUser().getUserType(), UserTypeEnum.ENTERPRISE_USER.getValue()) &&
                 iPushEnterpriseService.count(Wrappers.<PushEnterprise>lambdaQuery()
                         .eq(PushEnterprise::getStatus, PushAuditStatusEnum.APPROVED.getValue())
-                        .eq(PushEnterprise::getUserId, SecurityUtils.getCasUser().getId())) == 0){
+                        .eq(PushEnterprise::getUserId, SecurityUtils.getUser().getId())) == 0){
             throw new CheckedException("该企业用户未进行企业认证，禁止操作！");
         }
         pushApplication.setMessageSecret(UUID.randomUUID().toString().replace("-",""));

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushBlacklistController.java

@@ -43,7 +43,7 @@ public class PushBlacklistController {
     @ApiOperation("分页查询")
     @GetMapping("/list")
     public R list(Page page, @RequestParam Map map) {
-        map.put("createById", SecurityUtils.getCasUser().getId());
+        map.put("createById", SecurityUtils.getUser().getId());
         IPage<Map<String, Object>> iPage = iPushBlacklistService.selectPushBlacklist(page, map);
         return R.ok(iPage.getRecords(), iPage.getTotal());
     }

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushChatMessageController.java

@@ -37,7 +37,7 @@ public class PushChatMessageController {
 
     private LambdaQueryWrapper<PushChatMessage> getQueryWrapper(PushChatMessage pushChatMessage) {
         return new LambdaQueryWrapper<PushChatMessage>()
-                .eq(PushChatMessage::getUserId, SecurityUtils.getCasUser().getId())
+                .eq(PushChatMessage::getUserId, SecurityUtils.getUser().getId())
                 .eq(ObjectUtil.isNotEmpty(pushChatMessage.getStatus()), PushChatMessage::getStatus, pushChatMessage.getStatus())
                 .like(StrUtil.isNotBlank(pushChatMessage.getTitle()), PushChatMessage::getTitle, pushChatMessage.getTitle())
                 .eq(StrUtil.isNotBlank(pushChatMessage.getAlias()), PushChatMessage::getAlias, pushChatMessage.getAlias())

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushEnterpriseController.java

@@ -63,7 +63,7 @@ public class PushEnterpriseController {
     @GetMapping("/getAuthData")
     public R getAuthData() {
         return R.ok(iPushEnterpriseService.getOne(Wrappers.<PushEnterprise>lambdaQuery()
-                .eq(PushEnterprise::getUserId, SecurityUtils.getCasUser().getId())));
+                .eq(PushEnterprise::getUserId, SecurityUtils.getUser().getId())));
     }
 
     @ApiOperation("保存")
@@ -74,10 +74,10 @@ public class PushEnterpriseController {
             throw new CheckedException("当前用户不是企业用户请用企业用户登录后重试！");
         }
         if(iPushEnterpriseService.count(Wrappers.<PushEnterprise>lambdaQuery()
-                .eq(PushEnterprise::getUserId, SecurityUtils.getCasUser().getId())) > 0) {
+                .eq(PushEnterprise::getUserId, SecurityUtils.getUser().getId())) > 0) {
             throw new CheckedException("该企业用户下已经存在认证数据！");
         }
-        if (StrUtil.isBlank(pushEnterprise.getUserId())) pushEnterprise.setUserId(SecurityUtils.getCasUser().getId());
+        if (StrUtil.isBlank(pushEnterprise.getUserId())) pushEnterprise.setUserId(SecurityUtils.getUser().getId());
         iPushEnterpriseService.save(pushEnterprise);
         return R.ok();
     }
@@ -110,7 +110,7 @@ public class PushEnterpriseController {
     public R updateAuditStatus(@PathVariable Integer status) {
         iPushEnterpriseService.update(Wrappers.<PushEnterprise>lambdaUpdate()
                 .set(PushEnterprise::getStatus, status)
-                .eq(PushEnterprise::getUserId, SecurityUtils.getCasUser().getId()));
+                .eq(PushEnterprise::getUserId, SecurityUtils.getUser().getId()));
         return R.ok();
     }
 

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushTypeController.java

@@ -53,7 +53,7 @@ public class PushTypeController {
     @ApiOperation("分页查询")
     @GetMapping("/list")
     public R list(Page page, PushType pushType) {
-        pushType.setCreateById(SecurityUtils.getCasUser().getId());
+        pushType.setCreateById(SecurityUtils.getUser().getId());
         IPage<PushType> list = iPushTypeService.page(page, getQueryWrapper(pushType));
         return R.ok(list.getRecords(), list.getTotal());
     }
@@ -70,7 +70,7 @@ public class PushTypeController {
     public R save(@Valid @RequestBody PushType pushType) {
         iPushTypeService.save(pushType);
         List<PushConcernFan> pushConcernFanList = iPushConcernFanService
-                .list(Wrappers.<PushConcernFan>lambdaQuery().eq(PushConcernFan::getConcernUserId, SecurityUtils.getCasUser().getId()));
+                .list(Wrappers.<PushConcernFan>lambdaQuery().eq(PushConcernFan::getConcernUserId, SecurityUtils.getUser().getId()));
         List<PushConcernFanType> pushConcernFanTypeList = pushConcernFanList.stream().map(item -> new PushConcernFanType()
                 .setConcernFanId(item.getId())
                 .setName(pushType.getName())
@@ -111,7 +111,7 @@ public class PushTypeController {
         // 全部设置为不默认
         iPushTypeService.update(Wrappers.<PushType>lambdaUpdate()
                 .set(PushType::getDefaultType, "0")
-                .eq(PushType::getCreateById, SecurityUtils.getCasUser().getId()));
+                .eq(PushType::getCreateById, SecurityUtils.getUser().getId()));
         iPushTypeService.updateById(pushType);
         return R.ok();
     }

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapLogisticServiceImpl.java

@@ -128,7 +128,7 @@ public class MapLogisticServiceImpl extends ServiceImpl<MapLogisticMapper, MapLo
                 jsonObject.put("officeId", 0);
                 jsonObject.put("doctorId", 0);
 
-                jsonObject.put("syUserId", user.getData().getCasUserId());
+                jsonObject.put("syUserId", user.getData().getId());
                 jsonObject.put("batchCode", mapTask.getBatchCode());
                 jsonObject.put("taskType", mapTask.getTaskType());
                 jsonObject.put("originImages", mapTask.getReceiptFileId());
@@ -154,7 +154,7 @@ public class MapLogisticServiceImpl extends ServiceImpl<MapLogisticMapper, MapLo
                     jsonObject.put("officeId", 0);
                     jsonObject.put("doctorId", 0);
 
-                    jsonObject.put("syUserId", taskPresetUser.getData().getCasUserId());
+                    jsonObject.put("syUserId", taskPresetUser.getData().getId());
                     jsonObject.put("batchCode", mapTaskPreset);
                     jsonObject.put("taskType", 1);
                     jsonObject.put("originImages", mapTaskPreset.getReceiptFileId());
@@ -204,7 +204,7 @@ public class MapLogisticServiceImpl extends ServiceImpl<MapLogisticMapper, MapLo
         payload.put("display_type", "notification");
         JSONObject body = new JSONObject();
         body.put("ticker", "交接任务确认");
-        body.put("text", SecurityUtils.getCasUser().getUsername() + "向你发起了交接点确认!");
+        body.put("text", SecurityUtils.getUser().getUsername() + "向你发起了交接点确认!");
         body.put("title", "交接任务确认");
         body.put("after_open", "go_custom");
         body.put("custom", JSONObject.toJSON(mapLogisticPoint));

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapLogisticSseServiceImpl.java

@@ -3,7 +3,7 @@ package com.cloud.kicc.commonbiz.service.impl;
 import cn.hutool.core.collection.ConcurrentHashSet;
 import cn.hutool.core.util.StrUtil;
 import com.cloud.kicc.common.core.exception.CheckedException;
-import com.cloud.kicc.common.data.entity.CasUser;
+import com.cloud.kicc.common.data.entity.KiccUser;
 import com.cloud.kicc.common.security.util.SecurityUtils;
 import com.cloud.kicc.commonbiz.api.entity.SseSignalContainer;
 import com.cloud.kicc.commonbiz.service.IMapLogisticSseService;
@@ -48,57 +48,57 @@ public class MapLogisticSseServiceImpl implements IMapLogisticSseService {
     @Override
     @SneakyThrows
     public SseEmitter SseSubscribe(String clientId) {
-        CasUser casUser = getUser();
+        KiccUser user = getUser();
         Optional.ofNullable(clientId).orElseThrow(() -> new CheckedException("当前客户端Id为空,请检查后重试!"));
         // 设置超时时间为1小时
         SseEmitter sseEmitter = new SseEmitter(3600_000L);
         SseSignalContainer sseSignalContainer =new SseSignalContainer(
                 clientId,
-                casUser.getId(),
+                user.getId(),
                 sseEmitter,
-                casUser.getTenantId()
+                user.getTenantId()
         );
         // 设置如果网络出错前端请求的重试时间为1s
         sseEmitter.send(SseEmitter.event().data("创建通道连接成功").reconnectTime(1000));
         sseSignalContainers.add(sseSignalContainer);
-        log.info("clientId:{},建立的用户Id为:{}", clientId, casUser.getId());
+        log.info("clientId:{},建立的用户Id为:{}", clientId, user.getId());
         sseEmitter.onTimeout(() -> {
-            log.info("clientId:{},用户Id为:{},的SSE长轮询已经超时,正在删除当前的建立通道对象", clientId, casUser.getId());
+            log.info("clientId:{},用户Id为:{},的SSE长轮询已经超时,正在删除当前的建立通道对象", clientId, user.getId());
             sseEmitter.complete();
             sseSignalContainers.remove(sseSignalContainer);
         });
         sseEmitter.onCompletion(() -> {
-            log.info("clientId:{},用户Id为:{}的SSE长轮询已经返回响应关闭,正在删除当前的建立通道对象", clientId, casUser.getId());
+            log.info("clientId:{},用户Id为:{}的SSE长轮询已经返回响应关闭,正在删除当前的建立通道对象", clientId, user.getId());
             sseSignalContainers.remove(sseSignalContainer);
         });
-        sseEmitter.onError(e -> log.info("clientId:{},当前用户Id为:{}的SSE长轮询出现异常,正在删除当前的建立通道对象,错误信息{}", clientId, casUser.getId(), e.getLocalizedMessage()));
+        sseEmitter.onError(e -> log.info("clientId:{},当前用户Id为:{}的SSE长轮询出现异常,正在删除当前的建立通道对象,错误信息{}", clientId, user.getId(), e.getLocalizedMessage()));
         return sseEmitter;
     }
 
     @Override
     public void sendMessage(String userId, SseEmitterConsumer<SseSignalContainer> consumer) {
-        CasUser casUser = getUser();
+        KiccUser user = getUser();
         Set<SseSignalContainer> sendSseSignalContainers = sseSignalContainers.stream()
-                .filter(item -> StrUtil.equals(item.getUserId(), userId) && StrUtil.equals(item.getTenantId(), casUser.getTenantId()))
+                .filter(item -> StrUtil.equals(item.getUserId(), userId) && StrUtil.equals(item.getTenantId(), user.getTenantId()))
                 .collect(Collectors.toSet());
         send(sendSseSignalContainers, consumer);
     }
 
     @Override
     public void sendMessage(SseEmitterConsumer<SseSignalContainer> consumer) {
-        CasUser casUser = getUser();
+        KiccUser user = getUser();
         Set<SseSignalContainer> sendSseSignalContainers = sseSignalContainers.stream()
-                .filter(item -> StrUtil.equals(item.getTenantId(), casUser.getTenantId()))
+                .filter(item -> StrUtil.equals(item.getTenantId(), user.getTenantId()))
                 .collect(Collectors.toSet());
         send(sendSseSignalContainers, consumer);
     }
 
     @Override
     public void disconnect(String clientId) {
-        CasUser casUser = getUser();
+        KiccUser user = getUser();
         Optional.ofNullable(clientId).orElseThrow(() -> new CheckedException("当前客户端Id为空,请检查后重试!"));
         Set<SseSignalContainer> sendSseSignalContainers = sseSignalContainers.stream()
-                .filter(item -> StrUtil.equals(item.getClientId(), clientId) && StrUtil.equals(item.getTenantId(), casUser.getTenantId()))
+                .filter(item -> StrUtil.equals(item.getClientId(), clientId) && StrUtil.equals(item.getTenantId(), user.getTenantId()))
                 .collect(Collectors.toSet());
         sendSseSignalContainers.forEach(item -> item.getSseEmitter().complete());
         sseSignalContainers.removeAll(sendSseSignalContainers);
@@ -106,9 +106,9 @@ public class MapLogisticSseServiceImpl implements IMapLogisticSseService {
 
     @Override
     public void disconnect() {
-        CasUser casUser = getUser();
+        KiccUser user = getUser();
         Set<SseSignalContainer> sendSseSignalContainers = sseSignalContainers.stream()
-                .filter(item -> StrUtil.equals(item.getTenantId(), casUser.getTenantId()))
+                .filter(item -> StrUtil.equals(item.getTenantId(), user.getTenantId()))
                 .collect(Collectors.toSet());
         sendSseSignalContainers.forEach(item -> item.getSseEmitter().complete());
         sseSignalContainers.removeAll(sendSseSignalContainers);
@@ -154,10 +154,10 @@ public class MapLogisticSseServiceImpl implements IMapLogisticSseService {
         return failedEmitters;
     }
 
-    private CasUser getUser() {
-        CasUser casUser = SecurityUtils.getCasUser();
-        Optional.ofNullable(casUser).orElseThrow(() -> new CheckedException("当前用户登录,请先登录后重试!"));
-        return casUser;
+    private KiccUser getUser() {
+        KiccUser user = SecurityUtils.getUser();
+        Optional.ofNullable(user).orElseThrow(() -> new CheckedException("当前用户登录,请先登录后重试!"));
+        return user;
     }
 
 }

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java

@@ -8,26 +8,16 @@ import cn.hutool.extra.servlet.ServletUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.cloud.kicc.common.core.api.R;
-import com.cloud.kicc.common.core.constant.CommonConstants;
-import com.cloud.kicc.common.core.constant.SecurityConstants;
 import com.cloud.kicc.common.core.exception.CheckedException;
-import com.cloud.kicc.common.data.entity.KiccUser;
 import com.cloud.kicc.common.security.util.SecurityUtils;
 import com.cloud.kicc.commonbiz.api.entity.*;
 import com.cloud.kicc.commonbiz.api.enums.PushAuditStatusEnum;
 import com.cloud.kicc.commonbiz.mapper.PushApplicationMapper;
 import com.cloud.kicc.commonbiz.service.*;
 import com.cloud.kicc.commonbiz.util.PushClientUtil;
-import com.cloud.kicc.system.api.entity.User;
 import com.cloud.kicc.system.api.enums.UserTypeEnum;
-import com.cloud.kicc.system.api.feign.RemoteUserService;
 import lombok.RequiredArgsConstructor;
 import okhttp3.OkHttpClient;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.authority.AuthorityUtils;
-import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.context.request.RequestContextHolder;
@@ -76,7 +66,7 @@ public class PushApplicationServiceImpl extends ServiceImpl<PushApplicationMappe
         if (StrUtil.equals(SecurityUtils.getUser().getUserType(),  UserTypeEnum.ENTERPRISE_USER.getValue()) &&
                 iPushEnterpriseService.count(Wrappers.<PushEnterprise>lambdaQuery()
                         .eq(PushEnterprise::getStatus, PushAuditStatusEnum.APPROVED.getValue())
-                        .eq(PushEnterprise::getUserId, SecurityUtils.getCasUser().getId())) == 0){
+                        .eq(PushEnterprise::getUserId, SecurityUtils.getUser().getId())) == 0){
             throw new CheckedException("该企业用户未进行企业认证，禁止操作！");
         }
 

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushConcernFanMapper.xml

@@ -144,13 +144,13 @@
     <choose>
       <!--企业用户进行粉丝查询连表-->
       <when test="map.dynamicJoinType == 1">
-        AND concern_user_id = ${@com.cloud.kicc.common.security.util.SecurityUtils@getCasUser().id}) cf
+        AND concern_user_id = ${@com.cloud.kicc.common.security.util.SecurityUtils@getUser().id}) cf
         ON u.cas_user_id = cf.fan_user_id
         LEFT JOIN (SELECT * FROM common_push_blacklist WHERE del_flag = 0) b
         ON u.cas_user_id = b.concern_user_id
       </when>
       <otherwise>
-        AND fan_user_id = ${@com.cloud.kicc.common.security.util.SecurityUtils@getCasUser().id}) cf
+        AND fan_user_id = ${@com.cloud.kicc.common.security.util.SecurityUtils@getUser().id}) cf
         ON u.cas_user_id = cf.concern_user_id
         LEFT JOIN (SELECT * FROM common_push_blacklist WHERE del_flag = 0) b
         ON u.cas_user_id = b.fan_user_id
@@ -163,7 +163,7 @@
       AND u.user_type not in(
         ${@com.cloud.kicc.system.api.enums.UserTypeEnum@INTERNAL_USER.value}
       )
-      AND u.cas_user_id != ${@com.cloud.kicc.common.security.util.SecurityUtils@getCasUser().id}
+      AND u.cas_user_id != ${@com.cloud.kicc.common.security.util.SecurityUtils@getUser().id}
       <if test="map.nickName != null and map.nickName != ''">
         AND csu.nick_name = #{map.nickName}
       </if>

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/impl/VisualDbServiceImpl.java

@@ -5,7 +5,6 @@ import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.cloud.kicc.common.data.entity.CasUser;
 import com.cloud.kicc.common.data.entity.KiccUser;
 import com.cloud.kicc.common.datasource.dynamic.DynamicDataSource;
 import com.cloud.kicc.common.datasource.util.ConnUtil;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/TenantController.java

@@ -57,7 +57,7 @@ public class TenantController {
     @GetMapping("/currentUserTenantList")
     @PreAuthorize("@pms.hasPermission('tenant_view')")
     public R currentUserTenantList() {
-        KiccUser user = userService.getUserById(SecurityUtils.getCasUser().getId());
+        KiccUser user = userService.getUserById(SecurityUtils.getUser().getId());
         userService.getUserAuthority(user);
         List<Tenant> tenantList = tenantService.list(Wrappers.<Tenant>query().lambda().in(Tenant::getCode, user.getTenantIds()));
         return R.ok(tenantList);

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java

@@ -94,7 +94,7 @@ public class UserController {
         List<Role> roleList = roleService.list();
         // 设置用户角色信息
         if (user != null) {
-            roles = userRoleService.list(new LambdaQueryWrapper<UserRole>().eq(UserRole::getUserId, user.getCasUserId()))
+            roles = userRoleService.list(new LambdaQueryWrapper<UserRole>().eq(UserRole::getUserId, user.getId()))
                     .stream().map(UserRole::getRoleId).collect(Collectors.toList());
             user.setRoleIds(ArrayUtil.toArray(roles, String.class));
         }
@@ -128,9 +128,9 @@ public class UserController {
         // 企业内部用户推送类型数据同步
         if (StrUtil.equals(user.getUserType(), UserTypeEnum.INTERNAL_USER.getValue())) {
             List<User> userList = userService.list(Wrappers.<User>lambdaQuery()
-                    .ne(User::getId, SecurityUtils.getCasUser().getId())
+                    .ne(User::getId, SecurityUtils.getUser().getId())
                     .notIn(User::getUserType, UserTypeEnum.ENTERPRISE_USER.getValue(), UserTypeEnum.INTERNAL_USER.getValue()));
-            remotePushConcernFanService.enterpriseUserFanSave(user.getCasUserId(), userList);
+            remotePushConcernFanService.enterpriseUserFanSave(user.getId(), userList);
         }
         // 创建系统中的用户强制关联内部企业
         if (!ArrayUtil.contains(new String[]{
@@ -139,7 +139,7 @@ public class UserController {
         }, SecurityUtils.getUser().getUserType())) {
             List<User> enterpriseUserList = userService.list(Wrappers.<User>lambdaQuery()
                     .in(User::getUserType, UserTypeEnum.INTERNAL_USER.getValue()));
-            remotePushConcernFanService.bindConcernEnterpriseUser(user.getCasUserId(), enterpriseUserList);
+            remotePushConcernFanService.bindConcernEnterpriseUser(user.getId(), enterpriseUserList);
         }
         return R.ok();
     }
@@ -207,7 +207,7 @@ public class UserController {
     @GetMapping("/resetTenant")
     @PreAuthorize("@pms.hasPermission('user_edit')")
     public R resetTenant() {
-        KiccUser user = userService.getUserById(SecurityUtils.getCasUser().getId());
+        KiccUser user = userService.getUserById(SecurityUtils.getUser().getId());
         userService.getUserAuthority(user);
         userService.setCurrentUserTenant(user.getTenantId());
         return R.ok();

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/UserServiceImpl.java

@@ -68,7 +68,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             return rows;
         } else {
             // 修改遵守先删后新增规则
-            userRoleService.remove(new LambdaQueryWrapper<UserRole>().eq(UserRole::getUserId, user.getCasUserId()));
+            userRoleService.remove(new LambdaQueryWrapper<UserRole>().eq(UserRole::getUserId, user.getId()));
             // 新增用户与角色管理
             addUserRole(kiccUser);
             return baseMapper.updateById(user);
@@ -80,7 +80,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     @SneakyThrows
     public KiccUser getUserAuthority(KiccUser user) {
         // 设置角色列表
-        List<Role> roleList = roleService.selectMyRolesByUserId(user.getCasUserId());
+        List<Role> roleList = roleService.selectMyRolesByUserId(user.getId());
         // 设置角色列表 （ID）
         List<String> roleIds = roleList.stream().map(Role::getId).collect(Collectors.toList());
         user.setRoleIds(ArrayUtil.toArray(roleIds, String.class));
@@ -140,7 +140,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             // 新增用户与角色管理
             for (String roleId : roles) {
                 UserRole ur = new UserRole();
-                ur.setUserId(user.getCasUserId());
+                ur.setUserId(user.getId());
                 ur.setRoleId(roleId);
                 userRoleService.save(ur);
             }
@@ -208,7 +208,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 
     @Override
     public KiccUser getUserById(String userId) {
-        return baseMapper.getUserByParam(MapUtil.<String, Object>builder("casUserId", userId).build());
+        return baseMapper.getUserByParam(MapUtil.<String, Object>builder("id", userId).build());
     }
 
     @Override

kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/controller/WorkflowFormController.java

@@ -67,9 +67,9 @@ public class WorkflowFormController {
         List<FormProperty> formProperties = startFormData.getFormProperties();
         // 设置流程变量
         Map<String,String> formProcessVars = MapUtil.newHashMap();
-        formProcessVars.put(WorkflowConstant.USERNAME, SecurityUtils.getCasUser().getUsername());
+        formProcessVars.put(WorkflowConstant.USERNAME, SecurityUtils.getUser().getUsername());
         // 设置流程发起人
-        identityService.setAuthenticatedUserId(SecurityUtils.getCasUser().getId());
+        identityService.setAuthenticatedUserId(SecurityUtils.getUser().getId());
         // 设置流程标题
         if (StringUtils.isNotBlank(title)) {
             formProcessVars.put("title", title);

kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/controller/WorkflowModelController.java

@@ -9,7 +9,7 @@ import com.cloud.kicc.common.core.api.R;
 import com.cloud.kicc.common.core.constant.AppConstants;
 import com.cloud.kicc.common.core.exception.CheckedException;
 import com.cloud.kicc.common.core.util.FileUtil;
-import com.cloud.kicc.common.data.entity.CasUser;
+import com.cloud.kicc.common.data.entity.KiccUser;
 import com.cloud.kicc.common.security.exception.ServerErrorException;
 import com.cloud.kicc.workflow.api.entity.WorkflowModel;
 import com.cloud.kicc.workflow.api.vo.ProcessDefinitionInfoVo;
@@ -128,7 +128,7 @@ public class WorkflowModelController {
         this.checkForDuplicateKey(modelRepresentation);
         String modelJson = modelService.createModelJson(modelRepresentation);
         // 设置模型用户信息
-        CasUser user = com.cloud.kicc.common.security.util.SecurityUtils.getCasUser();
+        KiccUser user = com.cloud.kicc.common.security.util.SecurityUtils.getUser();
         UserEntity modelUser = new UserEntityImpl();
         modelUser.setId(user.getId());
         modelUser.setFirstName(user.getUsername());
@@ -171,7 +171,7 @@ public class WorkflowModelController {
 
             // 查询模型进行比较处理
             Model model = this.modelService.getModel(modelId);
-            CasUser currentUser = com.cloud.kicc.common.security.util.SecurityUtils.getCasUser();
+            KiccUser currentUser = com.cloud.kicc.common.security.util.SecurityUtils.getUser();
             boolean currentUserIsOwner = model.getLastUpdatedBy().equals(currentUser.getId());
             String resolveAction = values.getFirst("conflictResolveAction");
             // 版本校验(如果此时你在修改模型时别人提交了你的模型版本,如果没有版本校验就会出问题)

kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/controller/WorkflowTaskController.java

@@ -196,7 +196,7 @@ public class WorkflowTaskController {
     @PostMapping("/delegateTask")
     public R delegateTask(String taskId, String userId) {
         if (StringUtils.isBlank(taskId) || StringUtils.isBlank(userId)) return R.error("参数异常");
-        taskService.setOwner(taskId, SecurityUtils.getCasUser().getId());
+        taskService.setOwner(taskId, SecurityUtils.getUser().getId());
         // 设置任务委托人为的指定的处理人
         taskService.delegateTask(taskId, userId);
         return R.ok("委托成功");
@@ -205,7 +205,7 @@ public class WorkflowTaskController {
     /** 签收任务 */
     @PostMapping("/claim/{taskId}")
     public R claim(@PathVariable String taskId) {
-        workflowTaskService.claim(taskId, SecurityUtils.getCasUser().getId());
+        workflowTaskService.claim(taskId, SecurityUtils.getUser().getId());
         return R.ok("签收成功");
     }
 
@@ -221,7 +221,7 @@ public class WorkflowTaskController {
     public R transferTask(String taskId, String userId) {
         if (StringUtils.isBlank(userId) || StringUtils.isBlank(taskId)) return R.error("转移失败,参数异常");
         // 设置当前流程任务办理人
-        Authentication.setAuthenticatedUserId(SecurityUtils.getCasUser().getId());
+        Authentication.setAuthenticatedUserId(SecurityUtils.getUser().getId());
         taskService.setAssignee(taskId, userId);
         return R.ok("转移成功!");
     }

kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/WorkflowCopyController.java

@@ -29,7 +29,7 @@ public class WorkflowCopyController {
 
     @GetMapping("/list")
     public R list(Page page, WorkflowCopy workflowCopy) {
-        workflowCopy.setUserId(SecurityUtils.getCasUser().getId());
+        workflowCopy.setUserId(SecurityUtils.getUser().getId());
         IPage<WorkflowCopy> result = workflowCopyService.findList(page, workflowCopy);
         return R.ok(result.getRecords(), result.getTotal());
     }

kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/interceptor/ModelHandlerInterceptor.java

@@ -1,7 +1,6 @@
 package com.cloud.kicc.workflow.interceptor;
 
 import cn.hutool.core.util.StrUtil;
-import com.cloud.kicc.common.data.entity.CasUser;
 import com.cloud.kicc.common.data.entity.KiccUser;
 import lombok.SneakyThrows;
 import org.flowable.idm.api.User;
@@ -26,12 +25,12 @@ public class ModelHandlerInterceptor implements HandlerInterceptor {
 
 	@SneakyThrows
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
-		CasUser casUser = com.cloud.kicc.common.security.util.SecurityUtils.getCasUser();
+		KiccUser kiccUser = com.cloud.kicc.common.security.util.SecurityUtils.getUser();
 		User currentUserObject = SecurityUtils.getCurrentUserObject();
 		if (currentUserObject == null || StrUtil.isBlank(currentUserObject.getId())) {
 			User user = new UserEntityImpl();
-			user.setId(casUser.getId());
-			user.setFirstName(casUser.getUsername());
+			user.setId(kiccUser.getId());
+			user.setFirstName(kiccUser.getUsername());
 			user.setLastName("");
 			SecurityUtils.assumeUser(user);
 		}

kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/parser/handler/ExtendUserTaskActivityBehavior.java

@@ -114,7 +114,7 @@ public class ExtendUserTaskActivityBehavior extends UserTaskActivityBehavior {
                         break;
                     case "currentUserId":
                         // 当前登录用户进行候选
-                        candidateUserIds.add(SecurityUtils.getCasUser().getId());
+                        candidateUserIds.add(SecurityUtils.getUser().getId());
                         break;
                     case "sql":
                         // 查询sql中指定的id用户进行候选

kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/parser/handler/MultiInstanceHandler.java

@@ -83,7 +83,7 @@ public class MultiInstanceHandler {
                         break;
                     case "currentUserId":
                         // 当前登录用户进行候选
-                        candidateUserIds.add(SecurityUtils.getCasUser().getId());
+                        candidateUserIds.add(SecurityUtils.getUser().getId());
                         break;
                     case "sql":
                         // 查询sql中指定的id用户进行候选

kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/service/impl/WorkflowProcessServiceImpl.java

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cloud.kicc.common.core.constant.CommonConstants;
-import com.cloud.kicc.common.data.entity.CasUser;
 import com.cloud.kicc.common.data.entity.KiccUser;
 import com.cloud.kicc.common.security.util.SecurityUtils;
 import com.cloud.kicc.workflow.api.constant.WorkflowConstant;
@@ -103,7 +102,7 @@ public class WorkflowProcessServiceImpl implements WorkflowProcessService {
         result.setRecords(CollectionUtil.newArrayList());
         List<ProcessDefinition> processDefinitionList = query.listPage((current - 1) * size, size);
         for (ProcessDefinition processDefinition : processDefinitionList) {
-            if(this.validateProcessAuth(SecurityUtils.getCasUser(), processDefinition.getId())){
+            if(this.validateProcessAuth(SecurityUtils.getUser(), processDefinition.getId())){
                 Deployment deployment = repositoryService.createDeploymentQuery().deploymentId(processDefinition.getDeploymentId()).singleResult();
                 ProcessDefinitionInfoVo processDefinitionInfo =new ProcessDefinitionInfoVo();
                 processDefinitionInfo.setId(processDefinition.getId());
@@ -258,7 +257,7 @@ public class WorkflowProcessServiceImpl implements WorkflowProcessService {
 
             // 处理未签收任务,未领取就让当前用户领取
             if (StrUtil.isBlank(task.getAssignee())) {
-                taskService.claim(task.getId(), SecurityUtils.getCasUser().getId());
+                taskService.claim(task.getId(), SecurityUtils.getUser().getId());
             }
             runtimeService.setVariable(processInsId, WorkflowConstant.PROCESS_STATUS_CODE, extendMessage.getMesCode());
             List<EndEvent> endNodes = workflowBpmnModelService.findEndFlowElement(processInstance.getProcessDefinitionId());
@@ -388,7 +387,7 @@ public class WorkflowProcessServiceImpl implements WorkflowProcessService {
     @Override
     public IPage<ProcessInstanceInfoVo> selfProcessInstanceList(Map<String, Object> params) {
         HistoricProcessInstanceQuery query = historyService.createHistoricProcessInstanceQuery()
-                .startedBy(SecurityUtils.getCasUser().getId()).includeProcessVariables().orderByProcessInstanceStartTime().desc();
+                .startedBy(SecurityUtils.getUser().getId()).includeProcessVariables().orderByProcessInstanceStartTime().desc();
 
         String title = MapUtil.getStr(params, " title");
         Date beginTime = MapUtil.getDate(params, "beginTime"),
@@ -410,7 +409,7 @@ public class WorkflowProcessServiceImpl implements WorkflowProcessService {
         IPage result = new Page(current, size);
         result.setTotal(query.count());
         result.setRecords(CollectionUtil.newArrayList());
-        List<HistoricProcessInstance> historicProcessInstanceList = query.involvedUser(SecurityUtils.getCasUser().getId()).listPage((current - 1) * size, size);
+        List<HistoricProcessInstance> historicProcessInstanceList = query.involvedUser(SecurityUtils.getUser().getId()).listPage((current - 1) * size, size);
 
         for (HistoricProcessInstance historicProcessInstance : historicProcessInstanceList) {
             ProcessInstanceInfoVo processInstanceInfo = this.queryProcessState(historicProcessInstance.getId());
@@ -437,11 +436,11 @@ public class WorkflowProcessServiceImpl implements WorkflowProcessService {
         // 可由外部提供流程发起人
         String userId = MapUtil.getStr(vars, WorkflowConstant.INITIATOR);
         if(userId == null){
-            userId= SecurityUtils.getCasUser().getId();
+            userId= SecurityUtils.getUser().getId();
         }
 
         // 设置流程执行人
-        vars.put(WorkflowConstant.USERNAME, SecurityUtils.getCasUser().getUsername());
+        vars.put(WorkflowConstant.USERNAME, SecurityUtils.getUser().getUsername());
 
         // 设置流程发起人
         identityService.setAuthenticatedUserId(userId);
@@ -472,7 +471,7 @@ public class WorkflowProcessServiceImpl implements WorkflowProcessService {
     }
 
     /** 流程权限校验 */
-    private boolean validateProcessAuth(CasUser user, String processDefId) {
+    private boolean validateProcessAuth(KiccUser user, String processDefId) {
         List<IdentityLink> identityLinks = repositoryService.getIdentityLinksForProcessDefinition(processDefId);
         if(identityLinks.isEmpty()){
             return true;

kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/service/impl/WorkflowTaskServiceImpl.java

@@ -80,7 +80,7 @@ public class WorkflowTaskServiceImpl implements WorkflowTaskService {
     public IPage<ProcessInstanceInfoVo> list(Map<String, Object> params) {
         // =============== 已经签收或者等待签收的任务  ===============
         TaskQuery query = taskService.createTaskQuery()
-                .taskCandidateOrAssigned(SecurityUtils.getCasUser().getId()).active()
+                .taskCandidateOrAssigned(SecurityUtils.getUser().getId()).active()
                 .includeProcessVariables().orderByTaskCreateTime().desc();
 
         // 设置查询条件
@@ -130,7 +130,7 @@ public class WorkflowTaskServiceImpl implements WorkflowTaskService {
     @Override
     public IPage<HistoryTaskInfoVo> historyList(Map<String, Object> params) {
         HistoricTaskInstanceQuery query = historyService.createHistoricTaskInstanceQuery()
-                .taskAssignee(SecurityUtils.getCasUser().getId()).finished()
+                .taskAssignee(SecurityUtils.getUser().getId()).finished()
                 .includeProcessVariables().orderByHistoricTaskInstanceEndTime().desc();
 
         // 设置查询条件
@@ -279,7 +279,7 @@ public class WorkflowTaskServiceImpl implements WorkflowTaskService {
             // 未签收任务
         } else if(StrUtil.isBlank(task.getAssignee())){
             // 签收任务
-            taskService.claim(workFlow.getTaskId(),SecurityUtils.getCasUser().getId());
+            taskService.claim(workFlow.getTaskId(),SecurityUtils.getUser().getId());
             // 提交任务
             taskService.complete(workFlow.getTaskId(), processVars);
         } else  {
@@ -340,7 +340,7 @@ public class WorkflowTaskServiceImpl implements WorkflowTaskService {
         Task task = taskService.createTaskQuery().taskId(currentTaskId).singleResult();
         if(StrUtil.isBlank(task.getAssignee())){
             //代理人为空自己签收任务
-            taskService.claim(currentTaskId, SecurityUtils.getCasUser().getId());
+            taskService.claim(currentTaskId, SecurityUtils.getUser().getId());
         }
         // 退回发起者处理,退回到发起者,默认设置任务执行人为发起者
         ActivityInstance targetRealActivityInstance = runtimeService.createActivityInstanceQuery()