item:添加稳压泵启停状态图详情接口，及bug修改

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EmergencyController.java

@@ -577,7 +577,7 @@ public class EmergencyController extends AbstractBaseController {
 	@PersonIdentify
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/getPressurePumpStatusChart")
-	@ApiOperation(httpMethod = "GET", value = "四横八纵-稳压泵启停状态图", notes = "四横八纵-稳压泵启停状态图")
+	@ApiOperation(httpMethod = "GET", value = "四横八纵-稳压泵启停状态图", notes = "四横八纵-稳压泵启停状态图，取舍补点")
 	public ResponseModel getPressurePumpStatusChart(@RequestParam String startTime, @RequestParam String endTime,
 													@RequestParam(required = false) String bizOrgCode) {
 		if(StringUtils.isEmpty(bizOrgCode)) {
@@ -595,6 +595,25 @@ public class EmergencyController extends AbstractBaseController {
 
 	@PersonIdentify
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/getPressurePumpStatusDetailChart")
+	@ApiOperation(httpMethod = "GET", value = "四横八纵-稳压泵启停状态图", notes = "四横八纵-稳压泵启停状态图，分钟级补点")
+	public ResponseModel getPressurePumpStatusDetailChart(@RequestParam String startTime, @RequestParam String endTime,
+													@RequestParam(required = false) String bizOrgCode) {
+		if(StringUtils.isEmpty(bizOrgCode)) {
+			ReginParams reginParams = getSelectedOrgInfo();
+			ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
+			if (!ValidationUtil.isEmpty(personIdentity)) {
+				bizOrgCode = personIdentity.getBizOrgCode();
+				if (bizOrgCode == null) {
+					return CommonResponseUtil.success(Collections.EMPTY_MAP);
+				}
+			}
+		}
+		return CommonResponseUtil.success(iEmergencyService.getPressurePumpStatusDetailChart(startTime, endTime, bizOrgCode));
+	}
+
+	@PersonIdentify
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/getPressurePumpDiagnosticAnalysis")
 	@ApiOperation(httpMethod = "GET", value = "四横八纵-稳压泵诊断分析", notes = "四横八纵-稳压泵诊断分析")
 	public ResponseModel getPressurePumpDiagnosticAnalysis(@RequestParam(required = false) String bizOrgCode) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IEmergencyService.java

@@ -57,6 +57,8 @@ public interface IEmergencyService {
 
     Map<String, Object> getPressurePumpStatusChart(String startTime, String endTime, String bizOrgCode);
 
+    Map<String, Object> getPressurePumpStatusDetailChart(String startTime, String endTime, String bizOrgCode);
+
     List<Map<String, Object>> getPressurePumpDiagnosticAnalysis(String bizOrgCode);
 
     Page<Map<String, Object>> alarmList(Page<Map<String, Object>> page,String bizOrgCode, List<String> types, List<String> emergencyLevels, String name, Integer cleanStatus, Integer handleStatus);

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IPressurePumpService.java

@@ -178,4 +178,11 @@ public interface IPressurePumpService {
      * @return
      */
     List<OrgUsrDto> getOrgUsrDtoInfo(Map<String, String> map);
+
+    /**
+     * 获取公司顶级bizOrgCode
+     * @param bizOrgCode
+     * @return
+     */
+    String getCompanyBizOrgCode(String bizOrgCode);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/PressurePumpServiceImpl.java

@@ -58,13 +58,8 @@ public class PressurePumpServiceImpl implements IPressurePumpService {
     @Async
     public void saveDataToRedis(List<IotDataVO> iotDatalist, String iotCode, String bizOrgCode) {
         // 获取公司顶级bizOrgCode
-        Map<String, String> params = new HashMap<>();
-        params.put("bizOrgType", PressurePumpRelateEnum.BIZ_ORG_TYPE_COMPANY.getValue());
-        params.put("bizOrgCode", bizOrgCode);
-        List<OrgUsrDto> orgUsrDtoList = getOrgUsrDtoInfo(params);
-        if (CollectionUtils.isNotEmpty(orgUsrDtoList)) {
-            bizOrgCode = orgUsrDtoList.get(0).getBizOrgCode();
-            if (StringUtils.isNotBlank(bizOrgCode)) {
+        bizOrgCode = getCompanyBizOrgCode(bizOrgCode);
+        if (StringUtils.isNotBlank(bizOrgCode)) {
                 String pressurePumpValue = PressurePumpRelateEnum.PRESSURE_PUMP.getValue();
                 //  获取配置JSON信息集合
                 List<Map> list = getNameKeyInfoList(pressurePumpValue);
@@ -84,6 +79,17 @@ public class PressurePumpServiceImpl implements IPressurePumpService {
                 }
             }
         }
+
+    @Override
+    public String getCompanyBizOrgCode(String bizOrgCode) {
+        Map<String, String> params = new HashMap<>();
+        params.put("bizOrgType", PressurePumpRelateEnum.BIZ_ORG_TYPE_COMPANY.getValue());
+        params.put("bizOrgCode", bizOrgCode);
+        List<OrgUsrDto> orgUsrDtoList = getOrgUsrDtoInfo(params);
+        if (CollectionUtils.isNotEmpty(orgUsrDtoList)) {
+            bizOrgCode = orgUsrDtoList.get(orgUsrDtoList.size() - 1).getBizOrgCode();
+        }
+        return bizOrgCode;
     }
 
     @Override
@@ -303,6 +309,8 @@ public class PressurePumpServiceImpl implements IPressurePumpService {
                     PressurePumpCountVo countVo = new PressurePumpCountVo();
                     countVo.setTime(time);
                     countVo.setValue(dataMap.get(time).size());
+                    // 获取公司顶级bizOrgCode
+                    bizOrgCode = getCompanyBizOrgCode(bizOrgCode);
                     //  获取的数据存储到redis
                     String topic = String.join(":", infoCode, bizOrgCode, countRedisKey, fieldKey, iotCode, time);
                     countVo.setIotCode(topic);

amos-boot-system-equip/src/main/resources/mapper/OrgUsrMapper.xml

@@ -64,8 +64,9 @@
                 biz_org_type = #{bizOrgType}
             </if>
             <if test="bizOrgCode != null and bizOrgCode != ''">
-                AND locate( #{bizOrgCode}, biz_org_code ) > 0
+                AND locate( biz_org_code, #{bizOrgCode} ) > 0
             </if>
         </where>
+        ORDER BY sequence_nbr
     </select>
 </mapper>