lixing пре 4 година
родитељ
комит
a0fe5e54fe
16 измењених фајлова са 96 додато и 131 уклоњено
  1. 0 24
      fm-person/src/main/java/com/persagy/fm/common/model/ConvertDmpTool.java
  2. 5 4
      fm-person/src/main/java/com/persagy/fm/department/controller/DepEnumController.java
  3. 1 1
      fm-person/src/main/java/com/persagy/fm/department/controller/DepartmentController.java
  4. 5 6
      fm-person/src/main/java/com/persagy/fm/department/jms/handler/GroupMsgHandler.java
  5. 3 3
      fm-person/src/main/java/com/persagy/fm/department/service/impl/DepartmentServiceImpl.java
  6. 3 5
      fm-person/src/main/java/com/persagy/fm/depproject/service/impl/DepProjectServiceImpl.java
  7. 25 24
      fm-person/src/main/java/com/persagy/fm/person/controller/PersonController.java
  8. 6 6
      fm-person/src/main/java/com/persagy/fm/person/service/impl/PersonServiceImpl.java
  9. 9 8
      fm-person/src/main/java/com/persagy/fm/profession/controller/ProfessionController.java
  10. 3 4
      fm-person/src/main/java/com/persagy/fm/profession/service/impl/ProfessionServiceImpl.java
  11. 5 5
      fm-person/src/main/java/com/persagy/fm/saas/accountrole/service/impl/SaasAccountRoleServiceImpl.java
  12. 12 11
      fm-person/src/main/java/com/persagy/fm/saas/role/controller/SaasRoleController.java
  13. 3 9
      fm-person/src/main/java/com/persagy/fm/saas/role/service/impl/SaasRoleServiceImpl.java
  14. 13 12
      fm-person/src/main/java/com/persagy/fm/workresume/controller/WorkResumeController.java
  15. 3 3
      fm-person/src/main/java/com/persagy/fm/workresume/service/impl/WorkResumeServiceImpl.java
  16. 0 6
      pom.xml

+ 0 - 24
fm-person/src/main/java/com/persagy/fm/common/model/ConvertDmpTool.java

@@ -1,24 +0,0 @@
-package com.persagy.fm.common.model;
-
-import com.persagy.fm.common.model.dto.DmpRequiredParam;
-
-/**
- * @description:
- * @author: lixing
- * @company: Persagy Technology Co.,Ltd
- * @since: 2021/3/8 2:15 下午
- * @version: V1.0
- **/
-public interface ConvertDmpTool {
-    /**
-     * @description: RequiredParams转换为DmpBaseDTO
-     * @param: requiredParams
-     * @return: com.persagy.fm.person.model.dto.DmpBaseDTO
-     * @exception:
-     * @author: lixing
-     * @company: Persagy Technology Co.,Ltd
-     * @since: 2021/3/8 10:46 上午
-     * @version: V1.0
-     */
-    DmpRequiredParam convert2DmpRequiredParam(RequiredParams requiredParams);
-}

+ 5 - 4
fm-person/src/main/java/com/persagy/fm/department/controller/DepEnumController.java

@@ -2,8 +2,9 @@ package com.persagy.fm.department.controller;
 
 import com.persagy.fm.common.model.dto.EnumQueryDTO;
 import com.persagy.fm.common.model.vo.EnumVO;
