Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/base/controller/ClassroomController.java

@@ -0,0 +1,45 @@
+package com.xjrsoft.module.base.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.xjrsoft.common.exception.MyException;
+import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.module.base.dto.BaseClassroomChangeStatusDto;
+import com.xjrsoft.module.base.entity.BaseClassroom;
+import com.xjrsoft.module.base.service.IBaseClassroomService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+* @title: 场所管理
+* @Author dzx
+* @Date: 2024年3月28日
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/classroom")
+@Api(value = "/classroom",tags = "场所管理")
+@AllArgsConstructor
+public class ClassroomController {
+    private final IBaseClassroomService baseClassroomService;
+
+
+    @PostMapping(value = "/change-status")
+    @ApiOperation(value="修改状态")
+    @SaCheckPermission("officebuild:detail")
+    public RT<Boolean> changeStatus(@Valid @RequestBody BaseClassroomChangeStatusDto dto) throws Exception {
+        BaseClassroom classroom = baseClassroomService.getById(dto.getId());
+        if(classroom == null){
+            throw new MyException("未能找到场所信息");
+        }
+        classroom.setStatus(dto.getStatus());
+        baseClassroomService.updateById(classroom);
+        return RT.ok(true);
+    }
+}

src/main/java/com/xjrsoft/module/base/controller/OfficeBuildController.java

@@ -0,0 +1,45 @@
+package com.xjrsoft.module.base.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.xjrsoft.common.exception.MyException;
+import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.module.base.dto.BaseOfficeBuildChangeStatusDto;
+import com.xjrsoft.module.base.entity.BaseOfficeBuild;
+import com.xjrsoft.module.base.service.IBaseOfficeBuildService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+* @title: 区域楼栋管理
+* @Author dzx
+* @Date: 2024年3月28日
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/officebuild")
+@Api(value = "/officebuild",tags = "区域楼栋管理")
+@AllArgsConstructor
+public class OfficeBuildController {
+    private final IBaseOfficeBuildService baseOfficeBuildService;
+
+
+    @PostMapping(value = "/change-status")
+    @ApiOperation(value="修改状态")
+    @SaCheckPermission("officebuild:detail")
+    public RT<Boolean> changeStatus(@Valid @RequestBody BaseOfficeBuildChangeStatusDto dto) throws Exception {
+        BaseOfficeBuild officeBuild = baseOfficeBuildService.getById(dto.getId());
+        if(officeBuild == null){
+            throw new MyException("未能找到楼栋信息");
+        }
+        officeBuild.setStatus(dto.getStatus());
+        baseOfficeBuildService.updateById(officeBuild);
+        return RT.ok(true);
+    }
+}

src/main/java/com/xjrsoft/module/base/dto/BaseClassroomChangeStatusDto.java

@@ -0,0 +1,21 @@
+package com.xjrsoft.module.base.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author dzx
+ * @date 2024/3/28
+ */
+@Data
+public class BaseClassroomChangeStatusDto implements Serializable {
+
+    @ApiModelProperty("主键编号")
+    private Long id;
+
+
+    @ApiModelProperty("状态（1:可用 0:停用）")
+    private Integer status;
+}

src/main/java/com/xjrsoft/module/base/dto/BaseOfficeBuildChangeStatusDto.java

@@ -0,0 +1,21 @@
+package com.xjrsoft.module.base.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author dzx
+ * @date 2024/3/28
+ */
+@Data
+public class BaseOfficeBuildChangeStatusDto implements Serializable {
+
+    @ApiModelProperty("主键编号")
+    private Long id;
+
+
+    @ApiModelProperty("状态（1:可用 0:停用）")
+    private Integer status;
+}

src/main/java/com/xjrsoft/module/base/mapper/BaseClassroomMapper.java

@@ -1,6 +1,7 @@
 package com.xjrsoft.module.base.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
 import com.xjrsoft.module.base.entity.BaseClassroom;
 import com.xjrsoft.module.schedule.vo.ClassroomJianyuekbVo;
 import org.apache.ibatis.annotations.Mapper;
@@ -16,6 +17,6 @@ import java.util.List;
  * @since 2024年1月12日
  */
 @Mapper
-public interface BaseClassroomMapper extends BaseMapper<BaseClassroom> {
+public interface BaseClassroomMapper extends BaseMapper<BaseClassroom>, MPJBaseMapper<BaseClassroom> {
     List<ClassroomJianyuekbVo> getJianyueList();
 }

src/main/java/com/xjrsoft/module/base/service/IBaseClassroomService.java

@@ -0,0 +1,16 @@
+package com.xjrsoft.module.base.service;
+
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.base.entity.BaseClassroom;
+
+/**
+ * <p>
+ * 学期表 服务类
+ * </p>
+ *
+ * @author baomidou
+ * @since 2023-09-02 04:52:58
+ */
+public interface IBaseClassroomService extends MPJBaseService<BaseClassroom> {
+
+}

src/main/java/com/xjrsoft/module/base/service/IBaseOfficeBuildService.java

@@ -0,0 +1,16 @@
+package com.xjrsoft.module.base.service;
+
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.base.entity.BaseOfficeBuild;
+
+/**
+ * <p>
+ * 学期表 服务类
+ * </p>
+ *
+ * @author baomidou
+ * @since 2023-09-02 04:52:58
+ */
+public interface IBaseOfficeBuildService extends MPJBaseService<BaseOfficeBuild> {
+
+}

src/main/java/com/xjrsoft/module/base/service/impl/BaseClassroomServiceImpl.java

@@ -0,0 +1,19 @@
+package com.xjrsoft.module.base.service.impl;
+
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.base.entity.BaseClassroom;
+import com.xjrsoft.module.base.mapper.BaseClassroomMapper;
+import com.xjrsoft.module.base.service.IBaseClassroomService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+/**
+* @title: 寝室
+* @Author dzx
+* @Date: 2023-12-27
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class BaseClassroomServiceImpl extends MPJBaseServiceImpl<BaseClassroomMapper, BaseClassroom> implements IBaseClassroomService {
+}

src/main/java/com/xjrsoft/module/base/service/impl/BaseOfficeBuildServiceImpl.java

@@ -0,0 +1,19 @@
+package com.xjrsoft.module.base.service.impl;
+
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.base.entity.BaseOfficeBuild;
+import com.xjrsoft.module.base.mapper.BaseOfficeBuildMapper;
+import com.xjrsoft.module.base.service.IBaseOfficeBuildService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+/**
+* @title: 寝室
+* @Author dzx
+* @Date: 2023-12-27
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class BaseOfficeBuildServiceImpl extends MPJBaseServiceImpl<BaseOfficeBuildMapper, BaseOfficeBuild> implements IBaseOfficeBuildService {
+}