Skip to content

A
amos-boot-biz
Commit 97643eb3 authored by tangwei's avatar tangwei
Browse files
Options

Merge branch 'developer' into develop_ccs

parents ba57edfc edc05407
Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 74 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FireTeam.java
View file @ 97643eb3
......@@ -86,4 +86,10 @@ public class FireTeam extends BaseEntity {
@ApiModelProperty(value = "树结构层级code")
private String treeCode;
@ApiModelProperty(value = "bizOrgCode")
private String bizOrgCode;
@ApiModelProperty(value = "bizOrgName")
private String bizOrgName;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/DynamicFormInstanceMapper.xml
View file @ 97643eb3
......@@ -377,10 +377,10 @@ FROM
SELECT
Max(
CASE
WHEN cbd.field_code = 'administrativePositionCode' THEN
WHEN cbd.field_code = 'positionType' THEN
cbd.field_value
END
) AS administrativePositionCode,
) AS positionType,
Max(
CASE
WHEN cbd.field_code = 'telephone' THEN
......@@ -412,16 +412,16 @@ FROM
biz_org_name = #{departmentName} and is_delete = 0
)
AND cou.biz_org_type = 'PERSON'
AND cou.biz_org_type = 'PERSON' and is_delete = 0
) group by cbd.instance_id
) dd
LEFT JOIN cb_org_usr cour ON dd.instance_id = cour.sequence_nbr
WHERE
<if test="positionType == null ">
dd.administrativePositionCode IS NOT NULL
dd.positionType IS NOT NULL
</if>
<if test="positionType != null">
dd.administrativePositionCode in
dd.positionType in
<foreach collection="positionType" item="item" separator="," open="(" close=")" index="">
#{item, jdbcType=NUMERIC}
</foreach>
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/CommonPageInfoParam.java
View file @ 97643eb3
......@@ -111,6 +111,16 @@ public class CommonPageInfoParam extends CommonPageable {
private String status;
private String isRemoveShield;
public void setIsRemoveShield(String isRemoveShield) {
this.isRemoveShield = isRemoveShield;
}
public String getIsRemoveShield() {
return isRemoveShield;
}
public void setCleanStatus(String cleanStatus) {
this.cleanStatus = cleanStatus;
}
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/CommonPageParamUtil.java
View file @ 97643eb3
......@@ -59,6 +59,8 @@ public class CommonPageParamUtil {
param.setStatus(toString(queryRequests.get(i).getValue()));
} else if("cleanStatus".equals(name)){
param.setCleanStatus(toString(queryRequests.get(i).getValue()));
} else if("isRemoveShield".equals(name)){
param.setIsRemoveShield(toString(queryRequests.get(i).getValue()));
}
}
if(commonPageable !=null){
......
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 @ 97643eb3
......@@ -47,6 +47,7 @@ import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import javax.annotation.Resource;
import java.io.Serializable;
......@@ -2052,6 +2053,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
this.updateById(orgUsr);
BeanUtils.copyProperties(orgUsr, result);
} else {
if(OrgPersonVo.getDynamicFormValue() == null || OrgPersonVo.getDynamicFormValue().size() == 0) {
throw new BadRequest("人员动态表单信息未填写");
}
result = saveOrgUsrDynamicFormInstance(orgUsr, OrgPersonVo.getDynamicFormValue());
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentAlarmController.java
View file @ 97643eb3
......@@ -96,6 +96,7 @@ public class EquipmentAlarmController extends AbstractBaseController {
@RequestParam(value = "buildIds", required = false) List<String> buildIds,
@RequestParam(value = "id", required = false) String id,
@RequestParam(value = "cleanStatus", required = false) String cleanStatus,
@RequestParam(value = "isRemoveShield", required = false) String isRemoveShield,
CommonPageable commonPageable) {
if (commonPageable.getPageNumber() == 0) {
commonPageable.setPageNumber(1);
......@@ -148,7 +149,11 @@ public class EquipmentAlarmController extends AbstractBaseController {
CommonRequest request11 = new CommonRequest();
request11.setName("cleanStatus");
request11.setValue(StringUtil.isNotEmpty(cleanStatus) ? StringUtils.trimToNull(cleanStatus) : null);
queryRequests.add(request11);
queryRequests.add(request1);
CommonRequest request12 = new CommonRequest();
request12.setName("isRemoveShield");
request12.setValue(StringUtil.isNotEmpty(isRemoveShield) ? StringUtils.trimToNull(isRemoveShield) : null);
queryRequests.add(request12);
CommonPageInfoParam param = CommonPageParamUtil.fillCommonPageInfoParam(queryRequests, commonPageable);
Page<Map<String, Object>> list = iEquipmentSpecificAlarmService.listPage(param);
return CommonResponseUtil.success(list);
......@@ -209,7 +214,7 @@ public class EquipmentAlarmController extends AbstractBaseController {
@RequestParam(value = "alarmType", required = false) String alarmType,
@RequestParam(value = "systemCode", required = false) String systemCode,
@RequestParam(value = "buildId", required = false) String buildId,
// @RequestParam(value = "equipmentCode", required = false) String equipmentCode,
@RequestParam(value = "isRemoveShield", required = false) String isRemoveShield,
@RequestParam(value = "id", required = false) String id,
@RequestParam(value = "cleanStatus", required = false) String cleanStatus,
CommonPageable commonPageable) {
......@@ -255,6 +260,10 @@ public class EquipmentAlarmController extends AbstractBaseController {
request11.setName("cleanStatus");
request11.setValue(StringUtil.isNotEmpty(cleanStatus) ? StringUtils.trimToNull(cleanStatus) : null);
queryRequests.add(request11);
CommonRequest request12 = new CommonRequest();
request12.setName("isRemoveShield");
request12.setValue(StringUtil.isNotEmpty(isRemoveShield) ? StringUtils.trimToNull(isRemoveShield) : null);
queryRequests.add(request12);
CommonPageInfoParam param = CommonPageParamUtil.fillCommonPageInfoParam(queryRequests, commonPageable);
org.springframework.data.domain.Page<AlarmListDataVO> list = iEquipmentSpecificAlarmService.listAlarmsPage(param);
return CommonResponseUtil.success(list);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertSubmittedServiceImpl.java
View file @ 97643eb3
......@@ -541,7 +541,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
smsParams.put("callTimeStr", calledRo.getCallTimeStr());
smsParams.put("address", calledRo.getAddress());
smsParams.put("fireLocation", calledRo.getFireLocation());
smsParams.put("endTimeStr", DateUtils.convertDateToString(alertCalled.getUpdateTime(),DateUtils.DATE_TIME_PATTERN));
smsParams.put("endTimeStr", alertCalled.getUpdateTime() != null ? DateUtils.convertDateToString(alertCalled.getUpdateTime(),DateUtils.DATE_TIME_PATTERN) : "");
smsParams.put("burningMaterial", calledRo.getBurningMaterial());
smsParams.put("fireSituation", calledRo.getFireSituation());
smsParams.put("trappedNum", calledRo.getTrappedNum());
......@@ -1442,8 +1442,10 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
String [] groupCode = jsonObject1.getString("fireBrigade").split(",");
List<String> positionType= Arrays.asList(groupCode);
if (jsonObject1.containsKey("fireBrigade")) { {
List<Map<String, Object>> mapList = dynamicFormInstanceMapper.getFireRescueDepartmentStaff(fireTeam.getCompanyName(),positionType);
LambdaQueryWrapper<OrgUsr> queryWrapper = new LambdaQueryWrapper<OrgUsr>();
queryWrapper.eq(OrgUsr::getBizOrgCode, fireTeam.getBizOrgCode());
OrgUsr one = orgUsrService.getOne(queryWrapper);
List<Map<String, Object>> mapList = dynamicFormInstanceMapper.getFireRescueDepartmentStaff(one.getBizOrgName(),positionType);
sendUserIds.addAll(mapList);
}
if(jsonObject1.containsKey("onDuty")) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/UnitPersonController.java
View file @ 97643eb3
......@@ -10,6 +10,7 @@ import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonDto;
import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
import com.yeejoin.amos.boot.module.tzs.flc.api.dto.UnitInfoDto;
import com.yeejoin.amos.boot.module.tzs.flc.api.dto.UnitPersonInfoDto;
import com.yeejoin.amos.boot.module.tzs.flc.api.entity.UnitInfo;
......@@ -90,11 +91,15 @@ public class UnitPersonController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/save", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "新增人员信息", notes = "新增人员信息")
public ResponseModel<?> saveOrgUsr(@RequestBody UnitPersonInfoDto unitPersonInfoDto) {
public ResponseModel saveOrgUsr(@RequestBody UnitPersonInfoDto unitPersonInfoDto) {
if (ValidationUtil.isEmpty(unitPersonInfoDto.getParentId())) {
throw new BadRequest("参数校验失败.");
}
return ResponseHelper.buildResponse( iUnitPersonService.saveUser(unitPersonInfoDto));
try {
return CommonResponseUtil.success( iUnitPersonService.saveUser(unitPersonInfoDto));
} catch (Exception e) {
return CommonResponseUtil.failure(e.getMessage());
}
}
/**
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/UnitPersonServiceImpl.java
View file @ 97643eb3
package com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
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.biz.common.constants.CommonConstant;
......@@ -18,13 +16,10 @@ import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonFormDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
import com.yeejoin.amos.boot.module.common.api.enums.OrgPersonEnum;
import com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrMapper;
import com.yeejoin.amos.boot.module.common.api.service.ISourceFileService;
import com.yeejoin.amos.boot.module.common.biz.service.impl.DynamicFormColumnServiceImpl;
import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
import com.yeejoin.amos.boot.module.common.biz.service.impl.SourceFileServiceImpl;
import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator;
import com.yeejoin.amos.boot.module.tzs.api.enums.TzsCommonParam;
import com.yeejoin.amos.boot.module.tzs.flc.api.dto.PersonEducationDto;
import com.yeejoin.amos.boot.module.tzs.flc.api.dto.PersonQualityDto;
......@@ -41,7 +36,6 @@ import com.yeejoin.amos.feign.privilege.model.CompanyModel;
import com.yeejoin.amos.feign.privilege.model.RoleModel;
import com.yeejoin.amos.feign.privilege.util.DesUtil;
import com.yeejoin.amos.feign.systemctl.Systemctl;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
......@@ -213,7 +207,7 @@ public class UnitPersonServiceImpl implements IUnitPersonService {
BeanUtils.copyProperties(result,unitPersonInfoDto);
}
} catch (Exception e) {
e.printStackTrace();
throw new BadRequest(e.getMessage());
}
return unitPersonInfoDto;
}
......
amos-boot-system-equip/src/main/resources/changelog/init/view_all.sql
View file @ 97643eb3
......@@ -1181,7 +1181,7 @@ FROM
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
WHERE wesi.equipment_index_key = 'CAFS_FoamAirCompressor_Fault'
AND wesi.`value` = 'true'
AND wes.equipment_code = '92030500MG644'
AND wes.equipment_code = '92030700SFT44'
) AS kqysjgz,
(
SELECT
......@@ -4218,63 +4218,36 @@ ORDER BY
DROP VIEW IF EXISTS `v_fire_equip_realtime_status`;
CREATE ALGORITHM = UNDEFINED DEFINER = `root`@`%` SQL SECURITY DEFINER VIEW `v_fire_equip_realtime_status` AS
SELECT
temp.*,
fs.`name` as 'fsname',
fs.`code` as 'fscode',
(SELECT
IFNULL(SUM(frequency), 0)
FROM
wl_equipment_alarm_report_day
WHERE
equipment_specific_id = temp.equipment_specific_id
AND report_date = CURRENT_DATE) as 'total'
FROM
(
`wes`.`name` AS `equipName`,(
CASE
`wes`.`realtime_iot_index_value`
WHEN 'true' THEN
concat( `wes`.`realtime_iot_index_name`, '(是)' )
WHEN 'false' THEN
concat( `wes`.`realtime_iot_index_name`, '(否)' ) ELSE concat( `wes`.`realtime_iot_index_name`, '(', `wes`.`realtime_iot_index_value`, ')' )
END
) AS `nowStatus`,
`wes`.`realtime_iot_index_update_date` AS `update_date`,(
SELECT
a.equipment_specific_name AS 'equipName',
(
CASE a.`value`
WHEN 'true' THEN
concat(
a.equipment_index_name,
'(是)'
)
WHEN 'false' THEN
concat(
a.equipment_index_name,
'(否)'
)
END
) AS `nowStatus`,
a.equipment_specific_id,
a.update_date
group_concat( `fs`.`code` SEPARATOR ',' )
FROM
wl_equipment_specific_index a,
`f_fire_fighting_system` `fs`
WHERE
(
SELECT
equipment_specific_id,
MAX(update_date) AS update_date
FROM
wl_equipment_specific_index
GROUP BY
equipment_specific_id
) b
0 <> find_in_set( `fs`.`id`, `wes`.`system_id` ))) AS `fscode`,(
SELECT
group_concat( `fs`.`name` SEPARATOR ',' )
FROM
`f_fire_fighting_system` `fs`
WHERE
a.`value` IS NOT NULL
AND a.equipment_specific_id = b.equipment_specific_id
AND a.update_date = b.update_date
GROUP BY
a.equipment_specific_id
ORDER BY
a.update_date DESC
) temp,
wl_equipment_specific es
LEFT JOIN `f_fire_fighting_system` `fs` ON (
find_in_set(`fs`.`id`, es.system_id)
)
WHERE
temp.equipment_specific_id = es.id
ORDER BY temp.update_date DESC;
(
0 <> find_in_set( `fs`.`id`, `wes`.`system_id` ))) AS `fsname`
FROM
`wl_equipment_specific` `wes`
WHERE
( `wes`.`realtime_iot_es_index_id` IS NOT NULL )
ORDER BY
`wes`.`realtime_iot_index_update_date` DESC
-- 系统信息视图
......
amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml
View file @ 97643eb3
......@@ -248,6 +248,9 @@
<if test="param.cleanStatus != null and param.cleanStatus != '' and param.cleanStatus == 2">AND
d.cleanStatus = '未消除'
</if>
<if test="param.isRemoveShield != null and param.isRemoveShield != ''">AND
d.type != 'SHIELD'
</if>
</where>
ORDER BY d.createDate DESC
</select>
......@@ -389,8 +392,10 @@
<if test="param.cleanStatus != null and param.cleanStatus != '' and param.cleanStatus == 2">AND
d.cleanStatus = '未消除'
</if>
<if test="param.isRemoveShield != null and param.isRemoveShield != ''">AND
d.type != 'SHIELD'
</if>
</where>
ORDER BY d.createDate DESC
</select>
<select id="getAlarmList" resultType="java.util.HashMap">
......
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