-import com.persagy.fm.common.response.FmResponseContent;
-import com.persagy.fm.common.response.FmResponseUtil;
+import com.persagy.fm.common.response.CommonResult;
+import com.persagy.fm.common.response.PageList;
+import com.persagy.fm.common.utils.ResultHelper;
 import com.persagy.fm.department.service.IDepEnumService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -32,7 +33,7 @@ public class DepEnumController {
 
     @PostMapping("/get")
     @ApiOperation(value="查询")
-    public FmResponseContent<List<EnumVO>> queryEnum(
+    public CommonResult<PageList<EnumVO>> queryEnum(
             @Valid @RequestBody EnumQueryDTO enumQueryDTO) {
         String type = enumQueryDTO.getType();
         List<EnumVO> resultList = Lists.newArrayList();
@@ -46,6 +47,6 @@ public class DepEnumController {
             default:
                 break;
         }
-        return FmResponseUtil.successContent(resultList);
+        return ResultHelper.multi(resultList);
     }
 }

+ 1 - 1
fm-person/src/main/java/com/persagy/fm/department/controller/DepartmentController.java

@@ -145,7 +145,7 @@ public class DepartmentController {
 
     //@ApiOperation(value = "部门列表, 分页查询")
     //@PostMapping("/query")
-    //public FmResponseContent<List<ResponseDepartmentListItemVO>> queryDepartment(
+    //public CommonResult<List<ResponseDepartmentListItemVO>> queryDepartment(
     //        @Valid @RequestBody PageQueryDepartmentDTO pageQueryDepartmentDTO) {
     //    IPage<ResponseDepartmentListItemVO> pagedList = departmentService.pageQueryDepartment(pageQueryDepartmentDTO);
     //    IPage<ResponseDepartmentListItemVO> pagedResultList = pagedList.convert(item -> {

+ 5 - 6
fm-person/src/main/java/com/persagy/fm/department/jms/handler/GroupMsgHandler.java

@@ -3,9 +3,8 @@ package com.persagy.fm.department.jms.handler;
 import com.google.gson.Gson;
 import com.persagy.common.enums.ResponseCode;
 import com.persagy.common.exception.BusinessException;
+import com.persagy.fm.common.context.DefaultAppContext;
 import com.persagy.fm.common.jms.MsgBaseHandler;
-import com.persagy.fm.common.model.RequiredParams;
-import com.persagy.fm.common.model.RequiredParamsStorage;
 import com.persagy.fm.department.constant.DepJmsTypeConstants;
 import com.persagy.fm.department.constant.enums.DepTypeEnum;
 import com.persagy.fm.department.constant.enums.ResourceFromEnum;
@@ -88,10 +87,10 @@ public class GroupMsgHandler extends MsgBaseHandler {
         addDepartmentDTO.setResourceFrom(ResourceFromEnum.USER_CREATE.getType());
         addDepartmentDTO.setFullPath(addDepartmentDTO.getName());
 
-        // 给RequiredParamsStorage赋值,调用接口时,会从RequiredParamsStorage中获取默认参数
-        RequiredParams requiredParams = new RequiredParams(
-                groupCreateMsg.getGroupCode(), "", "", "", groupCreateMsg.getUserId());
-        RequiredParamsStorage.set(requiredParams);
+        // 给全局参数赋值
+        DefaultAppContext.getContext().setAppId("pc");
+        DefaultAppContext.getContext().setGroupCode(groupCreateMsg.getGroupCode());
+        DefaultAppContext.getContext().setAccountId(groupCreateMsg.getUserId());
 
         departmentService.createDepartment(addDepartmentDTO);
     }

+ 3 - 3
fm-person/src/main/java/com/persagy/fm/department/service/impl/DepartmentServiceImpl.java

@@ -9,7 +9,7 @@ import com.google.common.collect.Lists;
 import com.persagy.common.enums.ResponseCode;
 import com.persagy.common.exception.BusinessException;
 import com.persagy.fm.common.constant.enums.ValidEnum;
-import com.persagy.fm.common.model.RequiredParamsStorage;
+import com.persagy.fm.common.context.DefaultAppContext;
 import com.persagy.fm.common.model.dto.Sort;
 import com.persagy.fm.department.constant.enums.DepTypeEnum;
 import com.persagy.fm.department.constant.enums.ResourceFromEnum;
@@ -142,7 +142,7 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
             department.setParentId(0L);
         }
 
-        department.setCreator(RequiredParamsStorage.getUserId());
+        department.setCreator(DefaultAppContext.getContext().getAccountId());
     }
 
     /**
@@ -187,7 +187,7 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
         if (!nameBeforeChange.equals(updateDepartmentDTO.getName())) {
             cascadeUpdateFullPathWhenNameChange(department, nameBeforeChange);
         }
-        department.setModifier(RequiredParamsStorage.getUserId());
+        department.setModifier(DefaultAppContext.getContext().getAccountId());
         updateById(department);
         Long depId = department.getId();
         List<String> projectIds = updateDepartmentDTO.getProjectIds();

+ 3 - 5
fm-person/src/main/java/com/persagy/fm/depproject/service/impl/DepProjectServiceImpl.java

@@ -1,6 +1,6 @@
 package com.persagy.fm.depproject.service.impl;
 
-import com.persagy.fm.common.model.RequiredParamsStorage;
+import com.persagy.fm.common.context.DefaultAppContext;
 import com.persagy.fm.depproject.dao.DepProjectMapper;
 import com.persagy.fm.depproject.service.IDepProjectService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -8,14 +8,12 @@ import com.persagy.fm.saas.project.model.vo.ProjectTreeItemVO;
 import com.persagy.fm.saas.project.service.ISaasProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.apache.commons.lang.StringUtils;
 import com.persagy.fm.common.constant.enums.ValidEnum;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.persagy.fm.depproject.model.*;
 import com.persagy.fm.depproject.model.dto.*;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -84,7 +82,7 @@ public class DepProjectServiceImpl extends ServiceImpl<DepProjectMapper, DepProj
      * @version V1.0 2021/3/12 12:29 下午
      */
     private void setDefaultValue(DepProject depProject) {
-        depProject.setCreator(RequiredParamsStorage.getUserId());
+        depProject.setCreator(DefaultAppContext.getContext().getAccountId());
     }
 
     /**
@@ -114,7 +112,7 @@ public class DepProjectServiceImpl extends ServiceImpl<DepProjectMapper, DepProj
     public void updateDepProject(UpdateDepProjectDTO updateDepProjectDTO) {
         DepProject depProject = getById(updateDepProjectDTO.getId());
         depProject = ConvertDepProjectTool.INSTANCE.convertUpdateDto2Entity(depProject, updateDepProjectDTO);
-        depProject.setModifier(RequiredParamsStorage.getUserId());
+        depProject.setModifier(DefaultAppContext.getContext().getAccountId());
         updateById(depProject);
     }
 

+ 25 - 24
fm-person/src/main/java/com/persagy/fm/person/controller/PersonController.java

@@ -1,6 +1,7 @@
 package com.persagy.fm.person.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.persagy.fm.common.utils.ResultHelper;
 import com.persagy.fm.department.model.dto.DeleteDepartmentDTO;
 import com.persagy.fm.person.model.vo.SimplePersonListItemVO;
 import com.persagy.fm.person.service.IPersonProjectService;
@@ -41,103 +42,103 @@ public class PersonController {
 
     @ApiOperation(value = "创建人员")
     @PostMapping("/create")
-    public FmResponseItem<FmResponseUpsertVO> createPerson(
+    public CommonResult<FmResponseUpsertVO> createPerson(
             @Valid @RequestBody AddPersonDTO addPersonDTO) {
         Long id = personService.createPerson(addPersonDTO);
-        return FmResponseUtil.successItem(new FmResponseUpsertVO(id));
+        return ResultHelper.single(new FmResponseUpsertVO(id));
     }
 
     @ApiOperation(value = "人员详情")
     @PostMapping("/get")
-    public FmResponseItem<ResponsePersonItemVO> queryPersonDetail(
+    public CommonResult<ResponsePersonItemVO> queryPersonDetail(
             @Valid @RequestBody QueryPersonDetailDTO queryPersonDetailDTO) {
         Person person = personService.queryPersonDetail(queryPersonDetailDTO.getId());
         ResponsePersonItemVO responsePersonItemVO = ConvertPersonTool.INSTANCE.convert2ResponseItemDTO(person);
-        return FmResponseUtil.successItem(responsePersonItemVO);
+        return ResultHelper.single(responsePersonItemVO);
     }
 
 
     @ApiOperation(value = "更新人员")
     @PostMapping("/update")
-    public FmResponseItem<FmResponseUpsertVO> updatePerson(
+    public CommonResult<FmResponseUpsertVO> updatePerson(
             @Valid @RequestBody UpdatePersonDTO updatePersonDTO) {
         personService.updatePerson(updatePersonDTO);
-        return FmResponseUtil.successItem(new FmResponseUpsertVO(updatePersonDTO.getId()));
+        return ResultHelper.single(new FmResponseUpsertVO(updatePersonDTO.getId()));
     }
 
 
     @ApiOperation(value = "删除人员")
     @PostMapping("/delete")
-    public FmResponseMsg deletePerson(
+    public CommonResult deletePerson(
             @RequestBody @Valid DeletePersonDTO deletePersonDTO) {
         personService.deletePerson(deletePersonDTO.getId());
-        return FmResponseUtil.successMsg("删除成功");
+        return ResultHelper.success("删除成功");
     }
 
     @ApiOperation(value = "查找人名")
     @PostMapping("/name_quick_search")
-    public FmResponseContent<List<SimplePersonListItemVO>> nameQuickSearch(
+    public CommonResult<PageList<SimplePersonListItemVO>> nameQuickSearch(
             @Valid @RequestBody NameQuickSearchDTO nameQuickSearchDTO) {
         List<Person> personList = personService.nameQuickSearch(nameQuickSearchDTO);
         List<SimplePersonListItemVO> resultList = ConvertPersonTool.INSTANCE.convert2SimpleList(personList);
-        return FmResponseUtil.successContent(resultList);
+        return ResultHelper.multi(resultList);
     }
 
 
     @ApiOperation(value = "人员列表, 分页查询")
     @PostMapping("/query")
-    public FmResponseContent<List<ResponsePersonListItemVO>> queryPerson(
+    public CommonResult<PageList<ResponsePersonListItemVO>> queryPerson(
             @Valid @RequestBody PageQueryPersonDTO pageQueryPersonDTO) {
         IPage<ResponsePersonListItemVO> pagedList = personService.pageQueryPerson(pageQueryPersonDTO);
-        return FmResponseUtil.successContent(pagedList);
+        return ResultHelper.multi(pagedList);
     }
 
 //    @ApiOperation(value = "重置密码")
 //    @PostMapping("/password/reset")
-//    public FmResponseMsg resetPassword(
+//    public CommonResult resetPassword(
 //            @Valid @RequestBody DeletePersonDTO deletePersonDTO) {
 //        personService.resetPassWord(deletePersonDTO.getId());
-//        return FmResponseUtil.successMsg("重置成功");
+//        return ResultHelper.success("重置成功");
 //    }
 
     @ApiOperation(value = "禁用人员")
     @PostMapping("/disable")
-    public FmResponseItem<FmResponseUpsertVO> disablePerson(
+    public CommonResult<FmResponseUpsertVO> disablePerson(
             @Valid @RequestBody DeletePersonDTO deletePersonDTO) {
         personService.disablePerson(deletePersonDTO.getId());
-        return FmResponseUtil.successItem(new FmResponseUpsertVO(deletePersonDTO.getId()));
+        return ResultHelper.single(new FmResponseUpsertVO(deletePersonDTO.getId()));
     }
 
     @ApiOperation(value = "离职人员")
     @PostMapping("/dismiss")
-    public FmResponseItem<FmResponseUpsertVO> dismissPerson(
+    public CommonResult<FmResponseUpsertVO> dismissPerson(
             @Valid @RequestBody DeletePersonDTO deletePersonDTO) {
         personService.dismissPerson(deletePersonDTO.getId());
-        return FmResponseUtil.successItem(new FmResponseUpsertVO(deletePersonDTO.getId()));
+        return ResultHelper.single(new FmResponseUpsertVO(deletePersonDTO.getId()));
     }
 
     @ApiOperation(value = "人员恢复在职")
     @PostMapping("/rejoin")
-    public FmResponseItem<FmResponseUpsertVO> rejoinPerson(
+    public CommonResult<FmResponseUpsertVO> rejoinPerson(
             @Valid @RequestBody DeletePersonDTO deletePersonDTO) {
         personService.rejoinPerson(deletePersonDTO.getId());
-        return FmResponseUtil.successItem(new FmResponseUpsertVO(deletePersonDTO.getId()));
+        return ResultHelper.single(new FmResponseUpsertVO(deletePersonDTO.getId()));
     }
 
     @ApiOperation(value = "批量更新")
     @PostMapping("/batch_update")
-    public FmResponseMsg batchUpdatePeople(
+    public CommonResult batchUpdatePeople(
             @Valid @RequestBody BatchUpdatePersonDTO batchUpdatePersonDTO) {
         personService.batchUpdatePeople(batchUpdatePersonDTO);
-        return FmResponseUtil.successMsg("批量更新成功");
+        return ResultHelper.success("批量更新成功");
     }
 
     @ApiOperation(value = "人员项目树")
     @PostMapping("/projects/tree")
-    public FmResponseContent<List<ProjectTreeItemVO>> queryPersonProjectTree(
+    public CommonResult<PageList<ProjectTreeItemVO>> queryPersonProjectTree(
             @Valid @RequestBody DeletePersonDTO deletePersonDTO) {
         List<ProjectTreeItemVO> projectTreeItemVOList = personProjectService.queryPersonProjectTree(deletePersonDTO.getId());
-        return FmResponseUtil.successContent(projectTreeItemVOList);
+        return ResultHelper.multi(projectTreeItemVOList);
     }
 }
 

+ 6 - 6
fm-person/src/main/java/com/persagy/fm/person/service/impl/PersonServiceImpl.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.persagy.fm.common.constant.PageQueryConstants;
 import com.persagy.fm.common.constant.enums.ValidEnum;
-import com.persagy.fm.common.model.RequiredParamsStorage;
+import com.persagy.fm.common.context.DefaultAppContext;
 import com.persagy.fm.common.response.FmResponseContent;
 import com.persagy.fm.person.dao.PersonMapper;
 import com.persagy.fm.person.model.ConvertPersonTool;
@@ -119,8 +119,8 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
     private String createAccount(AddPersonDTO addPersonDTO) {
         AddSaasAccountDTO addSaasAccountDTO = new AddSaasAccountDTO();
         addSaasAccountDTO.setAccountBelong(AccountBelongEnum.BUSINESS.getType());
-        addSaasAccountDTO.setGroupCode(RequiredParamsStorage.getGroupCode());
-        addSaasAccountDTO.setAppId(RequiredParamsStorage.getAppId());
+        addSaasAccountDTO.setGroupCode(DefaultAppContext.getContext().getGroupCode());
+        addSaasAccountDTO.setAppId(DefaultAppContext.getContext().getAppId());
         addSaasAccountDTO.setUsername(addPersonDTO.getUsername());
         addSaasAccountDTO.setPhoneNum(addPersonDTO.getPhoneNum());
         addSaasAccountDTO.setMail(addPersonDTO.getMail());
@@ -142,7 +142,7 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
         PageQuerySaasAccountDTO pageQuerySaasAccountDTO = new PageQuerySaasAccountDTO();
         pageQuerySaasAccountDTO.setPage(PageQueryConstants.DEFAULT_PAGE);
         pageQuerySaasAccountDTO.setSize(PageQueryConstants.DEFAULT_SIZE);
-        pageQuerySaasAccountDTO.setGroupCode(RequiredParamsStorage.getGroupCode());
+        pageQuerySaasAccountDTO.setGroupCode(DefaultAppContext.getContext().getGroupCode());
         pageQuerySaasAccountDTO.setUsername(username);
         FmResponseContent<List<SaasAccountListItemVO>> listFmResponseContent = saasAccountClient.querySaasAccountPageList(pageQuerySaasAccountDTO);
         if (listFmResponseContent.getCount() > 0) {
@@ -171,7 +171,7 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
      * @version V1.0 2021/3/12 12:29 下午
      */
     private void setDefaultValue(Person person) {
-        person.setCreator(RequiredParamsStorage.getUserId());
+        person.setCreator(DefaultAppContext.getContext().getAccountId());
     }
 
     /**
@@ -206,7 +206,7 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
     public void updatePerson(UpdatePersonDTO updatePersonDTO) {
         Person person = getById(updatePersonDTO.getId());
         person = ConvertPersonTool.INSTANCE.convertUpdateDto2Entity(person, updatePersonDTO);
-        person.setModifier(RequiredParamsStorage.getUserId());
+        person.setModifier(DefaultAppContext.getContext().getAccountId());
         updateById(person);
     }
 

+ 9 - 8
fm-person/src/main/java/com/persagy/fm/profession/controller/ProfessionController.java

@@ -1,6 +1,7 @@
 package com.persagy.fm.profession.controller;
 
 import com.persagy.fm.common.response.*;
+import com.persagy.fm.common.utils.ResultHelper;
 import com.persagy.fm.profession.model.ConvertProfessionTool;
 import com.persagy.fm.profession.model.Profession;
 import com.persagy.fm.profession.model.dto.AddProfessionDTO;
@@ -36,37 +37,37 @@ public class ProfessionController {
 
     @ApiOperation(value = "创建专业")
     @PostMapping("/create")
-    public FmResponseItem<FmResponseUpsertVO> createProfession(
+    public CommonResult<FmResponseUpsertVO> createProfession(
             @Valid @RequestBody AddProfessionDTO addProfessionDTO) {
         Long id = professionService.createProfession(addProfessionDTO);
-        return FmResponseUtil.successItem(new FmResponseUpsertVO(id));
+        return ResultHelper.single(new FmResponseUpsertVO(id));
     }
 
 
     @ApiOperation(value = "更新专业")
     @PostMapping("/update")
-    public FmResponseItem<FmResponseUpsertVO> updateProfession(
+    public CommonResult<FmResponseUpsertVO> updateProfession(
             @Valid @RequestBody UpdateProfessionDTO updateProfessionDTO) {
         professionService.updateProfession(updateProfessionDTO);
-        return FmResponseUtil.successItem(new FmResponseUpsertVO(updateProfessionDTO.getId()));
+        return ResultHelper.single(new FmResponseUpsertVO(updateProfessionDTO.getId()));
     }
 
 
     @ApiOperation(value = "删除专业")
     @PostMapping("/delete")
-    public FmResponseMsg deleteProfession(
+    public CommonResult deleteProfession(
             @RequestBody @Valid DeleteProfessionDTO deleteProfessionDTO) {
         professionService.deleteProfession(deleteProfessionDTO.getId());
-        return FmResponseUtil.successMsg("删除成功");
+        return ResultHelper.success("删除成功");
     }
 
 
     @ApiOperation(value = "专业列表")
     @PostMapping("/query")
-    public FmResponseContent<List<ResponseProfessionListItemVO>> queryProfession() {
+    public CommonResult<PageList<ResponseProfessionListItemVO>> queryProfession() {
         List<Profession> professionList = professionService.queryProfessionList();
         List<ResponseProfessionListItemVO> resultList = ConvertProfessionTool.INSTANCE.convert2List(professionList);
-        return FmResponseUtil.successContent(resultList);
+        return ResultHelper.multi(resultList);
     }
 
 }

+ 3 - 4
fm-person/src/main/java/com/persagy/fm/profession/service/impl/ProfessionServiceImpl.java

@@ -4,14 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.persagy.fm.common.constant.enums.BoolEnum;
 import com.persagy.fm.common.constant.enums.ValidEnum;
-import com.persagy.fm.common.model.RequiredParamsStorage;
+import com.persagy.fm.common.context.DefaultAppContext;
 import com.persagy.fm.profession.dao.ProfessionMapper;
 import com.persagy.fm.profession.model.ConvertProfessionTool;
 import com.persagy.fm.profession.model.Profession;
 import com.persagy.fm.profession.model.dto.AddProfessionDTO;
 import com.persagy.fm.profession.model.dto.UpdateProfessionDTO;
 import com.persagy.fm.profession.service.IProfessionService;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -50,7 +49,7 @@ public class ProfessionServiceImpl extends ServiceImpl<ProfessionMapper, Profess
      * @version V1.0 2021/3/12 12:29 下午
      */
     private void setDefaultValue(Profession profession) {
-        profession.setCreator(RequiredParamsStorage.getUserId());
+        profession.setCreator(DefaultAppContext.getContext().getAccountId());
         if (profession.getEditable() == null) {
             profession.setEditable(BoolEnum.TRUE.getType());
         }
@@ -66,7 +65,7 @@ public class ProfessionServiceImpl extends ServiceImpl<ProfessionMapper, Profess
     public void updateProfession(UpdateProfessionDTO updateProfessionDTO) {
         Profession profession = getById(updateProfessionDTO.getId());
         profession = ConvertProfessionTool.INSTANCE.convertUpdateDto2Entity(profession, updateProfessionDTO);
-        profession.setModifier(RequiredParamsStorage.getUserId());
+        profession.setModifier(DefaultAppContext.getContext().getAccountId());
         updateById(profession);
     }
 

+ 5 - 5
fm-person/src/main/java/com/persagy/fm/saas/accountrole/service/impl/SaasAccountRoleServiceImpl.java

@@ -1,6 +1,6 @@
 package com.persagy.fm.saas.accountrole.service.impl;
 
-import com.persagy.fm.common.model.RequiredParamsStorage;
+import com.persagy.fm.common.context.DefaultAppContext;
 import com.persagy.fm.common.response.FmResponseContent;
 import com.persagy.fm.saas.account.constant.enums.AccountBelongEnum;
 import com.persagy.fm.saas.accountrole.client.SaasAccountRoleClient;
@@ -48,8 +48,8 @@ public class SaasAccountRoleServiceImpl implements ISaasAccountRoleService {
      * @version V1.0 2021/3/12 12:29 下午
      */
     private void setDefaultValue(AddSaasAccountRoleDTO addSaasAccountRoleDTO) {
-        addSaasAccountRoleDTO.setGroupCode(RequiredParamsStorage.getGroupCode());
-        addSaasAccountRoleDTO.setAppId(RequiredParamsStorage.getAppId());
+        addSaasAccountRoleDTO.setGroupCode(DefaultAppContext.getContext().getGroupCode());
+        addSaasAccountRoleDTO.setAppId(DefaultAppContext.getContext().getAppId());
         addSaasAccountRoleDTO.setAccountBelong(AccountBelongEnum.BUSINESS.getType());
     }
 
@@ -65,8 +65,8 @@ public class SaasAccountRoleServiceImpl implements ISaasAccountRoleService {
         DeleteSaasAccountRoleDTO deleteSaasAccountRoleDTO = new DeleteSaasAccountRoleDTO();
         deleteSaasAccountRoleDTO.setAccountId(accountId);
         deleteSaasAccountRoleDTO.setAccountBelong(AccountBelongEnum.BUSINESS.getType());
-        deleteSaasAccountRoleDTO.setAppId(RequiredParamsStorage.getAppId());
-        deleteSaasAccountRoleDTO.setGroupCode(RequiredParamsStorage.getGroupCode());
+        deleteSaasAccountRoleDTO.setAppId(DefaultAppContext.getContext().getAppId());
+        deleteSaasAccountRoleDTO.setGroupCode(DefaultAppContext.getContext().getGroupCode());
         saasAccountRoleClient.deleteSaasAccountRole(deleteSaasAccountRoleDTO);
     }
 

+ 12 - 11
fm-person/src/main/java/com/persagy/fm/saas/role/controller/SaasRoleController.java

@@ -1,6 +1,7 @@
 package com.persagy.fm.saas.role.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.persagy.fm.common.utils.ResultHelper;
 import com.persagy.fm.saas.role.service.ISaasRoleService;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,10 +33,10 @@ public class SaasRoleController {
 
     @ApiOperation(value = "创建")
     @PostMapping("/create")
-    public FmResponseMsg createSaasRole(
+    public CommonResult createSaasRole(
             @Valid @RequestBody AddSaasRoleDTO addSaasRoleDTO) {
         saasRoleService.createSaasRole(addSaasRoleDTO);
-        return FmResponseUtil.successMsg("创建成功");
+        return ResultHelper.success("创建成功");
     }
 
 //    @ApiOperation(value = "详情")
@@ -44,40 +45,40 @@ public class SaasRoleController {
 //            @Valid @RequestBody QuerySaasRoleDetailDTO querySaasRoleDetailDTO) {
 //        SaasRole saasRole = saasRoleService.querySaasRoleDetail(querySaasRoleDetailDTO.getId());
 //        ResponseSaasRoleItemVO responseSaasRoleItemVO = ConvertSaasRoleTool.INSTANCE.convert2ResponseItemDTO(saasRole);
-//        return FmResponseUtil.successItem(responseSaasRoleItemVO);
+//        return ResultHelper.successItem(responseSaasRoleItemVO);
 //    }
 
 
     @ApiOperation(value = "更新")
     @PostMapping("/update")
-    public FmResponseMsg updateSaasRole(
+    public CommonResult updateSaasRole(
             @Valid @RequestBody UpdateSaasRoleDTO updateSaasRoleDTO) {
         saasRoleService.updateSaasRole(updateSaasRoleDTO);
-        return FmResponseUtil.successMsg("更新成功");
+        return ResultHelper.success("更新成功");
     }
 
 
     @ApiOperation(value = "删除")
     @PostMapping("/delete")
-    public FmResponseMsg deleteSaasRole(
+    public CommonResult deleteSaasRole(
             @RequestBody @Valid DeleteSaasRoleDTO deleteSaasRoleDTO) {
         saasRoleService.deleteSaasRole(deleteSaasRoleDTO.getId());
-        return FmResponseUtil.successMsg("删除成功");
+        return ResultHelper.success("删除成功");
     }
 
 
 //    @ApiOperation(value = "列表")
 //    @PostMapping("/query")
-//    public FmResponseContent<List<ResponseSaasRoleListItemVO>> querySaasRole(
+//    public CommonResult<List<ResponseSaasRoleListItemVO>> querySaasRole(
 //            @Valid @RequestBody QuerySaasRoleDTO querySaasRoleDTO) {
 //        List<SaasRole> saasRoleList = saasRoleService.querySaasRoleList(querySaasRoleDTO);
 //        List<ResponseSaasRoleListItemVO> resultList = ConvertSaasRoleTool.INSTANCE.convert2List(saasRoleList);
-//        return FmResponseUtil.successContent(resultList);
+//        return ResultHelper.multi(resultList);
 //    }
 
     @ApiOperation(value = "列表, 分页查询")
     @PostMapping("/query")
-    public FmResponseContent<List<SaasRoleListItemVO>> querySaasRole(
+    public CommonResult<PageList<SaasRoleListItemVO>> querySaasRole(
             @Valid @RequestBody PageQuerySaasRoleDTO pageQuerySaasRoleDTO) {
         IPage<SaasRole> pagedList = saasRoleService.pageQuerySaasRole(pageQuerySaasRoleDTO);
         IPage<SaasRoleListItemVO> pagedResultList = pagedList.convert(item -> {
@@ -87,7 +88,7 @@ public class SaasRoleController {
                 throw new IllegalArgumentException("分页查询,SaasRole实体类转换为列表对象发生异常", e);
             }
         });
-        return FmResponseUtil.successContent(pagedResultList);
+        return ResultHelper.multi(pagedResultList);
     }
 }
 

+ 3 - 9
fm-person/src/main/java/com/persagy/fm/saas/role/service/impl/SaasRoleServiceImpl.java

@@ -1,11 +1,8 @@
 package com.persagy.fm.saas.role.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.google.common.base.CaseFormat;
-import com.persagy.fm.common.model.RequiredParamsStorage;
-import com.persagy.fm.common.model.dto.Sort;
+import com.persagy.fm.common.context.DefaultAppContext;
 import com.persagy.fm.common.response.FmResponseContent;
 import com.persagy.fm.saas.account.constant.enums.AccountBelongEnum;
 import com.persagy.fm.saas.role.client.SaasRoleClient;
@@ -16,12 +13,9 @@ import com.persagy.fm.saas.role.model.dto.DeleteSaasRoleDTO;
 import com.persagy.fm.saas.role.model.dto.PageQuerySaasRoleDTO;
 import com.persagy.fm.saas.role.model.dto.UpdateSaasRoleDTO;
 import com.persagy.fm.saas.role.service.ISaasRoleService;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -60,8 +54,8 @@ public class SaasRoleServiceImpl implements ISaasRoleService {
      */
     private void setDefaultValue(SaasRole saasRole) {
         saasRole.setAccountBelong(AccountBelongEnum.BUSINESS.getType());
-        saasRole.setAppId(RequiredParamsStorage.getAppId());
-        saasRole.setGroupCode(RequiredParamsStorage.getGroupCode());
+        saasRole.setAppId(DefaultAppContext.getContext().getAppId());
+        saasRole.setGroupCode(DefaultAppContext.getContext().getGroupCode());
         saasRole.setRoleCode(String.valueOf(System.currentTimeMillis()));
     }
 

+ 13 - 12
fm-person/src/main/java/com/persagy/fm/workresume/controller/WorkResumeController.java

@@ -1,6 +1,7 @@
 package com.persagy.fm.workresume.controller;
 
 import com.persagy.fm.common.response.*;
+import com.persagy.fm.common.utils.ResultHelper;
 import com.persagy.fm.workresume.model.ConvertWorkResumeTool;
 import com.persagy.fm.workresume.model.WorkResume;
 import com.persagy.fm.workresume.model.dto.*;
@@ -35,52 +36,52 @@ public class WorkResumeController {
 
     @ApiOperation(value = "创建工作信息")
     @PostMapping("/create")
-    public FmResponseItem<FmResponseUpsertVO> createWorkResume(
+    public CommonResult<FmResponseUpsertVO> createWorkResume(
             @Valid @RequestBody AddWorkResumeDTO addWorkResumeDTO) {
         Long id = workResumeService.createWorkResume(addWorkResumeDTO);
-        return FmResponseUtil.successItem(new FmResponseUpsertVO(id));
+        return ResultHelper.single(new FmResponseUpsertVO(id));
     }
 
     @ApiOperation(value = "工作信息详情")
     @PostMapping("/get")
-    public FmResponseItem<ResponseWorkResumeItemVO> queryWorkResumeDetail(
+    public CommonResult<ResponseWorkResumeItemVO> queryWorkResumeDetail(
             @Valid @RequestBody QueryWorkResumeDetailDTO queryWorkResumeDetailDTO) {
         WorkResume workResume = workResumeService.queryWorkResumeDetail(queryWorkResumeDetailDTO.getId());
         ResponseWorkResumeItemVO responseWorkResumeItemVO = ConvertWorkResumeTool.INSTANCE.convert2ResponseItemDTO(workResume);
-        return FmResponseUtil.successItem(responseWorkResumeItemVO);
+        return ResultHelper.single(responseWorkResumeItemVO);
     }
 
 
     @ApiOperation(value = "更新工作信息")
     @PostMapping("/update")
-    public FmResponseItem<FmResponseUpsertVO> updateWorkResume(
+    public CommonResult<FmResponseUpsertVO> updateWorkResume(
             @Valid @RequestBody UpdateWorkResumeDTO updateWorkResumeDTO) {
         workResumeService.updateWorkResume(updateWorkResumeDTO);
-        return FmResponseUtil.successItem(new FmResponseUpsertVO(updateWorkResumeDTO.getId()));
+        return ResultHelper.single(new FmResponseUpsertVO(updateWorkResumeDTO.getId()));
     }
 
 
     @ApiOperation(value = "删除工作信息")
     @PostMapping("/delete")
-    public FmResponseMsg deleteWorkResume(
+    public CommonResult deleteWorkResume(
             @RequestBody @Valid DeleteWorkResumeDTO deleteWorkResumeDTO) {
         workResumeService.deleteWorkResume(deleteWorkResumeDTO.getId());
-        return FmResponseUtil.successMsg("删除成功");
+        return ResultHelper.success("删除成功");
     }
 
 
     @ApiOperation(value = "工作信息列表")
     @PostMapping("/query")
-    public FmResponseContent<List<ResponseWorkResumeListItemVO>> queryWorkResume(
+    public CommonResult<PageList<ResponseWorkResumeListItemVO>> queryWorkResume(
             @Valid @RequestBody QueryWorkResumeDTO queryWorkResumeDTO) {
         List<WorkResume> workResumeList = workResumeService.queryWorkResumeList(queryWorkResumeDTO);
         List<ResponseWorkResumeListItemVO> resultList = ConvertWorkResumeTool.INSTANCE.convert2List(workResumeList);
-        return FmResponseUtil.successContent(resultList);
+        return ResultHelper.multi(resultList);
     }
 
     //@ApiOperation(value = "工作信息列表, 分页查询")
     //@PostMapping("/query")
-    //public FmResponseContent<List<ResponseWorkResumeListItemVO>> queryWorkResume(
+    //public CommonResult<List<ResponseWorkResumeListItemVO>> queryWorkResume(
     //        @Valid @RequestBody PageQueryWorkResumeDTO pageQueryWorkResumeDTO) {
     //    IPage<ResponseWorkResumeListItemVO> pagedList = workResumeService.pageQueryWorkResume(pageQueryWorkResumeDTO);
     //    IPage<ResponseWorkResumeListItemVO> pagedResultList = pagedList.convert(item -> {
@@ -90,7 +91,7 @@ public class WorkResumeController {
     //            throw new IllegalArgumentException("分页查询,WorkResume实体类转换为列表对象发生异常", e);
     //        }
     //    });
-    //    return FmResponseUtil.successContent(pagedResultList);;
+    //    return ResultHelper.multi(pagedResultList);;
     //}
 }
 

+ 3 - 3
fm-person/src/main/java/com/persagy/fm/workresume/service/impl/WorkResumeServiceImpl.java

@@ -1,6 +1,6 @@
 package com.persagy.fm.workresume.service.impl;
 
-import com.persagy.fm.common.model.RequiredParamsStorage;
+import com.persagy.fm.common.context.DefaultAppContext;
 import com.persagy.fm.workresume.constant.enums.WorkResumeStateEnum;
 import com.persagy.fm.workresume.model.ConvertWorkResumeTool;
 import com.persagy.fm.workresume.model.WorkResume;
@@ -58,7 +58,7 @@ public class WorkResumeServiceImpl extends ServiceImpl<WorkResumeMapper, WorkRes
      * @version V1.0 2021/3/12 12:29 下午
      */
     private void setDefaultValue(WorkResume workResume) {
-        workResume.setCreator(RequiredParamsStorage.getUserId());
+        workResume.setCreator(DefaultAppContext.getContext().getAccountId());
         if (workResume.getHiredDate() == null) {
             workResume.setHiredDate(new Date());
         }
@@ -94,7 +94,7 @@ public class WorkResumeServiceImpl extends ServiceImpl<WorkResumeMapper, WorkRes
     public void updateWorkResume(UpdateWorkResumeDTO updateWorkResumeDTO) {
         WorkResume workResume = getById(updateWorkResumeDTO.getId());
         workResume = ConvertWorkResumeTool.INSTANCE.convertUpdateDto2Entity(workResume, updateWorkResumeDTO);
-        workResume.setModifier(RequiredParamsStorage.getUserId());
+        workResume.setModifier(DefaultAppContext.getContext().getAccountId());
         updateById(workResume);
     }
 

+ 0 - 6
pom.xml

@@ -24,10 +24,6 @@
         <module>fm-supplier</module>
     </modules>
 
-    <properties>
-        <fm-server.version>3.0.2</fm-server.version>
-        <fm-common.version>3.0.2</fm-common.version>
-    </properties>
     <repositories>
         <repository>
             <id>integrated</id>
@@ -46,13 +42,11 @@
         <dependency>
             <groupId>com.persagy</groupId>
             <artifactId>fm-server</artifactId>
-            <version>${fm-server.version}</version>
         </dependency>
         <!-- fm 工具包 -->
         <dependency>
             <groupId>com.persagy</groupId>
             <artifactId>fm-common</artifactId>
-            <version>${fm-common.version}</version>
         </dependency>
 <!--        &lt;!&ndash; fm 翻译器 &ndash;&gt;-->
 <!--        <dependency>-->