From ae7f04be9321ddbe17c46fae8ab05d34e7493f9f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 二月 2025 13:40:06 +0800
Subject: [PATCH] 管理后台bug修改
---
medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDepartmentServiceImpl.java | 19 +++++----
medicalWaste-system/src/main/java/com/sinata/system/service/biz/StaticsService.java | 4 +-
medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwApplicationServiceImpl.java | 1
medicalWaste-system/src/main/resources/mapper/system/MwTransitRouteMapper.xml | 1
medicalWaste-system/src/main/java/com/sinata/system/domain/query/MwMonitorDeviceQuery.java | 3 +
medicalWaste-system/src/main/resources/mapper/system/MwProtectionTaskMapper.xml | 4 +
medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMonitorDeviceServiceImpl.java | 6 ++-
medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDictDataServiceImpl.java | 5 ++
medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwProtectionTaskVO.java | 3 +
medicalWaste-system/src/main/resources/mapper/system/MwRegulatoryRecordMapper.xml | 1
medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwApplicationController.java | 3 +
medicalWaste-system/src/main/resources/mapper/system/MwMonitorDeviceMapper.xml | 3 +
medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwWarningConfigServiceImpl.java | 27 ++++++++-----
medicalWaste-system/src/main/java/com/sinata/system/domain/query/KeyWordQuery.java | 3 +
medicalWaste-system/src/main/resources/mapper/system/MwBusinessDeviceMapper.xml | 1
15 files changed, 57 insertions(+), 27 deletions(-)
diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwApplicationController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwApplicationController.java
index f2a2068..28b74c6 100644
--- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwApplicationController.java
+++ b/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("验证码错误，请重试");
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/domain/query/KeyWordQuery.java b/medicalWaste-system/src/main/java/com/sinata/system/domain/query/KeyWordQuery.java
index 5efc337..8256437 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/domain/query/KeyWordQuery.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/domain/query/KeyWordQuery.java
@@ -18,4 +18,7 @@
@ApiModelProperty("关键字")
private String keyword;
+
+ @ApiModelProperty("字典类型")
+ private String dictType;
}
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/domain/query/MwMonitorDeviceQuery.java b/medicalWaste-system/src/main/java/com/sinata/system/domain/query/MwMonitorDeviceQuery.java
index 06b3d63..c25fdff 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/domain/query/MwMonitorDeviceQuery.java
+++ b/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;
+
}
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwProtectionTaskVO.java b/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwProtectionTaskVO.java
index 698f146..17f19a1 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwProtectionTaskVO.java
+++ b/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;
}
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/biz/StaticsService.java b/medicalWaste-system/src/main/java/com/sinata/system/service/biz/StaticsService.java
index a088eab..8faca33 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/biz/StaticsService.java
+++ b/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) {
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwApplicationServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwApplicationServiceImpl.java
index 649dc5d..5c44070 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwApplicationServiceImpl.java
+++ b/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);
}
}
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMonitorDeviceServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMonitorDeviceServiceImpl.java
index bb75cd1..d5760fa 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMonitorDeviceServiceImpl.java
+++ b/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);
}
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwWarningConfigServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwWarningConfigServiceImpl.java
index 88910fb..f80de7c 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwWarningConfigServiceImpl.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwWarningConfigServiceImpl.java
@@ -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();
- List<MwWarningConfigItemVO> res = sysDictDataVOS.stream().map(item -> {
- MwWarningConfigItemVO vo = new MwWarningConfigItemVO();
- vo.setWasteType(item.getDictCode());
- vo.setWasteTypeStr(item.getDictLabel());
- return vo;
- }).collect(Collectors.toList());
- mwWarningConfigVO.setWarningConfigItemList(res);
+ 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 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));
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDepartmentServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDepartmentServiceImpl.java
index 9db5211..3ce68a4 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDepartmentServiceImpl.java
+++ b/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);
}
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDictDataServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDictDataServiceImpl.java
index adc9969..81858aa 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDictDataServiceImpl.java
+++ b/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);
diff --git a/medicalWaste-system/src/main/resources/mapper/system/MwBusinessDeviceMapper.xml b/medicalWaste-system/src/main/resources/mapper/system/MwBusinessDeviceMapper.xml
index e559ce3..0148585 100644
--- a/medicalWaste-system/src/main/resources/mapper/system/MwBusinessDeviceMapper.xml
+++ b/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>
diff --git a/medicalWaste-system/src/main/resources/mapper/system/MwMonitorDeviceMapper.xml b/medicalWaste-system/src/main/resources/mapper/system/MwMonitorDeviceMapper.xml
index 42b8606..687c80e 100644
--- a/medicalWaste-system/src/main/resources/mapper/system/MwMonitorDeviceMapper.xml
+++ b/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>
diff --git a/medicalWaste-system/src/main/resources/mapper/system/MwProtectionTaskMapper.xml b/medicalWaste-system/src/main/resources/mapper/system/MwProtectionTaskMapper.xml
index 5249a23..f2b8dfc 100644
--- a/medicalWaste-system/src/main/resources/mapper/system/MwProtectionTaskMapper.xml
+++ b/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 != ''">
diff --git a/medicalWaste-system/src/main/resources/mapper/system/MwRegulatoryRecordMapper.xml b/medicalWaste-system/src/main/resources/mapper/system/MwRegulatoryRecordMapper.xml
index e5361ff..3937fec 100644
--- a/medicalWaste-system/src/main/resources/mapper/system/MwRegulatoryRecordMapper.xml
+++ b/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>
diff --git a/medicalWaste-system/src/main/resources/mapper/system/MwTransitRouteMapper.xml b/medicalWaste-system/src/main/resources/mapper/system/MwTransitRouteMapper.xml
index 217761d..b17a65f 100644
--- a/medicalWaste-system/src/main/resources/mapper/system/MwTransitRouteMapper.xml
+++ b/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,
--
Gitblit v1.7.1