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

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/workflow/feign/WorkflowFeignService.java

 package com.yeejoin.amos.boot.biz.common.workflow.feign;
 
-import java.awt.*;
 import java.util.HashMap;
 
-import feign.Response;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -14,10 +11,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import com.alibaba.fastjson.JSONObject;
 
-import javax.print.attribute.standard.MediaTray;
-import javax.servlet.http.HttpServletResponse;
+import feign.Response;
 
-@FeignClient(name = "AMOS-API-WORKFLOW", path = "workflow", configuration = { CommonMultipartSupportConfig.class })
+@FeignClient(name = "AMOS-API-WORKFLOW-CHENZHAO", path = "workflow", configuration = { CommonMultipartSupportConfig.class })
 public interface WorkflowFeignService {
 	/**
 	 * 发起流程
@@ -113,8 +109,8 @@ public interface WorkflowFeignService {
 /**
  * 流程图高亮
  * */
-	@RequestMapping(value = "/activitiHistory/gethighLineImg/{processInstanceId}",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE,  method = RequestMethod.POST)
-	Response thighLineImg(@PathVariable("processInstanceId") String processInstanceId, HttpServletResponse resp) ;
+	@RequestMapping(value = "/activitiHistory/gethighLineImg/{processInstanceId}", method = RequestMethod.GET)
+	Response thighLineImg(@PathVariable("processInstanceId") String processInstanceId) ;
 /**
  * 流程图高亮图片
  * */

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/LinkageUnitMapper.java

 package com.yeejoin.amos.boot.module.common.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitDto;
 import com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitZhDto;
 import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
@@ -55,7 +57,7 @@ public interface LinkageUnitMapper extends BaseMapper<LinkageUnit> {
      * 查询包含特岗人数及的具体信息
      * @return
      */
-    List<LinkageUnitDto> getEmergencyLinkageUnitList(String unitName,
+    Page<List<LinkageUnitDto>> getEmergencyLinkageUnitList(IPage<LinkageUnitDto> page,String unitName,
 			 String linkageUnitTypeCode,  String emergencyLinkageUnitCode);
 
     List<LinkageUnitDto> exportToExcel();

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/LinkageUnitMapper.xml

@@ -132,7 +132,7 @@
 
 
 	<select id="getEmergencyLinkageUnitList"
-		resultType="com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitDto">
+		resultType="java.util.Map">
 		SELECT
 		clu.sequence_nbr as sequenceNbr,
 		clu.unit_name as unitName,
@@ -185,8 +185,8 @@
 			AND clu.unit_name LIKE concat(#{unitName}, '%')
 		</if>
 		<if
-			test="linkageUnitTypeCode != null and linkageUnitTypeCode != ''">
-			AND clu.linkage_unit_type_code =#{linkageUnitTypeCode}
+			test="linkageUnitType != null and linkageUnitType != ''">
+			AND clu.linkage_unit_type =#{linkageUnitType}
 		</if>
 		<if
 			test="emergencyLinkageUnitCode != null and emergencyLinkageUnitCode != ''">

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

@@ -223,13 +223,13 @@ public class FailureDetailsController extends BaseController {
         return ResponseHelper.buildResponse(workflowFeignService.thighLine(instanceId));
     }
 
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-
-    @GetMapping(value = "/activityHistory/gettingLineImg/{sequenceNbr}")
-    public ResponseModel<Object> gothLineImg(@PathVariable Long sequenceNbr, HttpServletResponse resp) {
-        String processId = failureDetailsServiceImpl.queryBySeq(sequenceNbr).getProcessId();
-        return ResponseHelper.buildResponse(workflowFeignService.thighLineImg(processId, resp));
-    }
+//    @TycloudOperation(ApiLevel = UserType.AGENCY)
+//
+//    @GetMapping(value = "/activityHistory/gettingLineImg/{sequenceNbr}")
+//    public ResponseModel<Object> gothLineImg(@PathVariable Long sequenceNbr, HttpServletResponse resp) {
+//        String processId = failureDetailsServiceImpl.queryBySeq(sequenceNbr).getProcessId();
+//        return ResponseHelper.buildResponse(workflowFeignService.thighLineImg(processId, resp));
+//    }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "查询状态枚举", notes = "查询状态枚举")
@@ -239,11 +239,11 @@ public class FailureDetailsController extends BaseController {
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PostMapping (value = "/downloadFile/{sequenceNbr}")
+    @GetMapping (value = "/downloadFile/{sequenceNbr}")
     @ApiOperation(httpMethod = "GET", value = "流程图高亮图片", notes = "流程图高亮图片")
     public void downloadFile(@PathVariable Long sequenceNbr, HttpServletRequest request, HttpServletResponse response) throws Exception {
         String processId = failureDetailsServiceImpl.queryBySeq(sequenceNbr).getProcessId();
-        Response feignResponse = workflowFeignService.thighLineImg(processId, response);
+        Response feignResponse = workflowFeignService.thighLineImg(processId);
         OutputStream out = null;
         try {
             out = response.getOutputStream();

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

@@ -123,12 +123,12 @@ public class LinkageUnitController extends BaseController {
     @GetMapping(value = "/page")
     @ApiOperation(httpMethod = "GET", value = "联动单位分页查询", notes = "联动单位分页查询")
     public ResponseModel<Page<LinkageUnitDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
-            (value = "size") int size, String unitName, String linkageUnitTypeCode, String inAgreement, String emergencyLinkageUnitCode) {
+            (value = "size") int size, String unitName, String linkageUnitType, String inAgreement, String emergencyLinkageUnitCode) {
     	Page<LinkageUnitDto> page = new Page<LinkageUnitDto>();
         page.setCurrent(current);
         page.setSize(size);
     	Page<LinkageUnitDto> linkageUnitDtoPage = linkageUnitServiceImpl.queryForLinkageUnitPage(page, false,
-                unitName, linkageUnitTypeCode, emergencyLinkageUnitCode,inAgreement);
+                unitName, linkageUnitType, emergencyLinkageUnitCode,inAgreement);
         return ResponseHelper.buildResponse(linkageUnitDtoPage);
     }
 

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

 package com.yeejoin.amos.boot.module.common.biz.controller;
 
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
+import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
+import com.yeejoin.amos.boot.module.common.api.service.IMaintenanceCompanyService;
+import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.MaintenanceCompanyServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.utils.MyException;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -22,17 +27,9 @@ 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 com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
-import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
-import com.yeejoin.amos.boot.module.common.api.service.IMaintenanceCompanyService;
-import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
-import com.yeejoin.amos.boot.module.common.biz.service.impl.MaintenanceCompanyServiceImpl;
-import com.yeejoin.amos.boot.module.common.biz.utils.MyException;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 维保单位

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

@@ -384,10 +384,9 @@ public class WaterResourceController extends BaseController {
     @GetMapping(value = "/select_list")
     public ResponseModel<List<WaterResourceDto>> selectList(String name, Long sequenceNbr,
                                                             Long belongFightingSystemId, Long belongBuildingId,
-                                                            String belongBuilding, String resourceType) {
-        return ResponseHelper.buildResponse(waterResourceServiceImpl.queryWaterResourceList(true, name, sequenceNbr,
-                belongFightingSystemId, belongBuildingId,
-                belongBuilding, resourceType));
+                                                            String belongBuilding, String resourceType, String classifyId) {
+        return ResponseHelper.buildResponse(waterResourceServiceImpl.queryWaterResourceList(true, name,
+                sequenceNbr, belongFightingSystemId, belongBuildingId, belongBuilding, resourceType, classifyId));
     }
 
     /**

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

@@ -75,8 +75,8 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
 			@Condition(Operator.eq) Boolean isDelete, @Condition(Operator.like) String unitName,
 			@Condition(Operator.eq) String linkageUnitTypeCode, @Condition(Operator.eq) String emergencyLinkageUnitCode,
 			String inAgreement) {
-		List<LinkageUnitDto>  linkageUnitList = linkageUnitMapper.getEmergencyLinkageUnitList(unitName, linkageUnitTypeCode, emergencyLinkageUnitCode);
-		List<Map> linkageUnitListMap =JSONArray.parseArray(JSONArray.toJSONString(linkageUnitList), Map.class);
+		Page<List<LinkageUnitDto>> linkageUnitList = linkageUnitMapper.getEmergencyLinkageUnitList(page,unitName, linkageUnitTypeCode, emergencyLinkageUnitCode);
+		List<Map> linkageUnitListMap =JSONArray.parseArray(JSONArray.toJSONString(linkageUnitList.getRecords()), Map.class);
 		
 		List<Map<String, Object>> pageList = dynamicFormInstanceService.listAll(getGroupCode());
 		linkageUnitListMap.forEach(i -> {
@@ -87,7 +87,7 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
 				}
 			});
 		});
-		List<LinkageUnitDto> resultDtoList = JSONArray.parseArray(JSONArray.toJSONString(linkageUnitList),
+		List<LinkageUnitDto> resultDtoList = JSONArray.parseArray(JSONArray.toJSONString(linkageUnitList.getRecords()),
 				LinkageUnitDto.class);
 		List<LinkageUnitDto> detaiList = resultDtoList.stream().map(item -> {
 			Date now = new Date();
@@ -103,7 +103,7 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
 		Page<LinkageUnitDto> page1 = new Page<LinkageUnitDto>();
 		page1.setCurrent(page.getCurrent());
 		page1.setSize(page.getSize());
-		page1.setTotal(detaiList.size());
+		page1.setTotal(linkageUnitList.getTotal()); // TOTAL 需要统计所有存在的数据BUG2590 by kongfm
 		page1.setRecords(detaiList);
 		return page1;
 	}

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

@@ -579,6 +579,7 @@ public class MaintenanceCompanyServiceImpl
 		MaintenanceCompany maintenanceCompany = new MaintenanceCompany();
 		if (ValidationUtil.isEmpty(seq)) {
 			maintenanceCompany = getMaintenanceCompany(amosUserId);
+			seq = maintenanceCompany.getSequenceNbr();
 		}
 		// 机场单位列表基本信息
 		if (pageNum == -1 || pageSize == -1) {
@@ -586,7 +587,7 @@ public class MaintenanceCompanyServiceImpl
 		}
 		Page page = new Page(pageNum, pageSize);
 		Page<Map<String, Object>> companys = new Page<>(pageNum, pageSize);
-		Page<OrgUsrDto> pageResult = this.baseMapper.selectOrgUsrPageList(page, maintenanceCompany.getSequenceNbr());
+		Page<OrgUsrDto> pageResult = this.baseMapper.selectOrgUsrPageList(page, seq);
 		List<Map<String, Object>> finalResultMap = Lists.newArrayList();
 		// 机场组装单位动态表单数据
 		pageResult.getRecords().forEach(orgUsrDto -> {

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

@@ -82,9 +82,10 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate
                                                          @Condition(Operator.eq) Long belongFightingSystemId,
                                                          @Condition(Operator.eq) Long belongBuildingId,
                                                          @Condition(Operator.like) String belongBuilding,
-                                                         @Condition(Operator.eq) String resourceType) {
+                                                         @Condition(Operator.eq) String resourceType,
+                                                         @Condition(Operator.eq) String equipId) {
         return this.queryForList("", false, isDelete, name, sequenceNbr, belongFightingSystemId, belongBuildingId,
-                belongBuilding, resourceType);
+                belongBuilding, resourceType, equipId);
     }