medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwApplicationController.java
@@ -1,5 +1,6 @@ package com.sinata.web.controller.applet; import com.alibaba.fastjson2.JSONObject; import com.sinata.common.core.domain.R; import com.sinata.common.core.redis.RedisCache; import com.sinata.system.domain.MwApplication; @@ -39,7 +40,7 @@ @ApiOperation("提交入驻申请") @PostMapping("/set") public R pageList(@Valid @RequestBody MwApplication mwApplication) { log.error("提交入驻申请入参：{}", mwApplication); log.debug("提交入驻申请入参：{}", JSONObject.toJSONString(mwApplication)); String string = redisCache.getCacheObject(mwApplication.getPhone()).toString(); if (!mwApplication.getCode().equals(string)){ return R.fail("验证码错误，请重试"); medicalWaste-system/src/main/java/com/sinata/system/domain/query/KeyWordQuery.java
@@ -18,4 +18,7 @@ @ApiModelProperty("关键字") private String keyword; @ApiModelProperty("字典类型") private String dictType; } medicalWaste-system/src/main/java/com/sinata/system/domain/query/MwMonitorDeviceQuery.java
@@ -25,4 +25,7 @@ @ApiModelProperty("设备状态 1：在线 0：离线") private Integer status; @ApiModelProperty("监控设备编号") private String deviceNumber; } medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwProtectionTaskVO.java
@@ -50,4 +50,7 @@ @ApiModelProperty(value = "作业时间") private Date createTime; @ApiModelProperty("附件信息") private String nickName; } medicalWaste-system/src/main/java/com/sinata/system/service/biz/StaticsService.java
@@ -379,7 +379,7 @@ //处置 for (SysDictData sysDictData : wasteTypeList) { BigDecimal totalWeight = disposaledList.stream().filter(item -> item.getWasteType().equals(sysDictData.getDictCode()) && finalSdf.format(item.getReceiveTime()).equals(date)).map(MwDisposalRecordReportVO::getWeight) finalSdf.format(item.getDisposalTime()).equals(date)).map(MwDisposalRecordReportVO::getWeight) .reduce(BigDecimal.ZERO, BigDecimal::add); departmentReportItemVO.getData().add(totalWeight); } @@ -505,7 +505,7 @@ } for (SysDictData sysDictData : wasteTypeList) { BigDecimal weight = checkoutRecordList.stream().filter(e -> e.getWasteType().equals(sysDictData.getDictCode()) && finalSdf.format(e.getCollectTime()).equals(date)).map(MwCollectRecordVO::getWeight).reduce(BigDecimal.ZERO, BigDecimal::add); finalSdf.format(e.getCheckoutTime()).equals(date)).map(MwCollectRecordVO::getWeight).reduce(BigDecimal.ZERO, BigDecimal::add); departmentReportItemVO.getData().add(weight); } for (SysDictData sysDictData : wasteTypeList) { medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwApplicationServiceImpl.java
@@ -90,5 +90,6 @@ if (Objects.nonNull(mwApplication.getDepartmentId())) { mwApplication.setRegion(sysDepartmentService.getRegionName(sysDepartmentService.getById(mwApplication.getDepartmentId()))); } save(mwApplication); } } medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMonitorDeviceServiceImpl.java
@@ -20,6 +20,7 @@ import java.util.List; import java.util.Objects; import java.util.stream.Collectors; /** * <p> @@ -111,9 +112,10 @@ return PageDTO.empty(0L, 0L); } Page<MwMonitorDeviceVO> page = baseMapper.pageMonitorPage(new Page<>(query.getPageCurr(), query.getPageSize()), query.getStatus(), treeCode, deviceList); page.getRecords().stream().filter(item -> deviceList.contains(item.getDeviceNumber())).peek(item -> { List<MwMonitorDeviceVO> records = page.getRecords(); records = records.stream().filter(item -> deviceList.contains(item.getDeviceNumber())).peek(item -> { item.setStatus(1); }); }).collect(Collectors.toList()); return PageDTO.of(page); }
@@ -19,8 +19,11 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; import java.util.function.Function; import java.util.stream.Collectors; /** @@ -80,18 +83,20 @@ mwWarningConfigVO = BeanUtil.copyProperties(mwWarningConfig, MwWarningConfigVO.class); List<MwWarningConfigItem> mwWarningConfigItems = mwWarningConfigItemService.lambdaQuery().eq(MwWarningConfigItem::getConfigId, mwWarningConfig.getId()).list(); if (type.equals(WarningConfigTypeEnum.MEDICAL_WASTE.getCode())) { mwWarningConfigVO.setWarningConfigItemList(BeanUtil.copyToList(mwWarningConfigItems, MwWarningConfigItemVO.class)); if (CollUtils.isEmpty(mwWarningConfigItems)) { List<SysDictDataVO> sysDictDataVOS = sysDictDataService.medicalWasteTypeList(); Map<Long, MwWarningConfigItemVO> configItemMap = new HashMap<>(); if (CollUtils.isNotEmpty(mwWarningConfigItems)) { List<MwWarningConfigItemVO> mwWarningConfigItemVOS = BeanUtil.copyToList(mwWarningConfigItems, MwWarningConfigItemVO.class); configItemMap = mwWarningConfigItemVOS.stream().collect(Collectors.toMap(MwWarningConfigItemVO::getWasteType, Function.identity())); } Map<Long, MwWarningConfigItemVO> finalConfigItemMap = configItemMap; List<MwWarningConfigItemVO> res = sysDictDataVOS.stream().map(item -> { MwWarningConfigItemVO vo = new MwWarningConfigItemVO(); vo.setWasteType(item.getDictCode()); vo.setWasteTypeStr(item.getDictLabel()); return vo; MwWarningConfigItemVO config = finalConfigItemMap.getOrDefault(item.getDictCode(), new MwWarningConfigItemVO()); config.setWasteType(item.getDictCode()); config.setWasteTypeStr(item.getDictLabel()); return config; }).collect(Collectors.toList()); mwWarningConfigVO.setWarningConfigItemList(res); } } if (type.equals(WarningConfigTypeEnum.STAGING_ROOM_CAPACITY.getCode())) { mwWarningConfigVO.setWarningConfigItemList(BeanUtil.copyToList(mwWarningConfigItems, MwWarningConfigItemVO.class)); medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDepartmentServiceImpl.java
@@ -14,7 +14,6 @@ import com.sinata.system.domain.MwApplication; import com.sinata.system.domain.SysDepartment; import com.sinata.system.domain.SysDepartmentInfo; import com.sinata.system.domain.SysUserDepartment; import com.sinata.system.domain.dto.DisposalUnitDTO; import com.sinata.system.domain.dto.MedicalInstitutionDTO; import com.sinata.system.domain.dto.RegulatoryUnitDTO; @@ -26,6 +25,7 @@ import com.sinata.system.domain.vo.SysDepartmentVO; import com.sinata.system.enums.DepartmentEnum; import com.sinata.system.mapper.SysDepartmentMapper; import com.sinata.system.service.ISysUserService; import com.sinata.system.service.SysDepartmentInfoService; import com.sinata.system.service.SysDepartmentService; import com.sinata.system.service.SysUserDepartmentService; @@ -60,6 +60,7 @@ private final SysUserDepartmentService sysUserDepartmentService; private final RedisTemplate<Object, Object> redisTemplate; private final SysDepartmentInfoService sysDepartmentInfoService; private final ISysUserService sysUserService; /** * 获取区域树 * @return @@ -420,9 +421,9 @@ .orderByDesc(SysDepartment::getCreateTime) .list(); List<Long> departmentIds = sysDepartmentList.stream().map(SysDepartment::getId).collect(Collectors.toList()); Long count = sysUserDepartmentService.lambdaQuery().in(SysUserDepartment::getDepartmentId, departmentIds).count(); Long count = sysUserService.lambdaQuery().in(SysUser::getDepartmentId, departmentIds).count(); if (count > 0) { throw new ServiceException("该区域已存在用户，无法删除"); throw new ServiceException("该区域已关联用户，无法删除"); } removeById(id); } @@ -595,9 +596,9 @@ */ @Override public void deleteMedical(Long id) { Long count = sysUserDepartmentService.lambdaQuery().eq(SysUserDepartment::getDepartmentId, id).count(); Long count = sysUserService.lambdaQuery().eq(SysUser::getDepartmentId, id).count(); if (count > 0) { throw new ServiceException("该医疗机构已存在用户，无法删除"); throw new ServiceException("该医疗机构已关联用户，无法删除"); } removeById(id); } @@ -717,9 +718,9 @@ @Override public void deleteDisposalUnit(Long id) { Long count = sysUserDepartmentService.lambdaQuery().eq(SysUserDepartment::getDepartmentId, id).count(); Long count = sysUserService.lambdaQuery().eq(SysUser::getDepartmentId, id).count(); if (count > 0) { throw new ServiceException("该处置单位构已存在用户，无法删除"); throw new ServiceException("该处置单位构已关联用户，无法删除"); } removeById(id); } @@ -845,9 +846,9 @@ */ @Override public void deleteRegulatoryUnit(Long id) { Long count = sysUserDepartmentService.lambdaQuery().eq(SysUserDepartment::getDepartmentId, id).count(); Long count = sysUserService.lambdaQuery().eq(SysUser::getDepartmentId, id).count(); if (count > 0) { throw new ServiceException("该监管单位构已存在用户，无法删除"); throw new ServiceException("该监管单位构已关联用户，无法删除"); } removeById(id); } medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDictDataServiceImpl.java
@@ -130,7 +130,10 @@ @Override public PageDTO<SysDictDataVO> pageList(KeyWordQuery query) { Page<SysDictData> result = this.lambdaQuery().like(StringUtils.isNotBlank(query.getKeyword()), SysDictData::getDictLabel, query.getKeyword()).page(new Page<>(query.getPageCurr(), query.getPageSize())); Page<SysDictData> result = this.lambdaQuery() .like(StringUtils.isNotBlank(query.getKeyword()), SysDictData::getDictLabel, query.getKeyword()) .eq(StringUtils.isNotBlank(query.getDictType()), SysDictData::getDictType, query.getDictType()) .page(new Page<>(query.getPageCurr(), query.getPageSize())); List<String> dictTypeList = result.getRecords().stream().map(SysDictData::getDictType).distinct().collect(Collectors.toList()); if (CollUtils.isNotEmpty(dictTypeList)) { PageDTO<SysDictDataVO> sysDictDataVOPageDTO = PageDTO.of(result, SysDictDataVO.class); medicalWaste-system/src/main/resources/mapper/system/MwBusinessDeviceMapper.xml
@@ -55,6 +55,7 @@ AND MBD.DEVICE_STATUS = #{query.deviceStatus} </if> </where> ORDER BY MBD.CREATE_TIME DESC </select> </mapper> medicalWaste-system/src/main/resources/mapper/system/MwMonitorDeviceMapper.xml
@@ -46,6 +46,9 @@ <if test="query.deviceName!=null and query.deviceName !=''"> AND MMD.DEVICE_NAME LIKE CONCAT('%',#{query.deviceName},'%') </if> <if test="query.deviceNumber!=null and query.deviceNumber !=''"> AND MMD.DEVICE_NUMBER LIKE CONCAT('%',#{deviceNumber},'%') </if> </where> ORDER BY MMD.CREATE_TIME DESC </select> medicalWaste-system/src/main/resources/mapper/system/MwProtectionTaskMapper.xml
@@ -37,10 +37,12 @@ MPT.CREATE_TIME, SD.DEPARTMENT_NAME, WM_CONCAT(MA.FILE_NAME) AS fileName, MPT.RELATION MPT.RELATION, SU.NICK_NAME FROM MW_PROTECTION_TASK MPT LEFT JOIN SYS_DEPARTMENT SD ON MPT.DEPARTMENT_ID = SD.ID LEFT JOIN (SELECT * FROM MW_ATTACHMENT WHERE "TYPE" = 2) MA ON MA.TARGET_ID = MPT.ID LEFT JOIN SYS_USER SU ON SU.USER_ID = MPT.CREATE_BY <where> MPT.DEL_FLAG = 0 <if test="treeCode != null and treeCode != ''"> medicalWaste-system/src/main/resources/mapper/system/MwRegulatoryRecordMapper.xml
@@ -51,6 +51,7 @@ AND MRR.CHECK_DATE BETWEEN #{query.startTime} AND #{query.endTime} </if> </where> ORDER BY MRR.CREATE_TIME DESC </select> </mapper> medicalWaste-system/src/main/resources/mapper/system/MwTransitRouteMapper.xml
@@ -41,6 +41,7 @@ AND SD.TREE_CODE LIKE CONCAT(#{treeCode}, '%') </if> </where> ORDER BY MTR.CREATE_TIME DESC </select> <select id="detail" resultType="com.sinata.system.domain.vo.MwTransitRouteVO"> SELECT MTR.ID,
