drone 测试

drone.sh

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+arrayWen=$(cat services.txt)
+#循环打包
+for var in ${arrayWen[@]};
+do
+    cd /drone/src/${var}
+    if test $var != "ruoyi-admin";then
+      mvn clean install
+      else
+        mvn clean package
+    fi
+
+done
+
+#创建veterans目录
+mkdir -p /app/build/student/
+#拷贝执行文件
+cp /drone/src/drone_run.sh /app/build/student/
+cp -r /drone/src/services.txt /app/build/student/services.txt
+
+#循环拷贝数据
+for var in ${arrayWen[@]};
+do
+    if test $var == "ruoyi-admin";then
+       #创建文件夹
+      mkdir -p /app/build/student/${var}
+      #拷贝jar到宿主机
+      cp -r /drone/src/${var}/target/*.jar /app/build/student/${var}/
+      #拷贝docker文件到宿主机
+      cp -r /drone/src/${var}/src/main/docker/* /app/build/student/${var}/
+      #拷贝docker构建脚本文件到宿主机
+      cp -r /drone/src/${var}/run.sh /app/build/student/${var}/
+    fi
+done

drone.yml

@@ -0,0 +1,44 @@
+kind: pipeline # 定义对象类型，还有secret和signature两种类型
+type: docker # 定义流水线类型，还有kubernetes、exec、ssh等类型
+name: stutent # 定义流水线名称
+
+steps: # 定义流水线执行步骤，这些步骤将顺序执行
+  - name: package # 流水线名称
+    image: maven:3-jdk-8 # 定义创建容器的Docker镜像
+    volumes: # 将容器内目录挂载到宿主机，仓库需要开启Trusted设置
+      - name: maven-cache
+        path: /root/.m2/ # 将maven下载依赖的目录挂载出来，防止重复下载
+      - name: maven-build
+        path: /app/build # 将应用打包好的Jar和执行脚本挂载出来
+    commands: # 定义在Docker容器中执行的shell命令
+      # - mvn clean package # 应用打包命令
+      - chmod +x drone.sh # 更改为可执行脚本
+      - ./drone.sh #执行jar包docker构建文件拷贝
+
+  - name: build-start
+    image: appleboy/drone-ssh # SSH工具镜像
+    settings:
+      host: 172.16.90.64 # 远程连接地址
+      username: root # 远程连接账号
+      password:
+        from_secret: 64_ssh_pw # 从Secret中读取SSH密码
+      port: 22 # 远程连接端口
+      command_timeout: 5m # 远程执行命令超时时间
+      script:
+        #进入宿主机构建目录
+        - cd /mydata/maven/build/stutent/
+        # 更改为可执行脚本
+        - chmod +x drone_run.sh
+        # 运行脚本打包应用镜像并运行
+        - ./drone_run.sh
+
+
+volumes: # 定义流水线挂载目录，用于共享数据
+  - name: maven-build
+    host:
+      # 容器的maven的repository
+      path: /mydata/maven/build
+  - name: maven-cache
+    host:
+      # 容器的maven配置
+      path: /mydata/maven/cache

drone_run.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+arrayWen=$(cat services.txt)
+
+#循环拷贝数据
+for var in ${arrayWen[@]};
+do
+    #进入宿主机构建目录
+    cd /mydata/maven/build/stutent/${var}/
+    if [ -f "run.sh" ];then
+      echo "脚本存在"
+      # 更改为可执行脚本
+      chmod +x run.sh
+      # 运行脚本打包应用镜像并运行
+      ./run.sh &
+      else
+      echo "脚本不存在"
+    fi
+done

pom.xml

@@ -30,6 +30,7 @@
         <poi.version>4.1.2</poi.version>
         <velocity.version>1.7</velocity.version>
         <jwt.version>0.9.1</jwt.version>
+        <log4j2.version>2.16.0</log4j2.version>
     </properties>
 
     <!-- 依赖声明 -->

ruoyi-admin/pom.xml

@@ -10,6 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
     <artifactId>student</artifactId>
+    <version>1.0.0</version>
 
     <description>
         web服务入口
@@ -17,7 +18,7 @@
     <properties>
         <docker.dockerHost>http://172.16.90.64:22375</docker.dockerHost>
         <docker.serviceId>DockerHub</docker.serviceId>
-        <docker.image.version>1.0</docker.image.version>
+        <docker.image.version>1.0.0</docker.image.version>
     </properties>
 
     <dependencies>

ruoyi-admin/run.sh

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+#定义应用的组名
+group_name='student'
+#定义应用名称
+app_name='student'
+#定义应用版本
+app_version='1.0.0'
+#容器端口
+app_in_port='8079'
+#宿主端口
+app_out_port='8079'
+#profile_active='prod'
+echo '----stop container----'
+docker stop ${app_name}
+echo '----rm container----'
+docker rm ${app_name}
+echo '----rm image----'
+docker rmi ${app_name}:${app_version}
+echo '----build image----'
+docker build -t ${app_name}:${app_version} .
+echo '----start container----'
+docker run -d --restart=always --network=host \
+-p ${app_out_port}:${app_in_port} -v /data/logs/${group_name}/${app_name}:/logs \
+--name ${app_name} ${app_name}:${app_version}

ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java

@@ -1,5 +1,6 @@
 package com.ruoyi;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@@ -10,12 +11,13 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
  * @author ruoyi
  */
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
+@Slf4j
 public class RuoYiApplication
 {
     public static void main(String[] args)
     {
         // System.setProperty("spring.devtools.restart.enabled", "false");
         SpringApplication.run(RuoYiApplication.class, args);
-        System.out.println("(♥◠‿◠)ﾉﾞ  贵州省林业学校新生信息管理系统启动成功   ლ(´ڡ`ლ)ﾞ");
+        log.info("(♥◠‿◠)ﾉﾞ  贵州省林业学校新生信息管理系统启动成功   ლ(´ڡ`ლ)ﾞ");
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/student/StuBaseInfoController.java

@@ -5,6 +5,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.bean.BeanUtils;
 import com.ruoyi.system.domain.StuBaseInfo;
@@ -60,7 +61,6 @@ public class StuBaseInfoController extends BaseController
     /**
      * 查询所有学生列表
      */
-    @PreAuthorize("@ss.hasPermi('student:base:list')")
     @GetMapping("/list")
     @ApiOperation(value = "所有学生列表")
     public TableDataInfo list(StuBaseInfo stuBaseInfo)
@@ -73,7 +73,6 @@ public class StuBaseInfoController extends BaseController
     /**
      * 查询所有学生列表
      */
-    @PreAuthorize("@ss.hasPermi('student:base:list')")
     @GetMapping("/myClassStudentList")
     @ApiOperation(value = "我班学生列表")
     public TableDataInfo myClassStudentList(StuBaseInfo stuBaseInfo)
@@ -89,7 +88,6 @@ public class StuBaseInfoController extends BaseController
     /**
      * 查询未报到的学生
      */
-    @PreAuthorize("@ss.hasPermi('student:base:list')")
     @GetMapping("/list0")
     @ApiOperation(value = "未报到的学生列表")
     public TableDataInfo list0(StuBaseInfo stuBaseInfo)
@@ -103,7 +101,6 @@ public class StuBaseInfoController extends BaseController
     /**
      * 查询已报到的学生
      */
-    @PreAuthorize("@ss.hasPermi('student:base:list')")
     @GetMapping("/list1")
     @ApiOperation(value = "已报到的学生列表")
     public TableDataInfo list1(StuBaseInfo stuBaseInfo)
@@ -117,7 +114,6 @@ public class StuBaseInfoController extends BaseController
     /**
      * 查询已缴费的学生
      */
-    @PreAuthorize("@ss.hasPermi('student:base:list')")
     @GetMapping("/list2")
     @ApiOperation(value = "已缴费的学生列表")
     public TableDataInfo list2(StuBaseInfo stuBaseInfo)
@@ -131,7 +127,6 @@ public class StuBaseInfoController extends BaseController
     /**
      * 查询已毕业的学生
      */
-    @PreAuthorize("@ss.hasPermi('student:base:list')")
     @GetMapping("/list9")
     @ApiOperation(value = "已毕业的学生列表")
     public TableDataInfo list9(StuBaseInfo stuBaseInfo)
@@ -145,7 +140,6 @@ public class StuBaseInfoController extends BaseController
     /**
      * 查询待评分的学生
      */
-    @PreAuthorize("@ss.hasPermi('student:base:list')")
     @GetMapping("/list99")
     @ApiOperation(value = "已毕业的学生列表")
     public TableDataInfo list99(StuBaseInfo stuBaseInfo)
@@ -160,7 +154,6 @@ public class StuBaseInfoController extends BaseController
     /**
      * 导出学生列表
      */
-    @PreAuthorize("@ss.hasPermi('student:base:export')")
     @Log(title = "学生管理", businessType = BusinessType.EXPORT)
     @ApiOperation(value = "导出")
     @GetMapping("/export")
@@ -174,7 +167,6 @@ public class StuBaseInfoController extends BaseController
     /**
      * 获取学生详细信息
      */
-    @PreAuthorize("@ss.hasPermi('student:base:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -184,7 +176,6 @@ public class StuBaseInfoController extends BaseController
     /**
      * 新增学生
      */
-    @PreAuthorize("@ss.hasPermi('student:base:add')")
     @Log(title = "学生管理", businessType = BusinessType.INSERT)
     @PostMapping
     @ApiOperation(value = "新增学生信息")
@@ -196,7 +187,6 @@ public class StuBaseInfoController extends BaseController
     /**
      * 修改学生
      */
-    @PreAuthorize("@ss.hasPermi('student:base:edit')")
     @Log(title = "学生管理", businessType = BusinessType.UPDATE)
     @PutMapping
     @ApiOperation(value = "修改学生信息")
@@ -208,20 +198,19 @@ public class StuBaseInfoController extends BaseController
     /**
      * 新生缴费学生
      */
-    @PreAuthorize("@ss.hasPermi('student:base:edit')")
     @Log(title = "学生管理", businessType = BusinessType.UPDATE)
     @PutMapping("/new-payment")
     @ApiOperation(value = "新生缴费学生")
     public AjaxResult edit2(@RequestBody StuBaseInfo stuBaseInfo)
     {
-        stuBaseInfo.setStudentStatus(2L);
+        stuBaseInfo.setStudentStatus(1L);
+        //stuBaseInfo.setPaymentDate(DateUtils.getNowDate());
         return toAjax(stuBaseInfoService.updateStuBaseInfo(stuBaseInfo));
     }
 
     /**
      * 老生缴费学生
      */
-    @PreAuthorize("@ss.hasPermi('student:base:edit')")
     @Log(title = "学生管理", businessType = BusinessType.UPDATE)
     @PutMapping("/old-payment")
     @ApiOperation(value = "老生缴费学生")
@@ -234,7 +223,6 @@ public class StuBaseInfoController extends BaseController
     /**
      * 删除学生
      */
-    @PreAuthorize("@ss.hasPermi('student:base:remove')")
     @Log(title = "学生管理", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     @ApiOperation("删除学生")
@@ -246,7 +234,6 @@ public class StuBaseInfoController extends BaseController
     /**
      * 学生退学
      */
-    @PreAuthorize("@ss.hasPermi('student:base:exit')")
     @Log(title = "学生管理", businessType = BusinessType.UPDATE)
     @PutMapping("/exit/{ids}")
     @ApiOperation("学生退学")
@@ -263,7 +250,6 @@ public class StuBaseInfoController extends BaseController
      * @throws Exception
      */
     @Log(title = "学生管理", businessType = BusinessType.IMPORT)
-    @PreAuthorize("@ss.hasPermi('student:base:import')")
     @PostMapping("/importData")
     @ApiOperation(value = "导入学生信息")
     public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
@@ -295,7 +281,6 @@ public class StuBaseInfoController extends BaseController
     }
 
     @Log(title = "学生管理", businessType = BusinessType.IMPORT)
-    @PreAuthorize("@ss.hasPermi('student:base:import')")
     @PostMapping("/importRegisterData")
     @ApiOperation(value = "报到登记信息导入")
     public AjaxResult importRegisterData(MultipartFile file, boolean updateSupport) throws Exception {
@@ -327,7 +312,6 @@ public class StuBaseInfoController extends BaseController
     }
 
     @Log(title = "学生管理", businessType = BusinessType.IMPORT)
-    @PreAuthorize("@ss.hasPermi('student:base:import')")
     @PostMapping("/importPaymentData")
     @ApiOperation(value = "缴费信息导入")
     public AjaxResult importPaymentData(MultipartFile file, boolean updateSupport) throws Exception {
@@ -359,7 +343,6 @@ public class StuBaseInfoController extends BaseController
     }
 
     @Log(title = "学生管理", businessType = BusinessType.IMPORT)
-    @PreAuthorize("@ss.hasPermi('student:base:import')")
     @PostMapping("/importManagerData")
     @ApiOperation(value = "学生管理信息导入")
     public AjaxResult importManagerData(MultipartFile file, boolean updateSupport) throws Exception {
@@ -386,7 +369,6 @@ public class StuBaseInfoController extends BaseController
     /**
      * 财务导出学生信息列表
      */
-    @PreAuthorize("@ss.hasPermi('student:base:export')")
     @Log(title = "学生管理", businessType = BusinessType.EXPORT)
     @ApiOperation(value = "学生财务数据导出")
     @GetMapping("/financeExport")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/student/StuBookApplyController.java

@@ -50,7 +50,6 @@ public class StuBookApplyController extends BaseController
     /**
      * 查询教材申请列表
      */
-    //@PreAuthorize("@ss.hasPermi('apply:book:list')")
     @GetMapping("/list")
     @ApiOperation("教材申请审批列表接口")
     public TableDataInfo list(ApplyListParam param)
@@ -63,7 +62,6 @@ public class StuBookApplyController extends BaseController
     /**
      * 我的教材申请列表
      */
-    //@PreAuthorize("@ss.hasPermi('apply:book:myList')")
     @GetMapping("/myList")
     @ApiOperation("我的教材申请列表接口")
     public TableDataInfo myList(ApplyListParam param)
@@ -79,8 +77,7 @@ public class StuBookApplyController extends BaseController
     /**
      * 获取教材申请详细信息
      */
-   //@PreAuthorize("@ss.hasPermi('department:apply:query')")
-    @GetMapping(value = "/{id}")
+   @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
         return AjaxResult.success(stuBookApplyService.selectStuBookApplyById(id));
@@ -89,7 +86,6 @@ public class StuBookApplyController extends BaseController
     /**
      * 新增教材申请
      */
-    //@PreAuthorize("@ss.hasPermi('apply:book:add')")
     @Log(title = "教材申请", businessType = BusinessType.INSERT)
     @PostMapping
     @ApiOperation("新增发放教材申请")
@@ -101,7 +97,6 @@ public class StuBookApplyController extends BaseController
     /**
      * 修改教材申请
      */
-    //@PreAuthorize("@ss.hasPermi('apply:book:edit')")
     @Log(title = "教材申请", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody StuBookApply stuBookApply)
@@ -112,7 +107,6 @@ public class StuBookApplyController extends BaseController
     /**
      * 删除教材申请
      */
-    //@PreAuthorize("@ss.hasPermi('apply:book:remove')")
     @Log(title = "教材申请", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     @ApiOperation(value = "删除")
@@ -124,7 +118,6 @@ public class StuBookApplyController extends BaseController
     /**
      * 发放教材审核
      */
-    //@PreAuthorize("@ss.hasPermi('apply:book:approval')")
     @Log(title = "教材申请", businessType = BusinessType.UPDATE)
     @PutMapping("/approval")
     @ApiOperation(value = "审批")
@@ -144,7 +137,6 @@ public class StuBookApplyController extends BaseController
     /**
      * 教材发放
      */
-    //@PreAuthorize("@ss.hasPermi('apply:book:grant')")
     @Log(title = "教材申请", businessType = BusinessType.UPDATE)
     @PutMapping("/grant")
     @ApiOperation(value = "发放")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/student/StuBuildingController.java

@@ -1,6 +1,10 @@
 package com.ruoyi.web.controller.student;
 
 import java.util.List;
+
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.domain.StuBaseInfo;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -19,6 +23,7 @@ import com.ruoyi.system.domain.StuBuilding;
 import com.ruoyi.system.service.IStuBuildingService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 楼宇Controller
@@ -36,7 +41,6 @@ public class StuBuildingController extends BaseController
     /**
      * 查询楼宇列表
      */
-    //@PreAuthorize("@ss.hasPermi('dorm:building:list')")
     @GetMapping("/list")
     public TableDataInfo list(StuBuilding stuBuilding)
     {
@@ -61,7 +65,6 @@ public class StuBuildingController extends BaseController
     /**
      * 获取楼宇详细信息
      */
-    //@PreAuthorize("@ss.hasPermi('dorm:building:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -71,7 +74,6 @@ public class StuBuildingController extends BaseController
     /**
      * 新增楼宇
      */
-    //@PreAuthorize("@ss.hasPermi('dorm:building:add')")
     @Log(title = "楼宇", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody StuBuilding stuBuilding)
@@ -82,7 +84,6 @@ public class StuBuildingController extends BaseController
     /**
      * 修改楼宇
      */
-    //@PreAuthorize("@ss.hasPermi('dorm:building:edit')")
     @Log(title = "楼宇", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody StuBuilding stuBuilding)
@@ -93,11 +94,11 @@ public class StuBuildingController extends BaseController
     /**
      * 删除楼宇
      */
-    //@PreAuthorize("@ss.hasPermi('dorm:building:remove')")
     @Log(title = "楼宇", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(stuBuildingService.deleteStuBuildingByIds(ids));
     }
+
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/student/StuClassBookConfigController.java

@@ -43,7 +43,6 @@ public class StuClassBookConfigController extends BaseController
     /**
      * 查询教材配置列表
      */
-    //@PreAuthorize("@ss.hasPermi('book:config:list')")
     @GetMapping("/list")
     @ApiOperation(value = "根据班级id获取教材配置列表接口")
     public AjaxResult list(Long classId)
@@ -56,7 +55,6 @@ public class StuClassBookConfigController extends BaseController
     /**
      * 获取教材配置详细信息
      */
-    //@PreAuthorize("@ss.hasPermi('book:config:query')")
     @GetMapping(value = "/{classId}")
     public AjaxResult getInfo(@PathVariable("classId") Long classId)
     {
@@ -66,7 +64,6 @@ public class StuClassBookConfigController extends BaseController
     /**
      * 新增教材配置
      */
-    //@PreAuthorize("@ss.hasPermi('book:config:add')")
     @Log(title = "教材配置", businessType = BusinessType.INSERT)
     @PostMapping
     @ApiOperation(value = "添加班级教材配置")
@@ -78,7 +75,6 @@ public class StuClassBookConfigController extends BaseController
     /**
      * 修改教材配置
      */
-    //@PreAuthorize("@ss.hasPermi('book:config:edit')")
     @Log(title = "教材配置", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody StuClassBookConfig stuClassBookConfig)
@@ -89,7 +85,6 @@ public class StuClassBookConfigController extends BaseController
     /**
      * 删除教材配置
      */
-    //@PreAuthorize("@ss.hasPermi('book:config:remove')")
     @Log(title = "教材配置", businessType = BusinessType.DELETE)
 	@DeleteMapping("/batchRemove")
     @ApiOperation(value = "批量删除班级教材配置")
@@ -102,7 +97,6 @@ public class StuClassBookConfigController extends BaseController
     /**
      * 删除教材配置
      */
-    //@PreAuthorize("@ss.hasPermi('book:config:remove')")
     @Log(title = "教材配置", businessType = BusinessType.DELETE)
     @DeleteMapping("/singleRemove")
     @ApiOperation(value = "单个删除班级教材配置")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/student/StuClassController.java

@@ -40,7 +40,6 @@ public class StuClassController extends BaseController
     /**
      * 查询班级列表
      */
-    //@PreAuthorize("@ss.hasPermi('department:classes:list')")
     @GetMapping("/list")
     @ApiOperation("班级列表")
     public TableDataInfo list(StuClass stuClass)
@@ -53,7 +52,6 @@ public class StuClassController extends BaseController
     /**
      * 导出班级列表
      */
-    //@PreAuthorize("@ss.hasPermi('department:classes:export')")
     @Log(title = "班级", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(StuClass stuClass)
@@ -66,7 +64,6 @@ public class StuClassController extends BaseController
     /**
      * 获取班级详细信息
      */
-    //@PreAuthorize("@ss.hasPermi('department:classes:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -76,7 +73,6 @@ public class StuClassController extends BaseController
     /**
      * 新增班级
      */
-    //@PreAuthorize("@ss.hasPermi('department:classes:add')")
     @Log(title = "班级", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody StuClass stuClass)
@@ -87,7 +83,6 @@ public class StuClassController extends BaseController
     /**
      * 修改班级
      */
-    //@PreAuthorize("@ss.hasPermi('department:classes:edit')")
     @Log(title = "班级", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody StuClass stuClass)
@@ -98,7 +93,6 @@ public class StuClassController extends BaseController
     /**
      * 删除班级
      */
-    //@PreAuthorize("@ss.hasPermi('department:classes:remove')")
     @Log(title = "班级", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
@@ -109,7 +103,6 @@ public class StuClassController extends BaseController
     /**
      * 获取专业列表
      */
-    //@PreAuthorize("@ss.hasPermi('department:classes:query')")
     @GetMapping(value = "/query-list/{professionId}")
     @ApiOperation("根据专业id获取班级列表")
     public TableDataInfo getList(@PathVariable("professionId") Long professionId)

ruoyi-admin/src/main/java/com/ruoyi/web/controller/student/StuCollegeController.java

@@ -39,7 +39,6 @@ public class StuCollegeController extends BaseController
     /**
      * 查询学院列表
      */
-    //@PreAuthorize("@ss.hasPermi('department:college:list')")
     @GetMapping("/list")
     public TableDataInfo list(StuCollege stuCollege)
     {
@@ -51,7 +50,6 @@ public class StuCollegeController extends BaseController
     /**
      * 导出学院列表
      */
-    @PreAuthorize("@ss.hasPermi('department:college:export')")
     @Log(title = "学院", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(StuCollege stuCollege)
@@ -64,7 +62,6 @@ public class StuCollegeController extends BaseController
     /**
      * 获取学院详细信息
      */
-    @PreAuthorize("@ss.hasPermi('department:college:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -74,7 +71,6 @@ public class StuCollegeController extends BaseController
     /**
      * 新增学院
      */
-    @PreAuthorize("@ss.hasPermi('department:college:add')")
     @Log(title = "学院", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody StuCollege stuCollege)
@@ -85,7 +81,6 @@ public class StuCollegeController extends BaseController
     /**
      * 修改学院
      */
-    @PreAuthorize("@ss.hasPermi('department:college:edit')")
     @Log(title = "学院", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody StuCollege stuCollege)
@@ -96,7 +91,6 @@ public class StuCollegeController extends BaseController
     /**
      * 删除学院
      */
-    @PreAuthorize("@ss.hasPermi('department:college:remove')")
     @Log(title = "学院", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

ruoyi-admin/src/main/java/com/ruoyi/web/controller/student/StuDepartmentController.java

@@ -40,7 +40,6 @@ public class StuDepartmentController extends BaseController
     /**
      * 查询科系列表
      */
-    //@PreAuthorize("@ss.hasPermi('department:depart:list')")
     @GetMapping("/list")
     @ApiOperation("科系列表")
     public TableDataInfo list(StuDepartment stuDepartment)
@@ -53,7 +52,6 @@ public class StuDepartmentController extends BaseController
     /**
      * 导出科系列表
      */
-    @PreAuthorize("@ss.hasPermi('department:depart:export')")
     @Log(title = "科系", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(StuDepartment stuDepartment)
@@ -66,7 +64,6 @@ public class StuDepartmentController extends BaseController
     /**
      * 获取科系详细信息
      */
-    @PreAuthorize("@ss.hasPermi('department:depart:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -76,7 +73,6 @@ public class StuDepartmentController extends BaseController
     /**
      * 新增科系
      */
-    @PreAuthorize("@ss.hasPermi('department:depart:add')")
     @Log(title = "科系", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody StuDepartment stuDepartment)
@@ -87,7 +83,6 @@ public class StuDepartmentController extends BaseController
     /**
      * 修改科系
      */
-    @PreAuthorize("@ss.hasPermi('department:depart:edit')")
     @Log(title = "科系", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody StuDepartment stuDepartment)
@@ -98,7 +93,6 @@ public class StuDepartmentController extends BaseController
     /**
      * 删除科系
      */
-    @PreAuthorize("@ss.hasPermi('department:depart:remove')")
     @Log(title = "科系", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
@@ -109,7 +103,6 @@ public class StuDepartmentController extends BaseController
     /**
      * 获取科系详细信息
      */
-    @PreAuthorize("@ss.hasPermi('department:depart:query')")
     @GetMapping(value = "/query-list/{collegeId}")
     @ApiOperation("根据学院id获取专业列表")
     public TableDataInfo getList(@PathVariable("collegeId") Long collegeId)

ruoyi-admin/src/main/java/com/ruoyi/web/controller/student/StuOutSchoolApplyController.java

@@ -46,7 +46,6 @@ public class StuOutSchoolApplyController extends BaseController
     /**
      * 查询失学申请列表
      */
-    //@PreAuthorize("@ss.hasPermi('apply:out:list')")
     @GetMapping("/list")
     @ApiOperation("失学申请审批列表接口")
     public TableDataInfo list(ApplyListParam param)
@@ -59,7 +58,6 @@ public class StuOutSchoolApplyController extends BaseController
     /**
      * 我的失学申请列表
      */
-    //@PreAuthorize("@ss.hasPermi('apply:out:mylist')")
     @GetMapping("/myList")
     @ApiOperation("我的失学申请列表接口")
     public TableDataInfo myList(ApplyListParam param)
@@ -75,7 +73,6 @@ public class StuOutSchoolApplyController extends BaseController
     /**
      * 获取失学申请详细信息
      */
-    //@PreAuthorize("@ss.hasPermi('apply:out:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -85,7 +82,6 @@ public class StuOutSchoolApplyController extends BaseController
     /**
      * 新增失学申请
      */
-    //@PreAuthorize("@ss.hasPermi('apply:out:add')")
     @Log(title = "失学申请", businessType = BusinessType.INSERT)
     @PostMapping
     @ApiOperation("新增失学申请接口")
@@ -97,7 +93,6 @@ public class StuOutSchoolApplyController extends BaseController
     /**
      * 修改失学申请
      */
-    //@PreAuthorize("@ss.hasPermi('apply:out:edit')")
     @Log(title = "失学申请", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody StuOutSchoolApply stuOutSchoolApply)
@@ -108,7 +103,6 @@ public class StuOutSchoolApplyController extends BaseController
     /**
      * 删除失学申请
      */
-    //@PreAuthorize("@ss.hasPermi('apply:out:remove')")
     @Log(title = "失学申请", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
@@ -120,7 +114,6 @@ public class StuOutSchoolApplyController extends BaseController
     /**
      * 失学审批
      */
-    //@PreAuthorize("@ss.hasPermi('apply:out:approval')")
     @Log(title = "失学申请", businessType = BusinessType.UPDATE)
     @PutMapping("/approval")
     @ApiOperation(value = "失学审批")
@@ -140,7 +133,6 @@ public class StuOutSchoolApplyController extends BaseController
     /**
      * 发放教材
      */
-    //@PreAuthorize("@ss.hasPermi('apply:out:finish')")
     @Log(title = "失学申请", businessType = BusinessType.UPDATE)
     @PutMapping("/finish")
     @ApiOperation(value = "完成失学")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/student/StuProfessionController.java

@@ -40,7 +40,6 @@ public class StuProfessionController extends BaseController
     /**
      * 查询专业列表
      */
-    //@PreAuthorize("@ss.hasPermi('department:profession:list')")
     @GetMapping("/list")
     @ApiOperation("专业列表")
     public TableDataInfo list(StuProfession stuProfession)
@@ -53,7 +52,6 @@ public class StuProfessionController extends BaseController
     /**
      * 导出专业列表
      */
-    //@PreAuthorize("@ss.hasPermi('department:profession:export')")
     @Log(title = "专业", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(StuProfession stuProfession)
@@ -66,7 +64,6 @@ public class StuProfessionController extends BaseController
     /**
      * 获取专业详细信息
      */
-    //@PreAuthorize("@ss.hasPermi('department:profession:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -76,7 +73,6 @@ public class StuProfessionController extends BaseController
     /**
      * 新增专业
      */
-    //@PreAuthorize("@ss.hasPermi('department:profession:add')")
     @Log(title = "专业", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody StuProfession stuProfession)
@@ -87,7 +83,6 @@ public class StuProfessionController extends BaseController
     /**
      * 修改专业
      */
-    //@PreAuthorize("@ss.hasPermi('department:profession:edit')")
     @Log(title = "专业", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody StuProfession stuProfession)
@@ -98,7 +93,6 @@ public class StuProfessionController extends BaseController
     /**
      * 删除专业
      */
-    //@PreAuthorize("@ss.hasPermi('department:profession:remove')")
     @Log(title = "专业", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
@@ -109,7 +103,6 @@ public class StuProfessionController extends BaseController
     /**
      * 获取专业列表
      */
-    //@PreAuthorize("@ss.hasPermi('department:profession:query')")
     @GetMapping(value = "/query-list")
     @ApiOperation("根据科系id获取专业列表")
     public TableDataInfo getList()

ruoyi-admin/src/main/java/com/ruoyi/web/controller/student/StuQuitSchoolApplyController.java

@@ -46,7 +46,6 @@ public class StuQuitSchoolApplyController extends BaseController
     /**
      * 查询退学申请列表
      */
-    //@PreAuthorize("@ss.hasPermi('apply:quit:list')")
     @GetMapping("/list")
     @ApiOperation("退学申请审批列表接口")
     public TableDataInfo list(ApplyListParam param)
@@ -59,7 +58,6 @@ public class StuQuitSchoolApplyController extends BaseController
     /**
      * 查询退学申请列表
      */
-    //@PreAuthorize("@ss.hasPermi('apply:quit:mylist')")
     @GetMapping("/myList")
     @ApiOperation("我的退学申请列表接口")
     public TableDataInfo myList(ApplyListParam param)
@@ -75,7 +73,6 @@ public class StuQuitSchoolApplyController extends BaseController
     /**
      * 获取退学申请详细信息
      */
-    //@PreAuthorize("@ss.hasPermi('apply:quit:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -85,7 +82,6 @@ public class StuQuitSchoolApplyController extends BaseController
     /**
      * 新增退学申请
      */
-    //@PreAuthorize("@ss.hasPermi('apply:quit:add')")
     @Log(title = "退学申请", businessType = BusinessType.INSERT)
     @PostMapping
     @ApiOperation("新增退学申请接口")
@@ -97,7 +93,6 @@ public class StuQuitSchoolApplyController extends BaseController
     /**
      * 修改退学申请
      */
-    //@PreAuthorize("@ss.hasPermi('apply:quit:edit')")
     @Log(title = "退学申请", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody StuQuitSchoolApply stuQuitSchoolApply)
@@ -108,7 +103,6 @@ public class StuQuitSchoolApplyController extends BaseController
     /**
      * 删除退学申请
      */
-    //@PreAuthorize("@ss.hasPermi('apply:quit:remove')")
     @Log(title = "退学申请", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
@@ -119,7 +113,6 @@ public class StuQuitSchoolApplyController extends BaseController
     /**
      * 退学审批
      */
-    //@PreAuthorize("@ss.hasPermi('apply:quit:approval')")
     @Log(title = "退学申请", businessType = BusinessType.UPDATE)
     @PutMapping("/approval")
     @ApiOperation(value = "退学审批")
@@ -139,7 +132,6 @@ public class StuQuitSchoolApplyController extends BaseController
     /**
      * 完成退学
      */
-    //@PreAuthorize("@ss.hasPermi('apply:quit:finish')")
     @Log(title = "退学申请", businessType = BusinessType.UPDATE)
     @PutMapping("/finish")
     @ApiOperation(value = "完成退学")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/student/StuRoomController.java

@@ -2,6 +2,9 @@ package com.ruoyi.web.controller.student;
 
 import java.util.List;
 
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.domain.StuBaseInfo;
+import com.ruoyi.system.domain.StuBuilding;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -22,6 +25,7 @@ import com.ruoyi.system.domain.StuRoom;
 import com.ruoyi.system.service.IStuRoomService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 寝室Controller
@@ -40,7 +44,6 @@ public class StuRoomController extends BaseController
     /**
      * 查询寝室列表
      */
-    //@PreAuthorize("@ss.hasPermi('dorm:room:list')")
     @GetMapping("/list")
     public TableDataInfo list(StuRoom stuRoom)
     {
@@ -52,7 +55,6 @@ public class StuRoomController extends BaseController
     /**
      * 导出寝室列表
      */
-    //@PreAuthorize("@ss.hasPermi('dorm:room:export')")
     @Log(title = "寝室", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(StuRoom stuRoom)
@@ -65,7 +67,6 @@ public class StuRoomController extends BaseController
     /**
      * 获取寝室详细信息
      */
-    //@PreAuthorize("@ss.hasPermi('dorm:room:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -75,7 +76,6 @@ public class StuRoomController extends BaseController
     /**
      * 新增寝室
      */
-    //@PreAuthorize("@ss.hasPermi('dorm:room:add')")
     @Log(title = "寝室", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody StuRoom stuRoom)
@@ -86,7 +86,6 @@ public class StuRoomController extends BaseController
     /**
      * 修改寝室
      */
-    //@PreAuthorize("@ss.hasPermi('dorm:room:edit')")
     @Log(title = "寝室", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody StuRoom stuRoom)
@@ -97,7 +96,6 @@ public class StuRoomController extends BaseController
     /**
      * 删除寝室
      */
-    //@PreAuthorize("@ss.hasPermi('dorm:room:remove')")
     @Log(title = "寝室", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
@@ -106,12 +104,30 @@ public class StuRoomController extends BaseController
     }
 
     /**
-     * 获取专业列表
+     * 根据寝室类型获取寝室列表
      */
-    //@GetMapping(value = "/query-list/{buildingId}/{roomType}")
     @ApiOperation("根据楼宇id获取寝室列表")
+    @GetMapping(value = "/query-list/{buildingId}/{roomType}")
     public TableDataInfo getList(@PathVariable("buildingId") Long buildingId,@PathVariable("roomType") Integer roomType)
     {
         return getDataTable(stuRoomService.queryRoomByBuildingId(buildingId,roomType));
     }
+
+    /**
+     *  导入寝室数据
+     * @param file
+     * @param updateSupport
+     * @return
+     * @throws Exception
+     */
+    @Log(title = "寝室管理", businessType = BusinessType.IMPORT)
+    @PostMapping("/importData")
+    @ApiOperation(value = "楼宇管理")
+    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
+        ExcelUtil<StuRoom> util = new ExcelUtil<>(StuRoom.class);
+        List<StuRoom> stuRoomList = util.importExcel(file.getInputStream());
+        String operName = SecurityUtils.getUsername();
+        String message = stuRoomService.importRooms(stuRoomList, updateSupport, operName);
+        return AjaxResult.success(message);
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/student/StuTextBookController.java

@@ -40,7 +40,6 @@ public class StuTextBookController extends BaseController
     /**
      * 查询教材列表
      */
-    //@PreAuthorize("@ss.hasPermi('system:book:list')")
     @GetMapping("/list")
     @ApiOperation(value = "列表")
     public TableDataInfo list(StuTextBook stuTextBook)
@@ -53,7 +52,6 @@ public class StuTextBookController extends BaseController
     /**
      * 导出教材列表
      */
-    //@PreAuthorize("@ss.hasPermi('system:book:export')")
     @Log(title = "教材", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     @ApiOperation(value = "导出")
@@ -67,7 +65,6 @@ public class StuTextBookController extends BaseController
     /**
      * 获取教材详细信息
      */
-    //@PreAuthorize("@ss.hasPermi('system:book:query')")
     @GetMapping(value = "/{id}")
     @ApiOperation(value = "详情")
     public AjaxResult getInfo(@PathVariable("id") String id)
@@ -78,7 +75,6 @@ public class StuTextBookController extends BaseController
     /**
      * 新增教材
      */
-    //@PreAuthorize("@ss.hasPermi('system:book:add')")
     @Log(title = "教材", businessType = BusinessType.INSERT)
     @PostMapping
     @ApiOperation(value = "新增")
@@ -90,7 +86,6 @@ public class StuTextBookController extends BaseController
     /**
      * 修改教材
      */
-    //@PreAuthorize("@ss.hasPermi('system:book:edit')")
     @Log(title = "教材", businessType = BusinessType.UPDATE)
     @PutMapping
     @ApiOperation(value = "修改")
@@ -102,7 +97,6 @@ public class StuTextBookController extends BaseController
     /**
      * 删除教材
      */
-    //@PreAuthorize("@ss.hasPermi('system:book:remove')")
     @Log(title = "教材", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     @ApiOperation(value = "删除")
@@ -115,7 +109,6 @@ public class StuTextBookController extends BaseController
     /**
      * 删除教材
      */
-    //@PreAuthorize("@ss.hasPermi('system:book:list')")
     @GetMapping("/bookList")
     @ApiOperation(value = "教材配置列表")
     public AjaxResult bookList()

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -90,6 +90,8 @@ public class SysUserController extends BaseController
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         String operName = loginUser.getUsername();
         String message = userService.importUser(userList, updateSupport, operName);
+
+
         return AjaxResult.success(message);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java

@@ -36,7 +36,7 @@ public class SwaggerConfig
     @Autowired
     private RuoYiConfig ruoyiConfig;
 
-    /** 是否开启swagger */
+    /** 是否开启swagger https://blog.csdn.net/qq_24607837/article/details/104965772 */
     @Value("${swagger.enabled}")
     private boolean enabled;
 

ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://127.0.0.1:3306/stu-man?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://172.16.90.64:3306/stu-man?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: root123
+                password: 123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
@@ -36,9 +36,10 @@ spring:
             testOnBorrow: false
             testOnReturn: false
             webStatFilter:
-                enabled: true
+                enabled: false
+            #是否开启管理视图 参考https://blog.csdn.net/yukuleshui/article/details/120750755
             statViewServlet:
-                enabled: true
+                enabled: false
                 # 设置白名单，不填则允许所有访问
                 allow:
                 url-pattern: /druid/*
@@ -54,4 +55,4 @@ spring:
                     merge-sql: true
                 wall:
                     config:
-                        multi-statement-allow: true
+                            multi-statement-allow: true

ruoyi-admin/src/main/resources/application.yml

@@ -9,7 +9,7 @@ ruoyi:
   # 实例演示开关
   demoEnabled: false
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: D:/stu-man/uploadPath
+  profile: '/home/ruoyi/uploadPath'
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
@@ -59,13 +59,13 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 127.0.0.1
+    host: 172.16.90.201
     # 端口，默认为6379
     port: 6379
     # 数据库索引
     database: 13
     # 密码
-    password:
+    password: ''
     # 连接超时时间
     timeout: 10s
     lettuce:
@@ -119,7 +119,7 @@ pagehelper:
 # Swagger配置
 swagger:
   # 是否开启swagger
-  enabled: true
+  enabled: false
   # 请求前缀
   pathMapping: /dev-api
 

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java

@@ -5,6 +5,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
 
 /**
  * Entity基类

ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java

@@ -141,15 +141,4 @@ public class EscapeUtil
         }
         return tmp.toString();
     }
-
-    public static void main(String[] args)
-    {
-        String html = "<script>alert(1);</script>";
-        // String html = "<scr<script>ipt>alert(\"XSS\")</scr<script>ipt>";
-        // String html = "<123";
-        // String html = "123>";
-        System.out.println(EscapeUtil.clean(html));
-        System.out.println(EscapeUtil.escape(html));
-        System.out.println(EscapeUtil.unescape(html));
-    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/StuBaseInfo.java

@@ -138,6 +138,9 @@ public class StuBaseInfo extends BaseEntity
     @ApiModelProperty(value = "课本分发状态")
     private Long textbookIsHandOut;
 
+    /** 裤子发放状态 **/
+    private Integer quiltIsHandOut;
+
     /** 综合评分 */
     //@Excel(name = "综合评分")
     @ApiModelProperty(value = "综合评分")
@@ -196,6 +199,10 @@ public class StuBaseInfo extends BaseEntity
     @ApiModelProperty(value = "校服费")
     private BigDecimal receivableIncidentals;
 
+    /** 床上用品费用 **/
+    @ApiModelProperty(value = "床上用品费用")
+    private BigDecimal beddingFee;
+
     /** 应收住宿费 */
     //@Excel(name = "应收住宿费")
     @ApiModelProperty(value = "应收住宿费")
@@ -312,6 +319,16 @@ public class StuBaseInfo extends BaseEntity
     private Integer quitApplyStatus;
     private Integer outApplyStatus;
     private Integer bookApplyStatus;
+    /** 删除标志（0代表存在 1代表删除） */
+    private String delFlag;
+    private Integer roomType;
+
+    @Excel(name = "票据代码")
+    private String billCode;
+    @Excel(name = "项目编码")
+    private String projectCode;
+    @Excel(name = "开票日期")
+    private Date ticketDate;
 
     public Long getBuildingId() {
         return buildingId;
@@ -887,6 +904,62 @@ public class StuBaseInfo extends BaseEntity
         this.bookApplyStatus = bookApplyStatus;
     }
 
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    public Integer getQuiltIsHandOut() {
+        return quiltIsHandOut;
+    }
+
+    public void setQuiltIsHandOut(Integer quiltIsHandOut) {
+        this.quiltIsHandOut = quiltIsHandOut;
+    }
+
+    public BigDecimal getBeddingFee() {
+        return beddingFee;
+    }
+
+    public void setBeddingFee(BigDecimal beddingFee) {
+        this.beddingFee = beddingFee;
+    }
+
+    public Integer getRoomType() {
+        return roomType;
+    }
+
+    public void setRoomType(Integer roomType) {
+        this.roomType = roomType;
+    }
+
+    public String getBillCode() {
+        return billCode;
+    }
+
+    public void setBillCode(String billCode) {
+        this.billCode = billCode;
+    }
+
+    public String getProjectCode() {
+        return projectCode;
+    }
+
+    public void setProjectCode(String projectCode) {
+        this.projectCode = projectCode;
+    }
+
+    public Date getTicketDate() {
+        return ticketDate;
+    }
+
+    public void setTicketDate(Date ticketDate) {
+        this.ticketDate = ticketDate;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ruoyi-system/src/main/java/com/ruoyi/system/domain/StuRoom.java

@@ -30,9 +30,13 @@ public class StuRoom extends BaseEntity
     private Integer roomType;
 
     /** 寝室名  */
-    @Excel(name = "寝室名 ")
+    @Excel(name = "寝室名")
     private String roomName;
 
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remark;
+
     public void setId(Long id) 
     {
         this.id = id;
@@ -78,6 +82,16 @@ public class StuRoom extends BaseEntity
         this.roomType = roomType;
     }
 
+    @Override
+    public String getRemark() {
+        return remark;
+    }
+
+    @Override
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ruoyi-system/src/main/java/com/ruoyi/system/mapper/StuBaseInfoMapper.java

@@ -104,4 +104,12 @@ public interface StuBaseInfoMapper
      * @return java.util.List<com.ruoyi.system.domain.vo.RoomStudentVo>
      */
     public List<RoomStudentVo> selectStudentByRoomId(@Param("roomId") Long roomId);
+
+
+    /**
+     * 逻辑删除往届学生
+     * @param vo
+     * @return
+     */
+    public int deleteOldStudent(StudentGraduationStatusVo vo);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/IStuBuildingService.java

@@ -1,6 +1,8 @@
 package com.ruoyi.system.service;
 
 import java.util.List;
+
+import com.ruoyi.system.domain.StuBaseInfo;
 import com.ruoyi.system.domain.StuBuilding;
 
 /**
@@ -58,4 +60,5 @@ public interface IStuBuildingService
      * @return 结果
      */
     public int deleteStuBuildingById(Long id);
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/IStuRoomService.java

@@ -1,6 +1,8 @@
 package com.ruoyi.system.service;
 
 import java.util.List;
+
+import com.ruoyi.system.domain.StuBuilding;
 import com.ruoyi.system.domain.StuRoom;
 import org.apache.ibatis.annotations.Param;
 
@@ -73,4 +75,14 @@ public interface IStuRoomService
      * @return java.util.List<com.ruoyi.system.domain.StuRoom>
      */
     public List<StuRoom> queryRoomByBuildingId(Long buildingId,Integer roomType);
+
+
+    /**
+     *  导入寝室数据
+     * @param stuRoomList 用户列表
+     * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据
+     * @param operName 操作用户
+     * @return 结果
+     */
+    public String importRooms(List<StuRoom> stuRoomList, Boolean isUpdateSupport, String operName);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StuBaseInfoServiceImpl.java

@@ -72,7 +72,7 @@ public class StuBaseInfoServiceImpl implements IStuBaseInfoService
     public int insertStuBaseInfo(StuBaseInfo stuBaseInfo)
     {
         stuBaseInfo.setCreateTime(DateUtils.getNowDate());
-        stuBaseInfo.setPaymentDate(DateUtils.getNowDate());
+        stuBaseInfo.setUpdateTime(DateUtils.getNowDate());
         String idCardNumber = stuBaseInfo.getIdCardNumber();
         StuBaseInfo t = stuBaseInfoMapper.selectStudentByIDNumber(idCardNumber);
         if(ObjectUtils.isEmpty(t)){

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StuBuildingServiceImpl.java

@@ -1,7 +1,13 @@
 package com.ruoyi.system.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.common.exception.CustomException;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.StuBaseInfo;
+import com.ruoyi.system.domain.StuProfession;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.StuBuildingMapper;
@@ -93,4 +99,5 @@ public class StuBuildingServiceImpl implements IStuBuildingService
     {
         return stuBuildingMapper.deleteStuBuildingById(id);
     }
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StuRoomServiceImpl.java

@@ -1,7 +1,14 @@
 package com.ruoyi.system.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.common.exception.CustomException;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.StuBaseInfo;
+import com.ruoyi.system.domain.StuBuilding;
+import com.ruoyi.system.domain.StuProfession;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.StuRoomMapper;
@@ -113,4 +120,27 @@ public class StuRoomServiceImpl implements IStuRoomService
     public List<StuRoom> queryRoomByBuildingId(Long buildingId,Integer roomType) {
         return stuRoomMapper.queryRoomByBuildingId(buildingId,roomType);
     }
+
+
+    /**
+     *  导入楼宇数据
+     * @param stuRoomList 寝室列表
+     * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据
+     * @param operName 操作用户
+     * @return 结果
+     */
+    public String importRooms(List<StuRoom> stuRoomList, Boolean isUpdateSupport, String operName){
+        if (StringUtils.isNull(stuRoomList) || stuRoomList.size() == 0) {
+            throw new CustomException("导入数据不能为空！");
+        }
+        int successNum = 0;
+        StringBuilder successMsg = new StringBuilder();
+        StringBuilder failureMsg = new StringBuilder();
+        for (StuRoom room : stuRoomList) {
+            this.insertStuRoom(room);
+            successNum++;
+            successMsg.append("<br/>" + successNum + "、寝室号 " + room.getRoomName() + " 导入成功");
+        }
+        return successMsg.toString();
+    }
 }

ruoyi-system/src/main/resources/mapper/department/StuBaseInfoMapper.xml

@@ -71,6 +71,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="quitApplyStatus" column="quit_apply_status" />
         <result property="outApplyStatus" column="out_apply_status" />
         <result property="bookApplyStatus" column="book_apply_status" />
+
+        <result property="beddingFee" column="bedding_fee" />
+        <result property="quiltIsHandOut" column="quilt_is_hand_out" />
+        <result property="roomType" column="room_type" />
     </resultMap>
 
     <resultMap id="allBaseInfo" type="StuBaseInfo" extends="StuBaseInfoResult">
@@ -82,7 +86,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectStuBaseInfoVo">
-        select sbi.id, sbi.student_name, sbi.sex, sbi.education_background, sbi.fresh_student, sbi.id_card_number,sbi.student_number, sbi.student_status, sbi.phone,sbi.should_register_date,sbi.origin_of_student, sbi.graduated_from, sbi.profession_id, sbi.profession_name, sbi.class_id, sbi.class_name, sbi.insurance_is_buy, sbi.room_id, sbi.building_id,sbi.uniform_is_hand_out, sbi.textbook_is_hand_out, sbi.score, sbi.score_by, sbi.remark, sbi.company_name, sbi.entry_date, company_address, contact_name, company_phone, poor_households_is, register_date, enrollment_date, receivable_incidentals, receivable_quarterage, official_incidentals,receivable_total,official_total, incidentals_bill_no, official_quarterage, quarterage_bill_no, charger_name, payment_date,payment_method, drawer, contact_teacher, incidentals_bill_serial, first_low_half_is, first_low_fees, second_up_half_is, second_up_fees, second_low_half_is, second_low_fees, third_up_half_is, third_up_fees, third_low_half_is, third_low_fees, charge_times, sbi.create_by, sbi.create_time, sbi.update_by, sbi.update_time,sbi.quit_apply_status,sbi.out_apply_status,sbi.book_apply_status
+        select sbi.id, sbi.student_name, sbi.sex, sbi.education_background, sbi.fresh_student, sbi.id_card_number,sbi.student_number, sbi.student_status,
+        sbi.phone,sbi.should_register_date,sbi.origin_of_student, sbi.graduated_from, sbi.profession_id, sbi.profession_name, sbi.class_id, sbi.class_name,
+         sbi.insurance_is_buy, sbi.room_id, sbi.building_id,sbi.uniform_is_hand_out, sbi.textbook_is_hand_out, sbi.score, sbi.score_by, sbi.remark, sbi.company_name,
+         sbi.entry_date, company_address, contact_name, company_phone, poor_households_is, register_date, enrollment_date, receivable_incidentals, receivable_quarterage,
+          official_incidentals,receivable_total,official_total, incidentals_bill_no, official_quarterage, quarterage_bill_no, charger_name, payment_date,payment_method, drawer,
+          contact_teacher, incidentals_bill_serial, first_low_half_is, first_low_fees, second_up_half_is, second_up_fees, second_low_half_is, second_low_fees, third_up_half_is,
+          third_up_fees, third_low_half_is, third_low_fees, charge_times, sbi.create_by, sbi.create_time, sbi.update_by, sbi.update_time,sbi.quit_apply_status,sbi.out_apply_status,
+          sbi.book_apply_status,sbi.bedding_fee,sbi.quilt_is_hand_out,sbi.room_type,sbi.bill_code,sbi.project_code,sbi.ticket_date
     </sql>
 
     <select id="selectStuBaseInfoList" parameterType="StuBaseInfo" resultMap="StuBaseInfoResult">
@@ -94,6 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </if>
 
         <where>
+             del_flag = '0'
             <if test="studentName != null  and studentName != ''"> and student_name like concat('%', #{studentName}, '%')</if>
             <if test="sex != null  and sex != ''"> and sex = #{sex}</if>
             <if test="educationBackground != null  and educationBackground != ''"> and education_background = #{educationBackground}</if>
@@ -106,6 +118,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     <when test="studentStatus==99 ">
                         and student_status IN(2,3,4,5,6,7)
                     </when>
+                    <when test="studentStatus==111">
+                        and student_status <![CDATA[ >= 1]]>
+                    </when>
+                    <when test="studentStatus==222">
+                        and student_status <![CDATA[ >= 2]]>
+                    </when>
                     <otherwise>
                         and student_status = #{studentStatus}
                     </otherwise>
@@ -148,7 +166,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="chargeTimes != null "> and charge_times = #{chargeTimes}</if>
             <if test="shouldRegisterDate != null "> and should_register_date = #{shouldRegisterDate}</if>
         </where>
-        order by update_time desc,student_name asc
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectStuBaseInfoById" parameterType="Long" resultMap="allBaseInfo">
@@ -223,6 +241,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
+
+            <if test="billCode != null">bill_code,</if>
+            <if test="projectCode != null">project_code,</if>
+            <if test="ticketDate != null">ticket_date,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="studentName != null">#{studentName},</if>
@@ -284,6 +306,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="billCode != null">#{billCode},</if>
+            <if test="projectCode != null">#{projectCode},</if>
+            <if test="ticketDate != null">#{ticketDate},</if>
          </trim>
     </insert>
 
@@ -310,6 +335,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="buildingId != null">building_id = #{buildingId},</if>
         <if test="uniformIsHandOut != null">uniform_is_hand_out = #{uniformIsHandOut},</if>
         <if test="textbookIsHandOut != null">textbook_is_hand_out = #{textbookIsHandOut},</if>
+        <if test="quiltIsHandOut != null">quilt_is_hand_out = #{quiltIsHandOut},</if>
         <if test="score != null">score = #{score},</if>
         <if test="scoreBy != null">score_by = #{scoreBy},</if>
         <if test="remark != null">remark = #{remark},</if>
@@ -322,6 +348,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="registerDate != null">register_date = #{registerDate},</if>
         <if test="enrollmentDate != null">enrollment_date = #{enrollmentDate},</if>
         <if test="receivableIncidentals != null">receivable_incidentals = #{receivableIncidentals},</if>
+        <if test="beddingFee != null">bedding_fee = #{beddingFee},</if>
         <if test="receivableQuarterage != null">receivable_quarterage = #{receivableQuarterage},</if>
         <if test="receivableTotal != null">receivable_total = #{receivableTotal},</if>
         <if test="officialIncidentals != null">official_incidentals = #{officialIncidentals},</if>
@@ -353,6 +380,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="quitApplyStatus != null">quit_apply_status = #{quitApplyStatus},</if>
         <if test="outApplyStatus != null">out_apply_status = #{outApplyStatus},</if>
         <if test="bookApplyStatus != null">book_apply_status = #{bookApplyStatus},</if>
+        <if test="roomType != null">room_type = #{roomType},</if>
+        <if test="billCode != null">bill_code = #{billCode},</if>
+        <if test="projectCode != null">project_code = #{projectCode},</if>
+        <if test="ticketDate != null">ticket_date = #{ticketDate},</if>
     </trim>
     where id = #{id}
 </update>
@@ -380,6 +411,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="buildingId != null">building_id = #{buildingId},</if>
             <if test="uniformIsHandOut != null">uniform_is_hand_out = #{uniformIsHandOut},</if>
             <if test="textbookIsHandOut != null">textbook_is_hand_out = #{textbookIsHandOut},</if>
+            <if test="quiltIsHandOut != null">quilt_is_hand_out = #{quiltIsHandOut},</if>
             <if test="score != null">score = #{score},</if>
             <if test="scoreBy != null">score_by = #{scoreBy},</if>
             <if test="remark != null">remark = #{remark},</if>
@@ -392,6 +424,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="registerDate != null">register_date = #{registerDate},</if>
             <if test="enrollmentDate != null">enrollment_date = #{enrollmentDate},</if>
             <if test="receivableIncidentals != null">receivable_incidentals = #{receivableIncidentals},</if>
+            <if test="beddingFee != null">bedding_fee = #{beddingFee},</if>
             <if test="receivableQuarterage != null">receivable_quarterage = #{receivableQuarterage},</if>
             <if test="receivableTotal != null">receivable_total = #{receivableTotal},</if>
             <if test="officialIncidentals != null">official_incidentals = #{officialIncidentals},</if>
@@ -423,6 +456,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="quitApplyStatus != null">quit_apply_status = #{quitApplyStatus},</if>
             <if test="outApplyStatus != null">out_apply_status = #{outApplyStatus},</if>
             <if test="bookApplyStatus != null">book_apply_status = #{bookApplyStatus},</if>
+            <if test="roomType != null">room_type = #{roomType},</if>
         </trim>
         where id_card_number = #{idCardNumber}
     </update>

services.txt

@@ -0,0 +1,6 @@
+ruoyi-framework
+ruoyi-common
+ruoyi-generator
+ruoyi-quartz
+ruoyi-system
+ruoyi-admin