Skip to content

A
amos-boot-biz
Commit dcb12c6f authored by 张森's avatar 张森
Browse files
Options

Merge remote-tracking branch 'origin/develop_dl' into develop_dl_bugfix

parents 11bb412a e44d4009
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 314 additions and 99 deletions
.idea/compiler.xml
View file @ dcb12c6f
......@@ -7,55 +7,56 @@
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
<module name="amos-boot-module-equip-biz" />
<module name="amos-boot-module-latentdanger-biz" />
<module name="amos-boot-module-precontrol-biz" />
<module name="amos-boot-utils-video" />
<module name="amos-boot-system-fas" />
<module name="amos-boot-module-supervision-api" />
<module name="amos-boot-module-maintenance-biz" />
<module name="amos-boot-module-knowledgebase-api" />
<module name="amos-boot-system-fas" />
<module name="amos-boot-module-avic-biz" />
<module name="amos-boot-module-fas-api" />
<module name="amos-boot-module-equip-api" />
<module name="amos-boot-module-knowledgebase-biz" />
<module name="amos-boot-module-maintenance-api" />
<module name="amos-boot-system-ccs" />
<module name="amos-boot-biz-common" />
<module name="amos-boot-module-common-biz" />
<module name="amos-boot-module-common-api" />
<module name="amos-boot-data-alarm" />
<module name="amos-boot-module-precontrol-biz" />
<module name="amos-boot-data-common" />
<module name="amos-boot-module-precontrol-api" />
<module name="amos-boot-module-jcs-biz" />
<module name="amos-boot-module-ccs-biz" />
<module name="amos-boot-system-equip" />
<module name="amos-boot-module-patrol-api" />
<module name="amos-boot-system-knowledgebase" />
<module name="amos-boot-system-supervision" />
<module name="amos-boot-module-ccs-api" />
<module name="amos-boot-module-patrol-biz" />
<module name="amos-boot-system-maintenance" />
<module name="amos-boot-system-jcs" />
<module name="amos-boot-module-equip-biz" />
<module name="amos-boot-module-command-biz" />
<module name="amos-boot-system-latentdanger" />
<module name="amos-boot-data-openapi" />
<module name="amos-boot-module-jcs-api" />
<module name="amos-boot-cloud-gateway" />
<module name="amos-boot-module-latentdanger-biz" />
<module name="amos-boot-utils-speech" />
<module name="amos-boot-module-supervision-biz" />
<module name="amos-boot-module-latentdanger-api" />
<module name="amos-boot-utils-jpush" />
<module name="amos-boot-module-tzs-api" />
<module name="amos-boot-system-patrol" />
<module name="amos-boot-system-supervision" />
<module name="amos-boot-module-tzs-biz" />
<module name="amos-boot-system-latentdanger" />
<module name="amos-boot-system-precontrol" />
<module name="amos-boot-module-supervision-api" />
<module name="amos-boot-module-fas-biz" />
<module name="amos-boot-module-patrol-biz" />
<module name="amos-boot-module-ccs-biz" />
<module name="amos-boot-module-equip-api" />
<module name="amos-boot-core" />
<module name="amos-boot-module-avic-biz" />
<module name="amos-boot-utils-speech" />
<module name="amos-boot-module-command-api" />
<module name="amos-boot-utils-message" />
<module name="amos-boot-module-ccs-api" />
<module name="amos-boot-module-knowledgebase-api" />
<module name="amos-boot-system-jcs" />
<module name="amos-boot-data-alarm" />
<module name="amos-boot-module-common-biz" />
<module name="amos-boot-module-knowledgebase-biz" />
<module name="amos-boot-cloud-gateway" />
<module name="amos-boot-module-latentdanger-api" />
<module name="amos-boot-module-avic-api" />
<module name="amos-boot-system-knowledgebase" />
<module name="amos-boot-module-tzs-api" />
<module name="amos-boot-module-jcs-biz" />
<module name="amos-boot-system-ccs" />
<module name="amos-boot-data-equip" />
<module name="amos-boot-utils-message" />
<module name="amos-boot-module-fas-biz" />
<module name="amos-boot-module-command-biz" />
<module name="amos-boot-system-equip" />
<module name="amos-boot-module-jcs-api" />
<module name="amos-boot-utils-jpush" />
<module name="amos-boot-module-maintenance-api" />
<module name="amos-boot-module-command-api" />
<module name="amos-boot-biz-common" />
<module name="amos-boot-module-precontrol-api" />
<module name="amos-boot-data-common" />
<module name="amos-boot-module-common-api" />
<module name="amos-boot-utils-adpter" />
<module name="amos-boot-system-patrol" />
</profile>
</annotationProcessing>
<bytecodeTargetLevel>
......@@ -110,7 +111,8 @@
<module name="amos-boot-system-patrol" options="-parameters" />
<module name="amos-boot-system-precontrol" options="-parameters" />
<module name="amos-boot-system-supervision" options="-parameters" />
<module name="amos-boot-system-tzs" options="" />
<module name="amos-boot-system-tzs" options="-parameters" />
<module name="amos-boot-utils-adpter" options="-parameters" />
<module name="amos-boot-utils-jpush" options="-parameters" />
<module name="amos-boot-utils-message" options="-parameters" />
<module name="amos-boot-utils-speech" options="-parameters" />
......
.idea/encodings.xml
View file @ dcb12c6f
......@@ -7,14 +7,14 @@
<file url="file://$PROJECT_DIR$/amos-boot-core" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-core/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-data" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-data/amos-boot-data-accessapi" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-data/amos-boot-data-alarm" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-data/amos-boot-data-alarm/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-data/amos-boot-data-common" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-data/amos-boot-data-common/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-data/amos-boot-data-equip" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-data/amos-boot-data-equip/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-data/amos-boot-data-openapi" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-data/amos-boot-data-openapi/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-data/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-data/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-jcs-system" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-module" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-cloud-gateway" charset="UTF-8" />
......@@ -34,6 +34,7 @@
<file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-api/amos-boot-module-fas-api/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-api/amos-boot-module-kgd-api" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-api/amos-boot-module-knowledgebase-api" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-api/amos-boot-module-knowledgebase-api/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-api/amos-boot-module-latentdanger-api" charset="UTF-8" />
......@@ -47,8 +48,6 @@
<file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-api/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-api/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-biz" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-biz/amos-boot-module-avic-biz" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-biz/amos-boot-module-avic-biz/src/main/java" charset="UTF-8" />
......@@ -64,6 +63,7 @@
<file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-biz/amos-boot-module-kgd-biz" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-biz/amos-boot-module-knowledgebase-biz" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-biz/amos-boot-module-knowledgebase-biz/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz" charset="UTF-8" />
......@@ -77,10 +77,9 @@
<file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-biz/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-biz/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-module/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-module/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-system-cas" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-system-cas/amos-boot-module-cas-api" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-system-cas/amos-boot-module-cas-biz" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-system-ccs" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-system-ccs/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-system-equip" charset="UTF-8" />
......@@ -89,6 +88,7 @@
<file url="file://$PROJECT_DIR$/amos-boot-system-fas/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-system-jcs" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-system-jcs/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-system-kgd" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-system-knowledgebase" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-system-knowledgebase/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-system-latentdanger" charset="UTF-8" />
......@@ -101,25 +101,23 @@
<file url="file://$PROJECT_DIR$/amos-boot-system-precontrol/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-system-supervision" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-system-supervision/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-system-tdc" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-system-tdc/amos-boot-module-tdc-api" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-system-tdc/amos-boot-module-tdc-biz" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-system-tzs" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-system-tzs/amos-boot-module-tzs-api" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-system-tzs/amos-boot-module-tzs-biz" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-system-tzs/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-system-tzs/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-tzs-system" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-utils" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-utils/amos-boot-utils-adpter" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-utils/amos-boot-utils-jpush" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-utils/amos-boot-utils-jpush/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-utils/amos-boot-utils-message" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-utils/amos-boot-utils-message/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-utils/amos-boot-utils-speech" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-utils/amos-boot-utils-speech/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-utils/amos-boot-utils-video" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-utils/amos-boot-utils-video/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-utils/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/amos-boot-utils/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
</component>
</project>
\ No newline at end of file
.idea/misc.xml
View file @ dcb12c6f
......@@ -9,8 +9,6 @@
</option>
<option name="ignoredFiles">
<set>
<option value="$PROJECT_DIR$/../../../Sanwei/developer/amos-boot-system-ugp/amos-boot-module-ugp-api/pom.xml" />
<option value="$PROJECT_DIR$/../../../Sanwei/developer/amos-boot-system-ugp/amos-boot-module-ugp-biz/pom.xml" />
<option value="$PROJECT_DIR$/amos-boot-data/amos-boot-data-accessapi/pom.xml" />
<option value="$PROJECT_DIR$/amos-boot-module/amos-boot-module-api/amos-boot-module-kgd-api/pom.xml" />
<option value="$PROJECT_DIR$/amos-boot-module/amos-boot-module-biz/amos-boot-module-kgd-biz/pom.xml" />
......
amos-boot-biz-common/amos-boot-biz-common.iml deleted 100644 → 0
View file @ 11bb412a
This diff is collapsed.
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IOrgUsrService.java
View file @ dcb12c6f
......@@ -408,4 +408,5 @@ public interface IOrgUsrService {
IPage<Map<String, Object>> getManagePersonPage(String pageNum, String pageSize, String bizOrgCode, String code, String personStatus);
OrgUsr getUnitByOrgCode(String bizOrgCode);
}
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentIndex.java
View file @ dcb12c6f
......@@ -125,4 +125,7 @@ public class EquipmentIndex extends BaseEntity {
@TableField(value = "unit")
private String unit;
@TableField(value = "alarm_rule")
private String alarmRule;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecificIndex.java
View file @ dcb12c6f
......@@ -145,9 +145,6 @@ public class EquipmentSpecificIndex extends BaseEntity {
@TableField(exist = false)
private String buildId;
@ApiModelProperty(value = "是否遥测")
@TableField(exist = false)
private Integer isTrend;
@ApiModelProperty(value = "绑定视屏数量")
@TableField(exist = false)
private int num;
......@@ -208,4 +205,12 @@ public class EquipmentSpecificIndex extends BaseEntity {
@ApiModelProperty(value = "网关标识")
@TableField(value = "gateway_id")
private String gatewayId;
@ApiModelProperty(value = "告警规则")
@TableField(value = "alarm_rule")
private String alarmRule;
@ApiModelProperty(value = "是否遥测")
@TableField(value = "is_trend")
private Boolean isTrend;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/vo/EquipmentIndexVO.java
View file @ dcb12c6f
......@@ -90,4 +90,7 @@ public class EquipmentIndexVO {
@ApiModelProperty(value = "装备指标名称")
private String equipmentIndexName;
@ApiModelProperty(value = "告警规则")
private String alarmRule;
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java
View file @ dcb12c6f
......@@ -1251,5 +1251,12 @@ public class OrgUsrController extends BaseController {
return ResponseHelper.buildResponse(menus);
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "根据bizOrgCode查询公司部门 非树", notes = "根据bizOrgCode查询公司部门 非树")
@GetMapping(value = "find/getUnitByOrgCode")
public ResponseModel<OrgUsr> getUnitByOrgCode(@RequestParam String bizOrgCode) {
return ResponseHelper.buildResponse(iOrgUsrService.getUnitByOrgCode(bizOrgCode));
}
}
\ No newline at end of file
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java
View file @ dcb12c6f
......@@ -3814,6 +3814,12 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
return pageBean;
}
@Override
public OrgUsr getUnitByOrgCode (String bizOrgCode) {
LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(OrgUsr::getBizOrgCode,bizOrgCode);
wrapper.eq(BaseEntity::getIsDelete,false);
wrapper.eq(OrgUsr::getBizOrgType, CommonConstant.BIZ_ORG_TYPE_COMPANY);
return this.baseMapper.selectOne(wrapper);
}
}
\ No newline at end of file
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/SupervisionConfigureController.java
View file @ dcb12c6f
......@@ -245,7 +245,7 @@ public class SupervisionConfigureController extends AbstractBaseController {
for (Map<String, Object> m : res) {
Map<String, Object> transResult = UnitTransformUtil.transformValues(String.valueOf(m.get("nowLevel")),
String.valueOf(m.get("unit")), String.valueOf(m.get("minLevel")), String.valueOf(m.get("maxLevel")));
m.put("nowLevel", transResult.get("nowValue"));
// m.put("nowLevel", transResult.get("nowValue"));
if (StringUtil.isNotEmpty(IndexStatusEnum.getEnumByKey(String.valueOf(transResult.get("status"))))) {
m.put("levelStatus", IndexStatusEnum.getEnumByKey(String.valueOf(transResult.get("status"))).getDescribe1());
} else {
......@@ -593,11 +593,21 @@ public class SupervisionConfigureController extends AbstractBaseController {
ReginParams reginParams = getSelectedOrgInfo();
ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
if (!ValidationUtil.isEmpty(personIdentity)) {
bizOrgCode = personIdentity.getBizOrgCode();
if (personIdentity.getCompanyBizOrgCode() == null) {
bizOrgCode = personIdentity.getBizOrgCode();
} else {
bizOrgCode = personIdentity.getCompanyBizOrgCode();
}
if (bizOrgCode == null) {
return CommonResponseUtil.success(null);
}
}
// if (!ValidationUtil.isEmpty(personIdentity)) {
// bizOrgCode = personIdentity.getBizOrgCode();
// if (bizOrgCode == null) {
// return CommonResponseUtil.success(null);
// }
// }
}
List<Map<String, Object>> list = supervisionVideoService.selectAllPressureName(bizOrgCode);
return CommonResponseUtil.success(list);
......@@ -786,4 +796,31 @@ public class SupervisionConfigureController extends AbstractBaseController {
// return format;
}
@PersonIdentify
@RequestMapping(value = "/pressurePump/page", method = RequestMethod.GET)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "稳压泵信号详情分页列表", produces = "application/json;charset=UTF-8", notes = "稳压泵信号详情分页列表")
public ResponseModel getPressurePumpPage(@RequestParam(value = "bizOrgCode", required = false) String bizOrgCode,
@RequestParam(value = "id", required = false) String id,
@RequestParam(value = "startTime", required = false) String startTime,
@RequestParam(value = "endTime", required = false) String endTime,
@RequestParam(value = "pageNum") String pageNum,
@RequestParam(value = "pageSize") String pageSize,
@RequestParam(value = "timeSort", required = false) String timeSort,
@RequestParam(value = "stateSort", required = false) String stateSort) {
if (ObjectUtils.isEmpty(bizOrgCode)) {
ReginParams reginParams = getSelectedOrgInfo();
ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
if (!ValidationUtil.isEmpty(personIdentity)) {
bizOrgCode = personIdentity.getBizOrgCode();
if (bizOrgCode == null) {
return CommonResponseUtil.success(null);
}
}
}
Map<String, Object> list = supervisionVideoService.getPressurePumpPage(bizOrgCode, id, startTime, endTime, pageNum, pageSize, timeSort, stateSort);
return CommonResponseUtil.success(list);
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/FireFightingSystemMapper.java
View file @ dcb12c6f
......@@ -694,6 +694,8 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
List<Map<String, Object>> selectAllPressurePumpInfo(@Param("bizOrgCode") String bizOrgCode, @Param("id") String id);
List<Map<String, Object>> selectAllPressurePumpInfoByBizOrgCode(@Param("bizOrgCode") String bizOrgCode, @Param("id") String id);
List<Map<String, Object>> selectAllPressureName(@Param("bizOrgCode") String bizOrgCode);
List<Map<String, Object>> selectAllDays();
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/ISupervisionVideoService.java
View file @ dcb12c6f
......@@ -26,5 +26,7 @@ public interface ISupervisionVideoService extends IService<SupervisionVideo> {
List<Map<String, Object>> selectPressureDetails(String bizOrgCode, String id, String startTime, String endTime);
Map<String, Object> getPressurePumpPage(String bizOrgCode, String id, String startTime, String endTime, String pageNum, String pageSize, String timeSort, String stateSort);
List<Map<String, Object>> selectAllPressureName(String bizOrgCode);
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EmergencyServiceImpl.java
View file @ dcb12c6f
......@@ -161,7 +161,7 @@ public class EmergencyServiceImpl implements IEmergencyService {
for (Map<String, Object> m : res) {
Map<String, Object> transResult = UnitTransformUtil.transformValues(String.valueOf(m.get("nowLevel")),
String.valueOf(m.get("unit")), String.valueOf(m.get("minLevel")), String.valueOf(m.get("maxLevel")));
m.put("nowLevel", transResult.get("nowValue"));
// m.put("nowLevel", transResult.get("nowValue"));
if (StringUtil.isNotEmpty(IndexStatusEnum.getEnumByKey(String.valueOf(transResult.get("status"))))) {
m.put("status", IndexStatusEnum.getEnumByKey(String.valueOf(transResult.get("status"))).getDescribe1());
} else {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentDetailServiceImpl.java
View file @ dcb12c6f
......@@ -389,7 +389,7 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
log.error("时间格式异常：", e);
}
}
// 剩余服役天数 = 报废日期 - 当前日期
// 剩余服役天数 = 计划报废日期 - 当前日期
Date scrapDate = equipmentDetail.getScrapDate();
if (Objects.nonNull(scrapDate)) {
Date nowDate = DateUtils.getDateNow();
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java
View file @ dcb12c6f
......@@ -1591,6 +1591,8 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
equipmentSpecificIndex.setUnit(index.getUnit());
equipmentSpecificIndex.setValueEnum(index.getValueEnum());
equipmentSpecificIndex.setTypeCode(index.getTypeCode());
equipmentSpecificIndex.setIsTrend(index.getIsTrend());
equipmentSpecificIndex.setAlamReason(index.getAlarmRule());
equipmentSpecificIndices.add(equipmentSpecificIndex);
});
}
......@@ -1927,7 +1929,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
iotIndexInfoVo.setType(equipmentSpecificIndex.getTypeName() != null ? equipmentSpecificIndex.getTypeName() : equipmentSpecificIndex.getIndexName());
iotIndexInfoVo.setNumber(deviceName);
if (equipmentSpecificIndex.getIsTrend() == 1) {
if (equipmentSpecificIndex.getIsTrend()) {
BigDecimal val = new BigDecimal(String.valueOf(entry.getValue()));
iotIndexInfoVo.setContent(equipmentSpecificIndex.getIndexName() + (val.setScale(2, BigDecimal.ROUND_HALF_UP)) + equipmentSpecificIndex.getIndexUnitName());
} else {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/SupervisionVideoServiceImpl.java
View file @ dcb12c6f
......@@ -2,6 +2,9 @@ package com.yeejoin.equipmanage.service.impl;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
......@@ -11,6 +14,8 @@ import com.yeejoin.equipmanage.common.enums.PressurePumpRelateEnum;
import com.yeejoin.equipmanage.common.utils.DateUtils;
import com.yeejoin.equipmanage.common.vo.IotDataVO;
import com.yeejoin.equipmanage.common.vo.PressurePumpCountVo;
import com.yeejoin.equipmanage.common.vo.StationMessage;
import com.yeejoin.equipmanage.fegin.IotFeign;
import com.yeejoin.equipmanage.mapper.FireFightingSystemMapper;
import com.yeejoin.equipmanage.mapper.SupervisionVideoMapper;
import com.yeejoin.equipmanage.service.IEquipmentSpecificSerivce;
......@@ -25,6 +30,7 @@ import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.text.DecimalFormat;
import java.text.ParseException;
......@@ -33,6 +39,8 @@ import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import static org.typroject.tyboot.core.foundation.context.RequestContext.*;
@Slf4j
@Service
......@@ -53,6 +61,9 @@ public class SupervisionVideoServiceImpl extends ServiceImpl<SupervisionVideoMap
@Autowired
private FireFightingSystemMapper fireFightingSystemMapper;
@Autowired
private IotFeign iotFeign;
@Value("${equipment.pressurepump.start}")
private String pressurePumpStart;
......@@ -302,6 +313,74 @@ public class SupervisionVideoServiceImpl extends ServiceImpl<SupervisionVideoMap
}
}
@Override
public Map<String, Object> getPressurePumpPage(String bizOrgCode, String id, String startTime, String endTime, String pageNum, String pageSize, String timeSort, String stateSort) {
List<Map<String, Object>> pressurePumpInfo = fireFightingSystemMapper.selectAllPressurePumpInfoByBizOrgCode(bizOrgCode, id);
List<Map<String, String>> resList = new ArrayList<>();
List<Map<String, String>> finalResList = resList;
pressurePumpInfo.stream().forEach(item -> {
String prefix = null;
String suffix = null;
String iotCode = item.get("iot_code").toString();
if (iotCode.length() > 8) {
prefix = iotCode.substring(0, 8);
suffix = iotCode.substring(8);
} else {
throw new BadRequest("装备物联编码错误，请确认！");
}
ResponseModel entity = null;
try {
entity = iotFeign.selectPage(getAppKey(), getProduct(), getToken(), startTime, endTime, prefix, suffix, pressurePumpStart, 0, 1000);
} catch (Exception e) {
throw new RuntimeException("调用AMOS-API-IOT服务失败，请检查服务是否正常！");
}
if (200 == entity.getStatus() && !ObjectUtils.isEmpty(entity.getResult())) {
String json = JSON.toJSONString(entity.getResult());
JSONObject messageObj = JSONObject.parseObject(json);
JSONArray array = messageObj.getJSONArray("records");
List<Map<String, String>> listObject = (List<Map<String, String>>) JSONArray.parse(JSON.toJSONString(array));
listObject.forEach(x -> {
Map<String, String> map = new HashMap<>();
map.put("id", UUID.randomUUID().toString());
map.put("name", String.valueOf(item.get("name")));
map.put("time", String.valueOf(x.get("time")).substring(0, 19).replace("T", " "));
map.put("value", String.valueOf(x.get(pressurePumpStart)));
finalResList.add(map);
});
}
});
Map<String, Object> resMap = new HashMap<>();
resMap.put("current", Integer.valueOf(pageNum));
resMap.put("pageSize", Integer.valueOf(pageSize));
resMap.put("total", finalResList.size());
if (ObjectUtils.isEmpty(finalResList)) {
resMap.put("pages", 0);
resMap.put("records", new ArrayList<>());
return resMap;
} else {
resList = finalResList.stream().sorted((t1, t2) -> t2.get("time").compareTo(t1.get("time"))).collect(Collectors.toList());
}
if (StringUtils.isNotEmpty(timeSort)) {
if ("0".equals(timeSort)) {
resList = finalResList.stream().sorted(Comparator.comparing(t -> t.get("time"))).collect(Collectors.toList());
}
}
if (StringUtils.isNotEmpty(stateSort)) {
if ("1".equals(stateSort)) {
resList = resList.stream().sorted((t1, t2) -> t2.get("value").compareTo(t1.get("value"))).collect(Collectors.toList());
} else {
resList = resList.stream().sorted(Comparator.comparing(t -> t.get("value"))).collect(Collectors.toList());
}
}
int startIndex = (Integer.valueOf(pageNum) - 1) * Integer.valueOf(pageSize);
int endIndex = Math.min(startIndex + Integer.valueOf(pageSize), resList.size());
int pages = (finalResList.size() + Integer.valueOf(pageSize) - 1) / Integer.valueOf(pageSize);
List<Map<String, String>> list = resList.subList(startIndex, endIndex);
resMap.put("pages", pages);
resMap.put("records", list);
return resMap;
}
@Override
public List<Map<String, Object>> selectAllPressureName(String bizOrgCode) {
......
amos-boot-system-equip/src/main/resources/application.properties
View file @ dcb12c6f
spring.application.name=AMOS-EQUIPMANAGE
spring.application.name=AMOS-EQUIPMANAGE-xxz
server.servlet.context-path=/equip
server.port=8100
......@@ -25,7 +25,7 @@ pagehelper.support-methods-arguments=true
spring.main.allow-bean-definition-overriding=true
#liquibase
spring.liquibase.change-log=classpath:/changelog/changelog-master.xml
spring.liquibase.enabled=false
spring.liquibase.enabled=true
#\u4E0A\u4F20\u6587\u4EF6\u8BBE\u7F6E
spring.servlet.multipart.maxFileSize=100MB
......
amos-boot-system-equip/src/main/resources/changelog/wl-3.6.0.xml
View file @ dcb12c6f
......@@ -1174,4 +1174,47 @@
UPDATE `wl_car` wc SET wc.use_type = '自购';
</sql>
</changeSet>
<changeSet author="keyong" id="1694055999">
<preConditions onFail="MARK_RAN">
<not>
<columnExists tableName="wl_equipment_index" columnName="alarm_rule"/>
</not>
</preConditions>
<comment>新增字段 type_code</comment>
<sql>
alter table `wl_equipment_index` add column `alarm_rule` varchar(50) DEFAULT NULL COMMENT '告警规则';
alter table `wl_equipment_specific_index` add column `is_trend` bit(1) DEFAULT b'0' COMMENT '是否支持趋势查看(冗余自wl_equipment_index)';
alter table `wl_equipment_specific_index` add column `alarm_rule` varchar(50) DEFAULT NULL COMMENT '告警规则(冗余自wl_equipment_index)';
UPDATE wl_equipment_specific_index esi SET esi.is_trend = ( SELECT is_trend FROM wl_equipment_index wei WHERE esi.equipment_index_id = wei.id ),
esi.alarm_rule = ( SELECT alarm_rule FROM wl_equipment_index wei WHERE esi.equipment_index_id = wei.id );
</sql>
</changeSet>
<changeSet author="lixm" id="202403120101">
<preConditions onFail="MARK_RAN">
<not>
<columnExists tableName="cb_water_resource_pool" columnName="output_flow_rate"/>
</not>
</preConditions>
<comment>cb_water_resource_pool add column</comment>
<sql>
ALTER TABLE `cb_water_resource_pool`
ADD COLUMN `output_flow_rate` float(10, 2) NULL COMMENT '出口流量（L/s）' AFTER `level_device_name`;
</sql>
</changeSet>
<changeSet author="zs" id="20240401-zs-1">
<preConditions onFail="MARK_RAN">
<not>
<columnExists tableName="cb_water_resource_pool" columnName="pump_device_id"/>
</not>
</preConditions>
<comment>modify table cb_water_resource_pool add columns</comment>
<sql>
ALTER TABLE `cb_water_resource_pool`
ADD pump_device_id varchar(1000) DEFAULT NULL COMMENT '消防泵装置ids',
ADD pump_device_name varchar(1500) DEFAULT NULL COMMENT '消防泵装置名称s';
</sql>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
amos-boot-system-equip/src/main/resources/mapper/EquipmentDetailMapper.xml
View file @ dcb12c6f
......@@ -173,7 +173,7 @@
<select id="selectEquipScrapDate" resultType="java.util.Map">
SELECT
DATE_ADD(DATE_FORMAT(ed.production_date, '%Y-%m-%d'), INTERVAL e.expiry_date YEAR) AS planScrapDate,
DATE_ADD(DATE_FORMAT(ed.production_date, '%Y-%m-%d'), INTERVAL ed.expiry_date YEAR) AS planScrapDate,
spd.create_date AS scrapDate
FROM
wl_equipment_specific es
......
amos-boot-system-equip/src/main/resources/mapper/EquipmentIndexMapper.xml
View file @ dcb12c6f
......@@ -158,7 +158,8 @@
sort_num,
type,
is_trend,
value_enum
value_enum,
alarm_rule AS alarmRule
from
wl_equipment_index
where id = #{id}
......
amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificIndexMapper.xml
View file @ dcb12c6f
......@@ -67,7 +67,8 @@
TRIM(CONCAT_WS(' ',wes.position,sd.description)) AS location,
sd.warehouse_structure_id AS buildId,
wes.biz_org_name AS bizOrgName,
wes.biz_org_code AS bizOrgCode
wes.biz_org_code AS bizOrgCode,
wesi.alarm_rule AS alarmRule
FROM
wl_equipment_specific_index AS wesi
LEFT JOIN wl_equipment_specific AS wes
......@@ -485,7 +486,7 @@
wec.code,
we.expiry_date as weExpiry,
wed.area as area,
wed.production_date as product,
ifnull(wed.production_date, '') as product,
wes.biz_org_code as bizOrgCode,
wes.biz_org_name as bizOrgName
from wl_equipment_specific wes
......
amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml
View file @ dcb12c6f
......@@ -5887,6 +5887,29 @@
es.id
</select>
<select id="selectAllPressurePumpInfoByBizOrgCode" resultType="java.util.Map">
SELECT
es.id,
es.`name`,
concat_ws( '-', ws.full_name, ed.area ) area,
es.iot_code
FROM
wl_equipment_specific es
LEFT JOIN wl_equipment_detail ed ON es.equipment_detail_id = ed.id
LEFT JOIN wl_warehouse_structure ws ON ws.id = es.warehouse_structure_id
WHERE
ed.`code` LIKE '92010800%'
AND es.iot_code IS NOT NULL
<if test="bizOrgCode != null and bizOrgCode != ''" >
AND es.biz_org_code like concat(#{bizOrgCode}, '%')
</if>
<if test="id != null and id != ''" >
AND es.id = #{id}
</if>
GROUP BY
es.id
</select>
<select id="selectAllPressureName" resultType="java.util.Map">
SELECT
es.`name`,
......
amos-boot-utils/amos-boot-utils-message/src/main/java/com/yeejoin/amos/message/kafka/KafkaConsumerService.java
View file @ dcb12c6f
......@@ -75,32 +75,32 @@ public class KafkaConsumerService {
* @param consumerRecords messages
* @param ack ack
*/
@KafkaListener(id = "provinceMessage", groupId = "province", topics = "#{'${kafka.topics}'.split(',')}")
public void listen(List<ConsumerRecord<String, String>> consumerRecords, Acknowledgment ack) {
try {
if (isZxj) {
for (ConsumerRecord<String, String> consumerRecord : consumerRecords) {
Optional<?> kafkaMessage = Optional.ofNullable(consumerRecord.value());
if (kafkaMessage.isPresent()) {
JSONObject messageObj = JSONObject.fromObject(kafkaMessage.get());
String type = messageObj.optString(TYPE);
String table = messageObj.optString(TABLE);
if (Arrays.asList(INSERT, UPDATE).contains(type) && DBTableTypeEnum.have(table) != null) {
JSONObject data = (JSONObject) messageObj.getJSONArray(DATA).get(0);
data.put(DB_TYPE, type);
data.put(TABLE, table);
emqKeeper.getMqttClient().publish(PROVINCE_MQTT_TOPIC, data.toString().getBytes(StandardCharsets.UTF_8), 0, false);
log.info("kafka消费province消息{}", messageObj);
}
}
}
}
} catch (Exception e) {
log.error("kafka失败，当前失败的批次: data:{}, {}", consumerRecords, e);
} finally {
ack.acknowledge();
}
}
// @KafkaListener(id = "provinceMessage", groupId = "province", topics = "#{'${kafka.topics}'.split(',')}")
// public void listen(List<ConsumerRecord<String, String>> consumerRecords, Acknowledgment ack) {
// try {
// if (isZxj) {
// for (ConsumerRecord<String, String> consumerRecord : consumerRecords) {
// Optional<?> kafkaMessage = Optional.ofNullable(consumerRecord.value());
// if (kafkaMessage.isPresent()) {
// JSONObject messageObj = JSONObject.fromObject(kafkaMessage.get());
// String type = messageObj.optString(TYPE);
// String table = messageObj.optString(TABLE);
// if (Arrays.asList(INSERT, UPDATE).contains(type) && DBTableTypeEnum.have(table) != null) {
// JSONObject data = (JSONObject) messageObj.getJSONArray(DATA).get(0);
// data.put(DB_TYPE, type);
// data.put(TABLE, table);
// emqKeeper.getMqttClient().publish(PROVINCE_MQTT_TOPIC, data.toString().getBytes(StandardCharsets.UTF_8), 0, false);
// log.info("kafka消费province消息{}", messageObj);
// }
// }
// }
// }
// } catch (Exception e) {
// log.error("kafka失败，当前失败的批次: data:{}, {}", consumerRecords, e);
// } finally {
// ack.acknowledge();
// }
// }
/**
* 转发苏州，绍兴换流站Kafka数据对emq
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment