zcloud_gbs
/
zcloud_gbs_fire_check_gwj
15
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改排序

main
zhaokai 2026-02-12 10:27:27 +08:00
parent 9d15be0dca
commit cedea5e04c
12 changed files with 64 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
web-app/src/main/java/com/zcloud/fire/check/command/FireDeviceUpdateExe.java
View File

@ -4,6 +4,8 @@ import com.alibaba.cola.exception.BizException;
import com.zcloud.fire.check.domain.gateway.FireDeviceGateway;
import com.zcloud.fire.check.domain.model.FireDeviceE;
import com.zcloud.fire.check.dto.FireDeviceUpdateCmd;
import com.zcloud.fire.check.persistence.dataobject.FireDeviceDO;
import com.zcloud.fire.check.persistence.repository.FireDeviceRepository;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
@ -20,9 +22,16 @@ import org.springframework.transaction.annotation.Transactional;
@AllArgsConstructor
public class FireDeviceUpdateExe {
private final FireDeviceGateway fireDeviceGateway;
private final FireDeviceRepository fireDeviceRepository;
@Transactional(rollbackFor = Exception.class)
public void execute(FireDeviceUpdateCmd fireDeviceUpdateCmd) {
FireDeviceDO fireDeviceDO = fireDeviceRepository.getInfoByCode(fireDeviceUpdateCmd.getFireDeviceCode());
if(fireDeviceDO != null && !fireDeviceDO.getId().equals(fireDeviceUpdateCmd.getId())){
throw new BizException("器材编号已存在");
}
FireDeviceE fireDeviceE = new FireDeviceE();
BeanUtils.copyProperties(fireDeviceUpdateCmd, fireDeviceE);
boolean res = fireDeviceGateway.update(fireDeviceE);

7
web-app/src/main/java/com/zcloud/fire/check/command/FirePointUpdateExe.java
View File

@ -5,6 +5,7 @@ import com.zcloud.fire.check.domain.gateway.FirePointGateway;
import com.zcloud.fire.check.domain.model.FirePointE;
import com.zcloud.fire.check.dto.FirePointUpdateCmd;
import com.zcloud.fire.check.dto.FirePointUpdateDepartmentCmd;
import com.zcloud.fire.check.persistence.dataobject.FirePointDO;
import com.zcloud.fire.check.persistence.repository.FirePointRepository;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
@ -26,6 +27,12 @@ public class FirePointUpdateExe {
@Transactional(rollbackFor = Exception.class)
public void execute(FirePointUpdateCmd firePointUpdateCmd) {
//点位编码唯一
FirePointDO firePointDO = firePointRepository.getInfoByCode(firePointUpdateCmd.getFirePointCode());
if (firePointDO != null && !firePointDO.getId().equals(firePointUpdateCmd.getId())) {
throw new BizException("点位编码已存在");
}
FirePointE firePointE = new FirePointE();
BeanUtils.copyProperties(firePointUpdateCmd, firePointE);
boolean res = firePointGateway.update(firePointE);

8
web-app/src/main/java/com/zcloud/fire/check/command/FireRegionUpdateExe.java
View File

@ -7,6 +7,7 @@ import com.zcloud.fire.check.domain.model.FireRegionE;
import com.zcloud.fire.check.dto.FireRegionUpdateCmd;
import com.zcloud.fire.check.dto.FireRegionUpdateDepartmentCmd;
import com.zcloud.fire.check.dto.FireRegionUpdateStatusCmd;
import com.zcloud.fire.check.persistence.dataobject.FireRegionDO;
import com.zcloud.fire.check.persistence.repository.FireRegionRepository;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
@ -28,6 +29,13 @@ public class FireRegionUpdateExe {
@Transactional(rollbackFor = Exception.class)
public void execute(FireRegionUpdateCmd fireRegionUpdateCmd) {
//区域编码唯一
FireRegionDO fireRegionDO =fireRegionRepository.getInfoByfireRefionCode(fireRegionUpdateCmd.getFireRegionCode());
if (fireRegionDO != null && !fireRegionDO.getId().equals(fireRegionUpdateCmd.getId())) {
throw new BizException("区域编码已存在");
}
FireRegionE fireRegionE = new FireRegionE();
BeanUtils.copyProperties(fireRegionUpdateCmd, fireRegionE);
boolean res = fireRegionGateway.update(fireRegionE);

4
web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckRecordQueryExe.java
View File

@ -183,7 +183,7 @@ public class FireCheckRecordQueryExe {
if(CollUtil.isEmpty(examCenterCOS)){
return PageResponse.of(null, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
}
//组装点位名称 和区域名称
/* //组装点位名称 和区域名称
List<String> fireCheckRecordIdList = examCenterCOS.stream().map(FireCheckRecordCO::getFireRecordId).collect(Collectors.toList());
List<FireCheckRecordPointDO> fireCheckRecordPointDOList =fireCheckRecordPointRepository.getCheckRecordPointListByCheckRecordIds(fireCheckRecordIdList);
//按照fireRecordId进行分组
@ -198,7 +198,7 @@ public class FireCheckRecordQueryExe {
info.setFirePointNameList(fireCheckRecordPointDOMap.get(info.getFireRecordId()).getFirePointName());
info.setFireRegionNameList(fireCheckRecordPointDOMap.get(info.getFireRecordId()).getFireRegionName());
});
});*/
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
}
}

3
web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordPageQry.java
View File

@ -26,6 +26,9 @@ public class FireCheckRecordPageQry extends PageQuery {
* - `le`: 小于等于比较查询
* - `ne`: 不等比较查询，对应SQL的!=操作符
*/
@ApiModelProperty(value = "企业id")
private Long corpinfoId;
@ApiModelProperty(value = "消防点位检查id")
private String fireCheckId;

8
web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckRecordDO.java
View File

@ -65,6 +65,14 @@ public class FireCheckRecordDO extends BaseDO {
@TableField(exist = false)
private String departmentName;
@ApiModelProperty(value = "消防点位名称")
@TableField(exist = false)
private String firePointNameList;
@ApiModelProperty(value = "消防区域名称")
@TableField(exist = false)
private String fireRegionNameList;
public FireCheckRecordDO(String fireRecordId) {
this.fireRecordId = fireRecordId;
}

2
web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireDeviceRepository.java
View File

@ -39,5 +39,7 @@ public interface FireDeviceRepository extends BaseRepository<FireDeviceDO> {
List<DataStatisticDO> countByCorpinfoIds(List<Long> corpinfoIds);
PageResponse<FireDeviceDO> pageByPointId(Map<String, Object> params);
FireDeviceDO getInfoByCode(@NotEmpty(message = "器材编号不能为空") String fireDeviceCode);
}

2
web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FirePointRepository.java
View File

@ -38,5 +38,7 @@ public interface FirePointRepository extends BaseRepository<FirePointDO> {
FirePointDO getInfoByUUId(@NotEmpty(message = "消防点位id不能为空") String firePointId);
List<DataStatisticDO> countByCorpinfoIds(List<Long> corpinfoIds);
FirePointDO getInfoByCode(@NotEmpty(message = "消防点位编码不能为空") String firePointCode);
}

2
web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireRegionRepository.java
View File

@ -30,5 +30,7 @@ public interface FireRegionRepository extends BaseRepository<FireRegionDO> {
List<DataStatisticDO> countByCorpinfoIds(List<Long> corpinfoIds);
void checkRegion(@NotEmpty(message = "消防区域id不能为空") String fireRegionId);
FireRegionDO getInfoByfireRefionCode(@NotEmpty(message = "编码不能为空") String fireRegionCode);
}

7
web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireDeviceRepositoryImpl.java
View File

@ -130,5 +130,12 @@ public class FireDeviceRepositoryImpl extends BaseRepositoryImpl<FireDeviceMappe
IPage<FireDeviceDO> result = fireDeviceMapper.pageByPointId(iPage, params);
return PageHelper.pageToResponse(result, result.getRecords());
}
@Override
public FireDeviceDO getInfoByCode(String fireDeviceCode) {
QueryWrapper<FireDeviceDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("fire_device_code", fireDeviceCode);
return fireDeviceMapper.selectOne(queryWrapper);
}
}

7
web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FirePointRepositoryImpl.java
View File

@ -106,6 +106,13 @@ public class FirePointRepositoryImpl extends BaseRepositoryImpl<FirePointMapper,
return firePointMapper.selectCount(queryWrapper) > 0;
}
@Override
public FirePointDO getInfoByCode(String firePointCode) {
QueryWrapper<FirePointDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("fire_point_code", firePointCode);
return firePointMapper.selectOne(queryWrapper);
}
@Override
public FirePointDO getInfoById(Long id) {
return firePointMapper.getInfoById(id);

7
web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireRegionRepositoryImpl.java
View File

@ -71,6 +71,13 @@ public class FireRegionRepositoryImpl extends BaseRepositoryImpl<FireRegionMappe
return fireRegionMapper.selectCount(queryWrapper) > 0;
}
@Override
public FireRegionDO getInfoByfireRefionCode(String fireRegionCode) {
QueryWrapper<FireRegionDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("fire_region_code", fireRegionCode);
return fireRegionMapper.selectOne(queryWrapper);
}
@Override
public Long getFireRegionCount() {
Map<String, Object> params = new HashMap<>();