ソースを参照

提交人员服务代码

lixing 4 年 前
コミット
d57ba56adf

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

@@ -13,9 +13,6 @@ import com.persagy.fm.department.service.IDepartmentService;
 import com.persagy.fm.department.utils.DepDataUtil;
 import com.persagy.fm.depproject.service.IDepProjectService;
 import com.persagy.fm.saas.project.model.vo.ProjectTreeItemVO;
-import com.persagy.fm.translate.model.Trans;
-import com.persagy.fm.translate.model.TransType;
-import com.persagy.fm.translate.model.Transes;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
@@ -62,14 +59,14 @@ public class DepartmentController {
     @ApiOperation(value = "部门详情")
     @PostMapping("/get")
     // TODO: 2021/3/24 使用翻译器
-    @Transes({
-            @Trans(source = "com.persagy.fm.person.service.IPersonTransBatchHandler",
-                    type = TransType.SERVICE, result = "name", batch = true,
-                    condition = "id", parameter = "managers", target = "managersShowName"),
-            @Trans(source = "com.persagy.fm.person.service.IPersonTransBatchHandler",
-                    type = TransType.SERVICE, result = "name", batch = true,
-                    condition = "id", parameter = "projectIds", target = "projectsShowName")
-    })
+//    @Transes({
+//            @Trans(source = "com.persagy.fm.person.service.IPersonTransBatchHandler",
+//                    type = TransType.SERVICE, result = "name", batch = true,
+//                    condition = "id", parameter = "managers", target = "managersShowName"),
+//            @Trans(source = "com.persagy.fm.person.service.IPersonTransBatchHandler",
+//                    type = TransType.SERVICE, result = "name", batch = true,
+//                    condition = "id", parameter = "projectIds", target = "projectsShowName")
+//    })
     public FmResponseItem<ResponseDepartmentItemVO> queryDepartmentDetail(
             @Valid @RequestBody QueryDepartmentDetailDTO queryDepartmentDetailDTO) {
         Department department = departmentService.queryDepartmentDetail(queryDepartmentDetailDTO.getId());

+ 1 - 3
fm-person/src/main/java/com/persagy/fm/person/service/IPersonTransBatchHandler.java

@@ -1,12 +1,10 @@
 package com.persagy.fm.person.service;
 
-import com.persagy.fm.translate.service.ITranslateBatchHandle;
-
 /**
  * 人员翻译器
  *
  * @author lixing
  * @version V1.0 2021/3/24 11:21 上午
  **/
-public interface IPersonTransBatchHandler extends ITranslateBatchHandle {
+public interface IPersonTransBatchHandler{
 }

+ 0 - 24
fm-person/src/main/java/com/persagy/fm/person/service/impl/PersonTransBatchHandlerImpl.java

@@ -1,11 +1,6 @@
 package com.persagy.fm.person.service.impl;
 
 import com.persagy.fm.person.service.IPersonTransBatchHandler;
-import com.persagy.fm.translate.model.ITransWrapper;
-import com.persagy.fm.translate.model.TransMeta;
-
-import java.util.List;
-import java.util.Map;
 
 /**
  * 人员翻译器
@@ -14,23 +9,4 @@ import java.util.Map;
  * @version V1.0 2021/3/24 11:22 上午
  **/
 public class PersonTransBatchHandlerImpl implements IPersonTransBatchHandler  {
-    @Override
-    public Map<String, Object> batchTrans(List<String> parameter) {
-        return null;
-    }
-
-    @Override
-    public ITransWrapper trans(ITransWrapper wrapper) {
-        return null;
-    }
-
-    @Override
-    public TransMeta getMeta() {
-        return null;
-    }
-
-    @Override
-    public void setMeta(TransMeta meta) {
-
-    }
 }

+ 3 - 3
fm-person/src/main/java/com/persagy/fm/saas/account/client/SaasAccountClient.java

@@ -32,7 +32,7 @@ public interface SaasAccountClient {
      * @author lixing
      * @version V1.0 2021/3/23 11:57 上午
      */
-    @PostMapping("/saas-account/account/querySaasAccountList")
+    @PostMapping("/account/querySaasAccountList")
     FmResponseContent<List<SaasAccountListItemVO>> querySaasAccountList(@RequestBody QuerySaasAccountDTO querySaasAccountDTO);
 
     /**
@@ -43,7 +43,7 @@ public interface SaasAccountClient {
      * @author lixing
      * @version V1.0 2021/3/23 11:57 上午
      */
-    @PostMapping("/saas-account/account/createSaasAccount")
+    @PostMapping("/account/createSaasAccount")
     FmResponseContent<String> createSaasAccount(@RequestBody AddSaasAccountDTO addSaasAccountDTO);
 
     /**
@@ -53,6 +53,6 @@ public interface SaasAccountClient {
      * @author lixing
      * @version V1.0 2021/3/23 11:57 上午
      */
-    @PostMapping("/saas-account/account/createSaasAccount")
+    @PostMapping("/account/createSaasAccount")
     FmResponseMsg updateSaasAccount(@RequestBody UpdateSaasAccountDTO updateSaasAccountDTO);
 }

+ 1 - 1
fm-person/src/main/resources/mapper/PersonMapper.xml

@@ -21,7 +21,7 @@
     </resultMap>
 
     <select id="queryPersonList" parameterType="com.persagy.fm.person.model.dto.PageQueryPersonDTO"
-            resultMap="personMap">
+            resultType="com.persagy.fm.person.model.Person">
         select p.id, p.name, p.profession
         from person p,
         work_resume w

+ 6 - 6
pom.xml

@@ -54,11 +54,11 @@
             <artifactId>fm-common</artifactId>
             <version>${fm-common.version}</version>
         </dependency>
-        <!-- fm 翻译器 -->
-        <dependency>
-            <groupId>com.persagy</groupId>
-            <artifactId>fm-translate</artifactId>
-            <version>3.0.0</version>
-        </dependency>
+<!--        &lt;!&ndash; fm 翻译器 &ndash;&gt;-->
+<!--        <dependency>-->
+<!--            <groupId>com.persagy</groupId>-->
+<!--            <artifactId>fm-translate</artifactId>-->
+<!--            <version>3.0.0</version>-->
+<!--        </dependency>-->
     </dependencies>
 </project>