开发特种设备通讯录接口

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/InspectionController.java

@@ -2,10 +2,14 @@ package com.yeejoin.amos.boot.module.tzs.biz.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.module.tzs.flc.api.entity.IdxUjer;
+import com.yeejoin.amos.boot.module.tzs.flc.api.feign.IdxFeignService;
 import com.yeejoin.amos.boot.module.tzs.flc.api.service.InspectionService;
+import com.yeejoin.amos.component.feign.model.Page;
+import com.yeejoin.amos.feign.privilege.Privilege;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -15,6 +19,8 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/Inspection")
 @Api(value = "双重预防 监察处置分析")
@@ -22,6 +28,8 @@ public class InspectionController {
 
     @Autowired
     InspectionService inspectionService;
+    @Autowired
+    IdxFeignService idxFeignService;
 
     @GetMapping("/bizDetailList")
     @ApiOperation(value = "检察任务填报详情")
@@ -36,4 +44,23 @@ public class InspectionController {
         IPage<IdxUjer> page = inspectionService.bizDetailList(dimensionTableId, selectValue, bizType, current, size);
         return ResponseHelper.buildResponse(page);
     }
+
+    @GetMapping("/contacts")
+    @ApiOperation(value = "通讯录")
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    public ResponseModel<Page> contacts(
+            @RequestParam(required = false) String realName,
+            @RequestParam(required = false) String mobile,
+            @RequestParam(required = false) String dimensionTableId,
+            @RequestParam(required = false) String selectValue,
+            @RequestParam int current,
+            @RequestParam int size
+    ) {
+        List<String> ids = null;
+        if (StringUtils.hasText(selectValue)) {
+            ids = idxFeignService.getTreeChildIds(dimensionTableId, selectValue).getResult();
+        }
+        Page result = Privilege.agencyUserClient.queryForPage(null, realName, mobile, null, current, size, ids).getResult();
+        return ResponseHelper.buildResponse(result);
+    }
 }

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/AlertCalledServiceImpl.java

@@ -388,7 +388,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
     @Override
     public List<DutySeatDto> getSeatInfos() {
         // 获取人员信息
-        FeignClientResult<List<AgencyUserModel>> userListResult = Privilege.agencyUserClient.list(null);
+        FeignClientResult<List<AgencyUserModel>> userListResult = Privilege.agencyUserClient.list(null,null);
         List<AgencyUserModel> userList = userListResult.getResult();
         List<DutySeatDto> dutyList = new ArrayList<>();
         userList.stream().forEach(u -> {

pom.xml

@@ -25,7 +25,7 @@
 		<springcloud.version>Hoxton.SR8</springcloud.version>
 		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
 		<tyboot-version>1.1.20</tyboot-version>
-		<amos.version>1.7.8</amos.version>
+		<amos.version>1.7.10-SNAPSHOT</amos.version>
 		<itext.version>7.1.1</itext.version>
 		<elasticsearch.version>7.15.2</elasticsearch.version>
 	</properties>