公共调用人员信息调整

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/sys/factory/UserApiFallbackFactory.java

@@ -28,6 +28,9 @@ public class UserApiFallbackFactory implements FallbackFactory <IUserApi> {
             public UserDTO getByLoginName(String loginName, String tenantId) {
                 return null;
             }
+            public UserDTO getByLoginNameNotTenantId(String loginName) {
+                return null;
+            }
 
             public void clearCache(UserDTO userDTO) {
 
@@ -101,6 +104,11 @@ public class UserApiFallbackFactory implements FallbackFactory <IUserApi> {
 
             }
 
+            @Override
+            public UserDTO getLoginUser() {
+                return null;
+            }
+
 
         };
     }

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/sys/feign/IUserApi.java

@@ -29,6 +29,15 @@ public interface IUserApi {
     UserDTO getByLoginName(@RequestParam(value = "loginName") String loginName, @RequestParam(value = "tenantId") String tenantId);
 
     /**
+     * 根据登录名获取用户
+     *
+     * @param loginName
+     * @return 取不到返回null
+     */
+    @GetMapping(value = BASE_URL + "/getByLoginNameNotTenantId")
+    UserDTO getByLoginNameNotTenantId(@RequestParam(value = "loginName") String loginName);
+
+    /**
      * 清除用户缓存
      */
     @PostMapping(value = BASE_URL + "/clearCache")
@@ -154,6 +163,15 @@ public interface IUserApi {
      */
     @GetMapping(value = BASE_URL + "/updateUserUpPassword")
     void updateUserUpPassword(@RequestBody UserDTO userDTO);
+
+    /**
+     * 获取当前登录人信息
+     *
+     * @return 取不到返回null
+     */
+    @GetMapping(value = BASE_URL + "/getLoginUser")
+    UserDTO getLoginUser();
+
 }
 
 

jeeplus-common/jeeplus-common-core/src/main/java/com/jeeplus/common/constant/AppNameConstants.java

@@ -17,4 +17,8 @@ public interface AppNameConstants {
      * 流程服务
      */
     String APP_FLOWABLE_SERVICE = "jeeplus-flowable";
+    /**
+     * 公共模块
+     */
+    String APP_PUBLIC_MODULES = "jeeplus-public-modules";
 }

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/projectRecords/service/dto/ProjectDTO.java

@@ -4,7 +4,6 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.jeeplus.core.service.dto.BaseDTO;
 import com.jeeplus.sys.service.dto.OfficeDTO;
 import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
-import com.jeeplus.pubmodules.oss.service.dto.OssServiceDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/flowable/common/handler/ExtUserTaskActivityBehavior.java

@@ -11,7 +11,6 @@ import com.jeeplus.flowable.utils.FlowableUtils;
 import com.jeeplus.flowable.utils.StringUtils;
 import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.service.dto.UserDTO;
-import com.jeeplus.sys.utils.UserUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.flowable.bpmn.model.FlowElement;
 import org.flowable.bpmn.model.Process;
@@ -123,7 +122,7 @@ public class ExtUserTaskActivityBehavior extends UserTaskActivityBehavior {
                         if(flowAssignee.getValue ().contains("currentUserSql:")){
                             //对应sql为：select su.* from sys_user_role a left join sys_role sr on sr.id = a.role_id left join sys_user su on su.id = a.user_id left join sys_office so on so.id = su.office_id where sr.en_name= 'bmzr' and so.id = (select office_id from sys_user where id = @currentUser.id)
                             //用于查询当前登录人的部门主任人员信息
-                            UserDTO currentUserDTO = UserUtils.getCurrentUserDTO();
+                            UserDTO currentUserDTO = SpringUtil.getBean ( IUserApi.class ).getLoginUser ();
                             String sql = flowAssignee.getValue ();
                             if(sql.contains("@currentUser.id")){
                                 //将标志进行去除
@@ -140,7 +139,7 @@ public class ExtUserTaskActivityBehavior extends UserTaskActivityBehavior {
                         if(flowAssignee.getValue ().contains("cwCurrentUserSql:")){
                             //对应sql为：select su.* from sys_user_role a left join sys_role sr on sr.id = a.role_id left join sys_user su on su.id = a.user_id left join sys_office so on so.id = su.office_id where sr.en_name= 'bmzr' and so.id = (select office_id from sys_user where id = @currentUser.id)
                             //用于查询当前登录人的部门主任人员信息
-                            UserDTO currentUserDTO = UserUtils.getCurrentUserDTO();
+                            UserDTO currentUserDTO  = SpringUtil.getBean ( IUserApi.class ).getLoginUser ();
                             String sql = flowAssignee.getValue ();
                             if(sql.contains("@currentUser.id")){
                                 //将标志进行去除
@@ -162,7 +161,7 @@ public class ExtUserTaskActivityBehavior extends UserTaskActivityBehavior {
                         if(flowAssignee.getValue ().contains("zsbxCurrentUserSql:")){
                             //对应sql为：select su.* from sys_user_role a left join sys_role sr on sr.id = a.role_id left join sys_user su on su.id = a.user_id left join sys_office so on so.id = su.office_id where sr.en_name= 'bmzr' and so.id = (select office_id from sys_user where id = @currentUser.id)
                             //用于查询当前登录人的部门主任人员信息
-                            UserDTO currentUserDTO = UserUtils.getCurrentUserDTO();
+                            UserDTO currentUserDTO = SpringUtil.getBean ( IUserApi.class ).getLoginUser ();
                             String sql = flowAssignee.getValue ();
                             if(sql.contains("@currentUser.id")){
                                 //将标志进行去除

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/flowable/service/FlowProcessService.java

@@ -4,6 +4,7 @@
 package com.jeeplus.flowable.service;
 
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -20,7 +21,6 @@ import com.jeeplus.flowable.vo.TaskVo;
 import com.jeeplus.sys.feign.ITenantApi;
 import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.service.dto.UserDTO;
-import com.jeeplus.sys.utils.UserUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
@@ -675,7 +675,7 @@ public class FlowProcessService {
 
             taskService.addComment (currentTask.getId (),procInsId, taskComment.getCommentType (), taskComment.getFullMessage ());
             if(StrUtil.isBlank (currentTask.getAssignee ()))  { // 未签收任务
-                taskService.claim (currentTask.getId (), UserUtils.getCurrentUserDTO ().getId ());
+                taskService.claim (currentTask.getId (), SpringUtil.getBean ( IUserApi.class ).getLoginUser ().getId ());
             }
         }
     }

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/flowable/service/FlowTaskService.java

@@ -26,7 +26,6 @@ import com.jeeplus.flowable.vo.*;
 import com.jeeplus.sys.feign.ITenantApi;
 import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.service.dto.UserDTO;
-import com.jeeplus.sys.utils.UserUtils;
 import liquibase.pro.packaged.S;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -175,7 +174,7 @@ public class FlowTaskService {
                     case "三级复核":
                         if(null != flow.getComment() && "success".equals(flow.getComment().getLevel())){
                             if(StringUtils.isNotBlank(flow.getAssigneeName())){
-                                UserDTO userDTO = UserUtils.getByName("潘中");
+                                UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByLoginNameNotTenantId("潘中");
                                 if(null != userDTO && StringUtils.isNotBlank(userDTO.getName())){
                                     data.put("thirdlyAuditName",userDTO.getName());
                                 }else{
@@ -260,7 +259,7 @@ public class FlowTaskService {
     public String taskDispose(String data) {
         List<CwWorkClientBaseDtoTest> list = JSON.parseObject(data, new TypeReference<List<CwWorkClientBaseDtoTest>>() {});
 
-        String userId = UserUtils.getCurrentUserDTO ().getId ();
+        String userId = SpringUtil.getBean ( IUserApi.class ).getLoginUser ().getId ();
         // =============== 已经签收或者等待签收的任务  ===============
         TaskQuery todoTaskQuery = taskService.createTaskQuery ().taskCandidateOrAssigned (userId).active ()
                 .includeProcessVariables ().orderByTaskCreateTime ().desc ();

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/flowable/service/MyNoticeService.java

@@ -1,5 +1,6 @@
 package com.jeeplus.flowable.service;
 
+import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -7,8 +8,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.core.domain.BaseEntity;
 import com.jeeplus.flowable.mapper.MyNoticeListMapper;
 import com.jeeplus.flowable.model.MyNoticeList;
+import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.service.dto.UserDTO;
-import com.jeeplus.sys.utils.UserUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -34,9 +35,9 @@ public class MyNoticeService {
      */
     public Page<MyNoticeList> noticeList(Page<MyNoticeList> page, String type, String title, String taskName){
         // 获取当前登录人名称查询出未查看通知列表
-        String userName = UserUtils.getCurrentUserDTO ().getName ();
+        String userName = SpringUtil.getBean ( IUserApi.class ).getLoginUser ().getName ();
         QueryWrapper<MyNoticeList> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("a.notice_id", UserUtils.getCurrentUserDTO ().getId());
+        queryWrapper.eq("a.notice_id", SpringUtil.getBean ( IUserApi.class ).getLoginUser ().getId());
         queryWrapper.orderByDesc("a.create_date");
         if (StringUtils.isNotEmpty(type)) {
             queryWrapper.eq("a.type", Integer.parseInt(type));
@@ -67,7 +68,7 @@ public class MyNoticeService {
             mapper.updateById(one);
         }
         //获取当前登录人信息
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getLoginUser ();
         //生成id
         String id = UUID.randomUUID().toString().replace("-", "");
         notice.setId(id);
@@ -135,7 +136,7 @@ public class MyNoticeService {
 
     public String readAll() {
         // 获取当前登录人信息
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getLoginUser ();
         mapper.readAll(userDTO.getName());
         return "操作成功";
     }

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/flowable/utils/StringUtils.java

@@ -4,7 +4,6 @@
 package com.jeeplus.flowable.utils;
 
 import com.google.common.collect.Lists;
-import com.jeeplus.sys.utils.SpringContextHolder;
 import com.jeeplus.utils.Encodes;
 import net.sf.json.JSONObject;
 import org.apache.commons.lang3.StringEscapeUtils;
@@ -246,15 +245,6 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
 		return toLong(val).intValue();
 	}
 
-	/**
-	 * 获得i18n字符串
-	 */
-	public static String getMessage(String code, Object[] args) {
-		LocaleResolver localLocaleResolver = (LocaleResolver) SpringContextHolder.getBean(LocaleResolver.class);
-		HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
-		Locale localLocale = localLocaleResolver.resolveLocale(request);
-		return SpringContextHolder.getApplicationContext().getMessage(code, args, localLocale);
-	}
 
 	/**
 	 * 获得用户远程地址

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/oss/mapper/OssServiceMapper.java

@@ -30,4 +30,12 @@ public interface OssServiceMapper extends BaseMapper<WorkAttachment> {
      */
     @InterceptorIgnore(tenantLine = "true")
     List<AttachmentDTO> getByAttachmentIdAndUrlAndAttachmentFlag(WorkAttachment workAttachment);
+
+    /**
+     * 查询电子章文件信息
+     * @param id
+     * @return
+     */
+    /*@InterceptorIgnore(tenantLine = "true")
+    List<com.jeeplus.sys.domain.WorkAttachment> selectWorkAttachmentByReportId(String id);*/
 }

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/oss/mapper/xml/OssServiceMapper.xml

@@ -93,4 +93,12 @@
              </if>
          </where>
     </select>
+
+    <!--<select id="selectWorkAttachmentByReportId"
+            resultType="com.jeeplus.sys.domain.WorkAttachment">
+
+        select a.* from work_attachment a
+        left join cw_project_report_file cf on cf.report_file_id = a.id
+        where a.attachment_id = #{id} and cf.seal_type = 1 and a.del_flag = 0
+    </select>-->
 </mapper>

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/oss/service/OssService.java

@@ -441,5 +441,9 @@ public class OssService extends ServiceImpl<OssServiceMapper, WorkAttachment> {
         return i.getId();
     }
 
+    /*public List<com.jeeplus.sys.domain.WorkAttachment> selectWorkAttachmentByReportId (String id){
+        return ossServiceMapper.selectWorkAttachmentByReportId(id);
+    }*/
+
 
 }

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/feign/UserApiImpl.java

@@ -1,6 +1,7 @@
 package com.jeeplus.sys.feign;
 
 import cn.hutool.core.util.StrUtil;
+import com.jeeplus.common.SecurityUtils;
 import com.jeeplus.common.TokenProvider;
 import com.jeeplus.sys.domain.User;
 import com.jeeplus.sys.service.UserService;
@@ -32,6 +33,15 @@ public class UserApiImpl implements IUserApi {
     }
 
     @Override
+    public UserDTO getByLoginNameNotTenantId(String loginName) {
+        if ( StrUtil.isBlank ( loginName )) {
+            return null;
+        }
+        UserDTO userDTO = userService.getByLoginNameNotTenantId ( loginName);
+        return userDTO;
+    }
+
+    @Override
     public void updateUser(UserDTO userDTO) {
         userService.updateById ( UserWrapper.INSTANCE.toEntity ( userDTO ) );
     }
@@ -113,4 +123,9 @@ public class UserApiImpl implements IUserApi {
         userService.updateUserUpPassword (userDTO);
     }
 
+    @Override
+    public UserDTO getLoginUser() {
+        return UserUtils.getCurrentUserDTO();
+    }
+
 }

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/service/UserService.java

@@ -158,6 +158,20 @@ public class UserService extends ServiceImpl <UserMapper, User> {
         return userDTO;
     }
 
+    /**
+     * 根据登录名获取用户
+     *
+     * @param loginName
+     * @return
+     */
+    public UserDTO getByLoginNameNotTenantId(String loginName) {
+        QueryWrapper queryWrapper = new QueryWrapper ( );
+        queryWrapper.eq ( "a.login_name", loginName );
+        queryWrapper.eq ( "a.del_flag", CommonConstants.NOT_DELETED );
+        UserDTO userDTO = baseMapper.get ( queryWrapper );
+        return userDTO;
+    }
+
 
     /**
      * 自定义分页检索