From fc68d7d91851abdf4a8f0c5444113376d982b1e1 Mon Sep 17 00:00:00 2001 From: YuNan <3194726156@qq.com> Date: Sun, 9 Mar 2025 17:20:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=96=E6=A0=A1=E8=80=81?= =?UTF-8?q?=E5=B8=88=E4=BD=8F=E5=AE=BF=E4=BF=A1=E6=81=AF=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CeesDormitoryInfoController.java | 27 ++++++++++---- .../contoller/CeesWaiTeacherController.java | 8 +++++ .../org/jeecg/modules/entity/CeesUser.java | 2 +- .../service/ICeesDormitoryInfoService.java | 4 +++ .../service/ICeesWaiTeacherService.java | 2 ++ .../impl/CeesDormitoryInfoServiceImpl.java | 36 +++++++++++++++++++ .../impl/CeesWaiTeacherServiceImpl.java | 15 +++++++- 7 files changed, 85 insertions(+), 9 deletions(-) diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/contoller/CeesDormitoryInfoController.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/contoller/CeesDormitoryInfoController.java index 9ddb2427..4ba56d31 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/contoller/CeesDormitoryInfoController.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/contoller/CeesDormitoryInfoController.java @@ -1,11 +1,14 @@ package org.jeecg.modules.contoller; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import net.sf.json.JSON; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; @@ -19,8 +22,9 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Arrays; +import java.util.List; - /** +/** * @Description: 宿舍信息表 * @Author: jeecg-boot * @Date: 2025-03-03 @@ -33,7 +37,7 @@ import java.util.Arrays; public class CeesDormitoryInfoController extends JeecgController { @Autowired private ICeesDormitoryInfoService ceesDormitoryInfoService; - + /** * 分页列表查询 * @@ -55,7 +59,7 @@ public class CeesDormitoryInfoController extends JeecgController pageList = ceesDormitoryInfoService.page(page, queryWrapper); return Result.OK(pageList); } - + /** * 添加 * @@ -69,7 +73,7 @@ public class CeesDormitoryInfoController extends JeecgController selectBySex(@RequestParam(name="sex",required=true) String sex) { + return ceesDormitoryInfoService.selectBySex(sex); + } /** * 通过id删除 * @@ -97,7 +110,7 @@ public class CeesDormitoryInfoController extends JeecgController { + Result selectBySex(String sex); } diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICeesWaiTeacherService.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICeesWaiTeacherService.java index 96205c52..497bd7f1 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICeesWaiTeacherService.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICeesWaiTeacherService.java @@ -2,6 +2,7 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.common.api.vo.Result; import org.jeecg.modules.entity.CeesWaiTeacher; /** @@ -12,4 +13,5 @@ import org.jeecg.modules.entity.CeesWaiTeacher; */ public interface ICeesWaiTeacherService extends IService { + Result updataDormitory(String id, String dormitory); } diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesDormitoryInfoServiceImpl.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesDormitoryInfoServiceImpl.java index a1f37d89..b776397b 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesDormitoryInfoServiceImpl.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesDormitoryInfoServiceImpl.java @@ -1,12 +1,21 @@ package org.jeecg.modules.service.impl; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.common.api.vo.Result; import org.jeecg.modules.entity.CeesDormitoryInfo; import org.jeecg.modules.mapper.CeesDormitoryInfoMapper; import org.jeecg.modules.service.ICeesDormitoryInfoService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.lang.reflect.Array; +import java.util.Arrays; +import java.util.List; + /** * @Description: 宿舍信息表 * @Author: jeecg-boot @@ -16,4 +25,31 @@ import org.springframework.stereotype.Service; @Service public class CeesDormitoryInfoServiceImpl extends ServiceImpl implements ICeesDormitoryInfoService { + @Autowired + private CeesDormitoryInfoMapper ceesDormitoryInfoMapper; + + @Override + public Result selectBySex(String sex) { + //todo: 未添加宿舍满员的情况和宿舍是否正常使用 + Integer type = Integer.parseInt(sex); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if (sex != null) { + wrapper.eq(CeesDormitoryInfo::getDormitoryType, type); + } + List list = ceesDormitoryInfoMapper.selectList(wrapper); + JSONArray resultArray = new JSONArray(); + for(CeesDormitoryInfo dorm :list){ + JSONObject resultData = new JSONObject(); + resultData.put("sysOrgCode", dorm.getSysOrgCode()); + resultData.put("dormitory", dorm.getDormitory()); + resultData.put("dormitoryType", dorm.getDormitoryType()); + resultData.put("dormitoryNum", dorm.getDormitoryNum()); + resultData.put("dormitoryStatus", dorm.getDormitoryStatus()); + resultArray.add(resultData); + } + // 将整个数组封装为最终结果 + Result result = new Result<>(); + result.setResult(resultArray); + return result; + } } diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesWaiTeacherServiceImpl.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesWaiTeacherServiceImpl.java index 09bf7e76..f32eae4e 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesWaiTeacherServiceImpl.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesWaiTeacherServiceImpl.java @@ -1,10 +1,13 @@ package org.jeecg.modules.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.common.api.vo.Result; import org.jeecg.modules.entity.CeesWaiTeacher; import org.jeecg.modules.mapper.CeesWaiTeacherMapper; import org.jeecg.modules.service.ICeesWaiTeacherService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** @@ -15,5 +18,15 @@ import org.springframework.stereotype.Service; */ @Service public class CeesWaiTeacherServiceImpl extends ServiceImpl implements ICeesWaiTeacherService { - + @Autowired + private CeesWaiTeacherMapper ceesWaiTeacherMapper; + @Override + public Result updataDormitory(String id, String dormitory) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); + wrapper.eq(CeesWaiTeacher::getUserId,id); + CeesWaiTeacher ceesWaiTeacher = ceesWaiTeacherMapper.selectOne(wrapper); + ceesWaiTeacher.setDormitory(dormitory); + int result = ceesWaiTeacherMapper.updateById(ceesWaiTeacher); + return Result.ok("更新成功"); + } }