添加校区管理功能

src/main/java/com/template/AutoCode.java

@@ -39,10 +39,10 @@ public class AutoCode {
         mpg.setGlobalConfig(gc);
 //2、设置数据源
         DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl("jdbc:mysql://192.168.161.221:3306/welcome?useUnicode=tru&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true&allowPublicKeyRetrieval=true&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai");
+        dsc.setUrl("jdbc:mysql://172.16.40.122:3306/welcome?useUnicode=tru&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true&allowPublicKeyRetrieval=true&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai");
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
-        dsc.setPassword("root");
+        dsc.setPassword("Chuanghai2024.");
         dsc.setDbType(DbType.MYSQL);
         mpg.setDataSource(dsc);
         //3、包的配置
@@ -56,7 +56,7 @@ public class AutoCode {
         mpg.setPackageInfo(pc);
         //4、策略配置
         StrategyConfig strategy = new StrategyConfig();
-        strategy.setInclude("welcome_dormitory"); // 设置要映射的表名
+        strategy.setInclude("welcome_school"); // 设置要映射的表名
         strategy.setNaming(NamingStrategy.underline_to_camel);//下划线转驼峰
         strategy.setColumnNaming(NamingStrategy.underline_to_camel);//下划线转驼峰
         strategy.setEntityLombokModel(true); // 自动lombok；

src/main/java/com/template/api/WelcomeBuildControllerAPI.java

@@ -37,10 +37,9 @@ public interface WelcomeBuildControllerAPI {
     @ApiOperation(value = "校区分组", notes = "校区分组", httpMethod = "GET")
     CommonResult schoolGroup();
 
-
     @GetMapping(value = "/buildGroup")
     @ApiOperation(value = "楼栋分组", notes = "楼栋分组", httpMethod = "GET")
-    CommonResult buildGroup(String schoolName);
+    CommonResult buildGroup(Integer schoolId);
 
 
     @PostMapping(value = "/importBuildExcel")

src/main/java/com/template/api/WelcomeSchoolControllerAPI.java

@@ -0,0 +1,31 @@
+package com.template.api;
+
+import com.template.model.pojo.WelcomeBuild;
+import com.template.model.pojo.WelcomeSchool;
+import com.template.model.result.CommonResult;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+@RequestMapping("/api/welcome-school")
+public interface WelcomeSchoolControllerAPI {
+
+    @PostMapping(value = "/saveSchool")
+    @ApiOperation(value = "添加校区", notes = "添加楼栋", httpMethod = "POST")
+    CommonResult saveSchool(@RequestBody WelcomeSchool WelcomeSchool);
+
+
+    @GetMapping(value = "/deleteSchool")
+    @ApiOperation(value = "删除校区", notes = "删除校区", httpMethod = "GET")
+    CommonResult deleteSchool(@RequestParam Integer schoolId);
+
+
+    @PostMapping(value = "/updateSchool")
+    @ApiOperation(value = "修改校区", notes = "修改校区", httpMethod = "POST")
+    CommonResult updateSchool(@RequestBody WelcomeSchool welcomeSchool);
+
+
+    @GetMapping(value = "/listSchool")
+    @ApiOperation(value = "查询校区", notes = "查询校区", httpMethod = "GET")
+    CommonResult listSchool(@RequestParam int currentPage, @RequestParam int pageCount);
+
+}

src/main/java/com/template/controller/WelcomeBuildController.java

@@ -110,7 +110,6 @@ public class WelcomeBuildController implements WelcomeBuildControllerAPI {
 
     @Override
     public CommonResult schoolGroup() {
-
         LambdaQueryWrapper<WelcomeBuild> wrapper=new LambdaQueryWrapper<>();
         wrapper.groupBy(WelcomeBuild::getSchool);
         List<WelcomeBuild> schoolGroup = welcomeBuildService.list(wrapper);
@@ -119,12 +118,8 @@ public class WelcomeBuildController implements WelcomeBuildControllerAPI {
     }
 
     @Override
-    public CommonResult buildGroup(String schoolName) {
-
-        LambdaQueryWrapper<WelcomeBuild> wrapper=new LambdaQueryWrapper<>();
-        wrapper.eq(ObjectUtils.isNotEmpty(schoolName),WelcomeBuild::getSchool,schoolName)
-                .groupBy(WelcomeBuild::getBuild);
-        List<WelcomeBuild> schoolGroup = welcomeBuildService.list(wrapper);
+    public CommonResult buildGroup(Integer schoolId) {
+        List<WelcomeBuild> schoolGroup = welcomeBuildService.buildGroup(schoolId);
 
         return CommonResult.ok(schoolGroup);
     }

src/main/java/com/template/controller/WelcomeDormitoryController.java

@@ -57,7 +57,7 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
     private WelcomeDormitoryService welcomeDormitoryService;
 
     @Autowired
-    private WelcomeStudentDormitoryService welcomeStudentDormitoryService;
+    private WelcomeBedService welcomeBedService;
 
     @Override
     public CommonResult saveDormitory(WelcomeDormitory welcomeDormitory) {
@@ -86,6 +86,7 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
     public CommonResult deleteDormitory(Integer dormitoryId) {
 
         welcomeDormitoryService.removeById(dormitoryId);
+        //        动态删除床位
 
         return CommonResult.ok();
     }
@@ -107,6 +108,8 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
 
         welcomeDormitoryService.updateById(welcomeDormitory);
 
+//        动态修改床位
+
         return CommonResult.ok();
     }
 
@@ -160,18 +163,18 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
         Integer bedNumber = welcomeDormitory.getBedNumber();
 
 //        查找哪些已经入住了
-        LambdaQueryWrapper<WelcomeStudentDormitory> wrapperStudentDormitory = new LambdaQueryWrapper<>();
-        wrapperStudentDormitory.eq(WelcomeStudentDormitory::getBuilding, buildName)
-                .eq(WelcomeStudentDormitory::getDormitory, dormitoryName);
-        List<WelcomeStudentDormitory> list1 = welcomeStudentDormitoryService.list(wrapperStudentDormitory);
+        LambdaQueryWrapper<WelcomeBed> wrapperBed = new LambdaQueryWrapper<>();
+        wrapperBed.eq(WelcomeBed::getBuild, buildName)
+                .eq(WelcomeBed::getDormitory, dormitoryName);
+        List<WelcomeBed> list1 = welcomeBedService.list(wrapperBed);
 
         ArrayList<Integer> bedNums = new ArrayList<>();
         for (int i = 1; i <= bedNumber; i++) {
             bedNums.add(i);
         }
 
-        for (WelcomeStudentDormitory welcomeStudentDormitory : list1) {
-            Integer bedNum = Integer.valueOf(welcomeStudentDormitory.getBedNum());
+        for (WelcomeBed welcomeBed : list1) {
+            Integer bedNum = welcomeBed.getNumber();
             bedNums.remove(bedNum);
         }
 

src/main/java/com/template/controller/WelcomeSchoolController.java

@@ -0,0 +1,51 @@
+package com.template.controller;
+
+
+import com.template.api.WelcomeSchoolControllerAPI;
+import com.template.model.pojo.WelcomeBuild;
+import com.template.model.pojo.WelcomeSchool;
+import com.template.model.result.CommonResult;
+import com.template.model.result.PageUtils;
+import com.template.services.WelcomeSchoolService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author ceshi
+ * @since 2025-06-19
+ */
+@RestController
+public class WelcomeSchoolController implements WelcomeSchoolControllerAPI {
+
+    @Autowired
+    WelcomeSchoolService welcomeSchoolService;
+
+
+    @Override
+    public CommonResult saveSchool(WelcomeSchool WelcomeSchool) {
+        return welcomeSchoolService.save(WelcomeSchool)?CommonResult.ok():CommonResult.fail();
+    }
+
+    @Override
+    public CommonResult deleteSchool(Integer schoolId) {
+        return welcomeSchoolService.removeById(schoolId)?CommonResult.ok():CommonResult.fail();
+    }
+
+    @Override
+    public CommonResult updateSchool(WelcomeSchool welcomeSchool) {
+        return welcomeSchoolService.updateById(welcomeSchool)?CommonResult.ok():CommonResult.fail();
+    }
+
+    @Override
+    public CommonResult listSchool(int currentPage, int pageCount) {
+        PageUtils<WelcomeSchool>pageUtils= welcomeSchoolService.listSchool(currentPage,pageCount);
+        return CommonResult.ok(pageUtils);
+    }
+}
+

src/main/java/com/template/mapper/WelcomeBuildMapper.java

@@ -18,7 +18,4 @@ import java.util.List;
 @Repository
 public interface WelcomeBuildMapper extends BaseMapper<WelcomeBuild> {
 
-    List<String> schoolGroup();
-
-    List<String> buildGroup(@Param("schoolName") String schoolName);
 }

src/main/java/com/template/mapper/WelcomeSchoolMapper.java

@@ -0,0 +1,18 @@
+package com.template.mapper;
+
+import com.template.model.pojo.WelcomeSchool;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ceshi
+ * @since 2025-06-19
+ */
+@Mapper
+public interface WelcomeSchoolMapper extends BaseMapper<WelcomeSchool> {
+
+}

src/main/java/com/template/model/pojo/WelcomeBuild.java

@@ -34,6 +34,9 @@ public class WelcomeBuild implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
+    @ApiModelProperty(value = "校区ID")
+    private String schoolId;
+
     @ApiModelProperty(value = "校区名称")
     private String school;
 

src/main/java/com/template/model/pojo/WelcomeSchool.java

@@ -0,0 +1,61 @@
+package com.template.model.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ceshi
+ * @since 2025-06-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="WelcomeSchool对象", description="")
+public class WelcomeSchool implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "校区名称")
+    private String school;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新时间")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    @ApiModelProperty(value = "创建人员")
+    @TableField(fill = FieldFill.INSERT)
+    private String createUser;
+
+    @ApiModelProperty(value = "更新人员")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateUser;
+
+    @ApiModelProperty(value = "逻辑删除 未删除：0；删除：1")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleted;
+
+
+}

src/main/java/com/template/services/WelcomeBuildService.java

@@ -26,11 +26,9 @@ public interface WelcomeBuildService extends IService<WelcomeBuild> {
 
     WelcomeBuild getManageById(String id);
 
-    List<String> schoolGroup();
-
-    List<String> buildGroup(String schoolName);
-
     PageUtils<WelcomeBuild> listBuild(int currentPage, int pageCount, String schoolName, String buildName, String sex);
 
     List<WelcomeBuild> listBuild( String schoolName, String buildName, String sex);
+
+    List<WelcomeBuild> buildGroup(Integer schoolId);
 }

src/main/java/com/template/services/WelcomeSchoolService.java

@@ -0,0 +1,18 @@
+package com.template.services;
+
+import com.template.model.pojo.WelcomeSchool;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.template.model.result.PageUtils;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ceshi
+ * @since 2025-06-19
+ */
+public interface WelcomeSchoolService extends IService<WelcomeSchool> {
+
+    PageUtils<WelcomeSchool> listSchool(int currentPage, int pageCount);
+}

src/main/java/com/template/services/impl/WelcomeBuildServiceImpl.java

@@ -64,17 +64,7 @@ public class WelcomeBuildServiceImpl extends ServiceImpl<WelcomeBuildMapper, Wel
         return result;
     }
 
-    @Override
-    public List<String> schoolGroup() {
-        List<String> result = welcomeBuildMapper.schoolGroup();
-        return result;
-    }
 
-    @Override
-    public List<String> buildGroup(String schoolName) {
-        List<String> result = welcomeBuildMapper.buildGroup(schoolName);
-        return result;
-    }
 
     @Override
     public PageUtils<WelcomeBuild> listBuild(int currentPage, int pageCount, String schoolName, String buildName, String sex) {
@@ -96,4 +86,14 @@ public class WelcomeBuildServiceImpl extends ServiceImpl<WelcomeBuildMapper, Wel
         List<WelcomeBuild> result = welcomeBuildMapper.selectList(queryWrapper);
         return result;
     }
+
+    @Override
+    public List<WelcomeBuild> buildGroup(Integer schoolId) {
+        LambdaQueryWrapper<WelcomeBuild> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ObjectUtils.isNotEmpty(schoolId),WelcomeBuild::getSchoolId,schoolId);
+        List<WelcomeBuild> result = welcomeBuildMapper.selectList(queryWrapper);
+        return result;
+    }
+
+
 }

src/main/java/com/template/services/impl/WelcomeSchoolServiceImpl.java

@@ -0,0 +1,33 @@
+package com.template.services.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.template.model.pojo.WelcomeSchool;
+import com.template.mapper.WelcomeSchoolMapper;
+import com.template.model.result.PageUtils;
+import com.template.services.WelcomeSchoolService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author ceshi
+ * @since 2025-06-19
+ */
+@Service
+public class WelcomeSchoolServiceImpl extends ServiceImpl<WelcomeSchoolMapper, WelcomeSchool> implements WelcomeSchoolService {
+
+    @Autowired
+    WelcomeSchoolMapper welcomeSchoolMapper;
+
+    @Override
+    public PageUtils<WelcomeSchool> listSchool(int currentPage, int pageCount) {
+        IPage<WelcomeSchool> result = welcomeSchoolMapper.selectPage(new Page<>(currentPage, pageCount), new QueryWrapper<>());
+        return new PageUtils<>(result);
+    }
+}

src/main/resources/mapper/template/WelcomeBuildMapper.xml

@@ -2,23 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.template.mapper.WelcomeBuildMapper">
 
-    <select id="schoolGroup" resultType="java.lang.String">
-        SELECT school
-        FROM `welcome_build`
-        WHERE deleted = 0
-        GROUP BY school
-    </select>
-
-    <select id="buildGroup" resultType="java.lang.String">
-        SELECT
-        build
-        FROM
-        `welcome_build`
-        WHERE
-        deleted = 0
-        <if test="schoolName != null and schoolName != ''">
-            AND school= #{schoolName}
-        </if>
-        GROUP BY build
-    </select>
 </mapper>

src/main/resources/mapper/template/WelcomeSchoolMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.template.mapper.WelcomeSchoolMapper">
+
+</mapper>