Merge branch 'develop_ccs' of http://172.16.10.76/moa/amos-boot-biz into develop_ccs

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IFireTeamService.java

@@ -45,5 +45,5 @@ public interface IFireTeamService {
     List<FireTeamZhDto> getFireTeamCountList();
     
     public List<FireTeam> getFirstAidForTypeCodeAndCompanyId(String dicCode,String typeCode,Long companyId);
-
+    List<FireTeam> getFireTeamList();
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/WaterResourceController.java

@@ -458,16 +458,16 @@ public class WaterResourceController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/page")
     @ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询")
-    public ResponseModel<Page<WaterResourceDto>> queryForPage(@RequestParam(value = "current") int current,
-                                                              @RequestParam(value = "size") int size, String name,
+    public ResponseModel<Page<WaterResourceDto>> queryForPage(@RequestParam(value = "pageNum") int pageNum,
+                                                              @RequestParam(value = "pageSize") int pageSize, String name,
                                                               @RequestParam(value = "belongBuildingId", required = false) ArrayList<Long> belongBuildingId,
                                                               Long belongFightingSystemId, Long sequenceNbr,
                                                               String resourceType,
                                                               String classifyId,
                                                               String bizOrgCode) {
         Page<WaterResourceDto> page = new Page<>();
-        page.setCurrent(current);
-        page.setSize(size);
+        page.setCurrent(pageNum);
+        page.setSize(pageSize);
 
         /*bug 2913 更换保存方式 存储到公共附件表 chenzhao 2021-10-18 start*/
         Page<WaterResourceDto> waterResourceDtoPage = waterResourceServiceImpl.queryForWaterResourcePage(page, name, resourceType,

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FireTeamServiceImpl.java

@@ -10,6 +10,8 @@ import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.module.common.api.entity.Firefighters;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -443,6 +445,14 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
 		return	this.baseMapper.selectList(queryWrapper);
 	}
 
+	@Override
+	public List<FireTeam> getFireTeamList() {
+
+		QueryWrapper<FireTeam> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("is_delete", false);
+		return	fireTeamMapper.selectList(queryWrapper);
+	}
+
 	public List<Menu> getFirstTeamToDesignatedDepartment() throws Exception {
 		LambdaQueryWrapper<FireTeam> queryWrapper = new LambdaQueryWrapper<FireTeam>();
 		queryWrapper.eq(FireTeam::getTypeCode, "116");

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/DataSourcesImpl.java

@@ -9,6 +9,7 @@ import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 
+import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -180,10 +181,14 @@ public class DataSourcesImpl implements DataSources {
 	}
 
 	private String[] getFireTeam() {
-		Page<FireTeamCardDto> pageBean = new Page<>(1, Integer.MAX_VALUE);
-		IPage<FireTeamCardDto> fireTeamCardDtoIPage = fireTeamService.listFireTeamByPage(pageBean,
-				new FireTeamListDto());
-		List<FireTeamCardDto> records = fireTeamCardDtoIPage.getRecords();
+//			Page<FireTeamCardDto> pageBean = new Page<>(0, Integer.MAX_VALUE);
+//		IPage<FireTeamCardDto> fireTeamCardDtoIPage = fireTeamService.listFireTeamByPage(pageBean,
+//				new FireTeamListDto());
+//		List<FireTeamCardDto> records = fireTeamCardDtoIPage.getRecords();
+
+		List<FireTeam> records=	fireTeamService.getFireTeamList();
+
+
 		List<String> names = records.stream().map(item -> {
 			return item.getName() + "@" + item.getSequenceNbr();
 		}).collect(Collectors.toList());
@@ -343,9 +348,11 @@ public class DataSourcesImpl implements DataSources {
 	 * @return
 	 */
 	private String[] getCompany() {
-		List<OrgMenuDto> menus = OrgUsrServiceImpl.buildTreeParallel(iOrgUsrService.selectCompanyDepartmentMsg());
+
+		//List<OrgMenuDto> menus = OrgUsrServiceImpl.buildTreeParallel(iOrgUsrService.selectCompanyDepartmentMsg());
+		List<OrgUsr> menus = iOrgUsrService.selectCompanyDepartmentMsg();
 		List<String> names = menus.stream().map(item -> {
-			return item.getName() + "@" + item.getKey();
+			return item.getBizOrgName() + "@" + item.getSequenceNbr()+ "@" + item.getBizOrgCode();
 		}).collect(Collectors.toList());
 		String[] str = names.toArray(new String[names.size()]);
 		return str;