From 304ec22a4522859062db645f4e383aeb8c42fedf Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 21 二月 2025 15:51:26 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/boymi/YiFeiNN
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppLoginController.java | 53 +++++++++++++++++++-------
medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCollectRecordController.java | 2
medicalWaste-system/src/main/resources/mapper/system/MwCollectRecordMapper.xml | 25 ++++++------
3 files changed, 52 insertions(+), 28 deletions(-)
diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppLoginController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppLoginController.java
index 138ad68..69cfbf7 100644
--- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppLoginController.java
+++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppLoginController.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sinata.common.constant.Constants;
import com.sinata.common.core.domain.AjaxResult;
@@ -139,33 +140,55 @@
* @param loginBody 登录信息
* @return 结果
*/
+// @PostMapping("/login")
+// @ApiOperation("验证码登录")
+// public AjaxResult login(@RequestBody LoginBody loginBody)
+// {
+// AjaxResult ajax = AjaxResult.success();
+// // 生成令牌
+// LoginUser loginUser = loginService.login1(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
+// loginBody.getUuid());
+// ajax.put(Constants.TOKEN, tokenService.createToken(loginUser));
+// // List<SysRole> roles = loginUser.getUser().getRoles();
+// // if (CollectionUtils.isEmpty(roles)) {
+// // return AjaxResult.error("请关联角色!");
+// // }
+
+// List<SysMenu> menus = roleService.roleInfoFromUserId(loginUser.getUserId());
+// String string = redisCache.getCacheObject(loginBody.getUsername()).toString();
+// if (StringUtils.isBlank(string)) {
+// return AjaxResult.error("验证码已失效");
+// }
+// if (!loginBody.getCode().equals(string)){
+// return AjaxResult.error("验证码错误，请重试");
+// }
+// // ajax.put("menus", menus);
+// ajax.put("userInfo", loginUser);
+// return ajax;
+// }
+
@PostMapping("/login")
- @ApiOperation("验证码登录")
+ @ApiOperation("管理后台登录")
public AjaxResult login(@RequestBody LoginBody loginBody)
{
AjaxResult ajax = AjaxResult.success();
// 生成令牌
- LoginUser loginUser = loginService.login1(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
+ LoginUser loginUser = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
loginBody.getUuid());
ajax.put(Constants.TOKEN, tokenService.createToken(loginUser));
-// List<SysRole> roles = loginUser.getUser().getRoles();
-// if (CollectionUtils.isEmpty(roles)) {
-// return AjaxResult.error("请关联角色!");
-// }
-
+ List<SysRole> roles = loginUser.getUser().getRoles();
+ if (CollectionUtils.isEmpty(roles)) {
+ return AjaxResult.error("请关联角色!");
+ }
List<SysMenu> menus = roleService.roleInfoFromUserId(loginUser.getUserId());
- String string = redisCache.getCacheObject(loginBody.getUsername()).toString();
- if (StringUtils.isBlank(string)) {
- return AjaxResult.error("验证码已失效");
- }
- if (!loginBody.getCode().equals(string)){
- return AjaxResult.error("验证码错误，请重试");
- }
-// ajax.put("menus", menus);
+ Set<Long> permissions = roleService.getMenuIdSets(loginUser.getUserId());
+ ajax.put("menus", menus);
ajax.put("userInfo", loginUser);
+ ajax.put("permissions", permissions);
return ajax;
}
+
@PostMapping("/get/department")
@ApiOperation("登录后获取部门")
public R<SysDepartment> department()
diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCollectRecordController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCollectRecordController.java
index de64123..ce874a1 100644
--- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCollectRecordController.java
+++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCollectRecordController.java
@@ -265,7 +265,7 @@
return R.ok();
}
MwTransitCar byId = carService.getById(one.getCarId());
- SysUser one1 = userService.lambdaQuery().eq(SysUser::getCarId, byId.getId()).one();
+ SysUser one1 = userService.lambdaQuery().eq(SysUser::getCarId, byId.getId()).last("limit 1").one();
CarDto carDto = new CarDto();
carDto.setLicensePlateNumber(byId.getLicensePlateNumber());
carDto.setUserName(one1.getUserName());
diff --git a/medicalWaste-system/src/main/resources/mapper/system/MwCollectRecordMapper.xml b/medicalWaste-system/src/main/resources/mapper/system/MwCollectRecordMapper.xml
index 54d7b9e..554816c 100644
--- a/medicalWaste-system/src/main/resources/mapper/system/MwCollectRecordMapper.xml
+++ b/medicalWaste-system/src/main/resources/mapper/system/MwCollectRecordMapper.xml
@@ -302,21 +302,22 @@
</select>
<select id="carGroup" resultType="com.sinata.system.domain.dto.CollectCarTotalUpDto">
- SELECT t3.DEPARTMENT_ID as hospitalId,
- t3.HOSPITAL_NAME as hospitalName,
- COUNT(DISTINCT t3.BOX_NUMBER ) as boxNum,
- COUNT(t3.ID) as num ,
- WASTE_TYPE_STR as wasteTypeStr,
- sum(T3.WEIGHT) as weight
- FROM MEDICAL_WASTE.MW_COLLECT_RECORD t3
+ SELECT
+ t3.DEPARTMENT_ID as hospitalId,
+ MAX(t3.HOSPITAL_NAME) as hospitalName,
+ COUNT(DISTINCT t3.BOX_NUMBER) as boxNum,
+ COUNT(t3.ID) as num,
+ SUM(DISTINCT t3.BOX_ID) as boxCount, -- 新增箱数统计
+ SUM(t3.WEIGHT) as weight
+ FROM MEDICAL_WASTE.MW_COLLECT_RECORD t3
<where>
- t3.CAR_ID = #{carId}
+ t3.STATUS = 2 -- 增加状态过滤
+ AND t3.CAR_ID = #{carId}
<if test="name != null and name != ''">
- AND t3.HOSPITAL_NAME LIKE CONCAT(#{name},'%')
- </if>
+ AND t3.HOSPITAL_NAME LIKE CONCAT('%',#{name},'%')
+ </if>
</where>
- GROUP BY t3.HOSPITAL_NAME
-
+ GROUP BY t3.DEPARTMENT_ID
</select>
<select id="getRegulationReportList" resultType="com.sinata.system.domain.vo.MwCollectRecordVO">
SELECT MCR.ID,
--
Gitblit v1.7.1