增加代码生成案例

admin-framework/pom.xml

@@ -59,6 +59,13 @@
             <artifactId>admin-system</artifactId>
         </dependency>
 
+        <!-- 职业分流模块-->
+        <dependency>
+            <groupId>com.admin</groupId>
+            <artifactId>admin-major</artifactId>
+        </dependency>
+
+
     </dependencies>
 
 </project>

admin-generator/src/main/resources/generator.yml

@@ -1,10 +1,10 @@
 # 代码生成
 gen: 
   # 作者
-  author: ruoyi
+  author: zewei
   # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
-  packageName: com.admin.system
+  packageName: com.admin.major
   # 自动去除表前缀，默认是false
-  autoRemovePre: false
+  autoRemovePre: true
   # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）
-  tablePrefix: sys_
+  tablePrefix: sys_,m_

admin-major/pom.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>admin</artifactId>
+        <groupId>com.admin</groupId>
+        <version>3.8.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>admin-major</artifactId>
+
+    <description>
+        分流模块
+    </description>
+
+    <dependencies>
+
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>com.admin</groupId>
+            <artifactId>admin-common</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>

admin-major/src/main/java/com/admin/major/controller/ScheduleArrangeController.java

@@ -0,0 +1,104 @@
+package com.admin.major.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.admin.common.annotation.Log;
+import com.admin.common.core.controller.BaseController;
+import com.admin.common.core.domain.AjaxResult;
+import com.admin.common.enums.BusinessType;
+import com.admin.major.domain.ScheduleArrange;
+import com.admin.major.service.IScheduleArrangeService;
+import com.admin.common.utils.poi.ExcelUtil;
+import com.admin.common.core.page.TableDataInfo;
+
+/**
+ * 日程安排Controller
+ * 
+ * @author zewei
+ * @date 2022-03-20
+ */
+@RestController
+@RequestMapping("/major/arrange")
+public class ScheduleArrangeController extends BaseController
+{
+    @Autowired
+    private IScheduleArrangeService scheduleArrangeService;
+
+    /**
+     * 查询日程安排列表
+     */
+    @PreAuthorize("@ss.hasPermi('major:arrange:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ScheduleArrange scheduleArrange)
+    {
+        startPage();
+        List<ScheduleArrange> list = scheduleArrangeService.selectScheduleArrangeList(scheduleArrange);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出日程安排列表
+     */
+    @PreAuthorize("@ss.hasPermi('major:arrange:export')")
+    @Log(title = "日程安排", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ScheduleArrange scheduleArrange)
+    {
+        List<ScheduleArrange> list = scheduleArrangeService.selectScheduleArrangeList(scheduleArrange);
+        ExcelUtil<ScheduleArrange> util = new ExcelUtil<ScheduleArrange>(ScheduleArrange.class);
+        util.exportExcel(response, list, "日程安排数据");
+    }
+
+    /**
+     * 获取日程安排详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('major:arrange:query')")
+    @GetMapping(value = "/{orginId}")
+    public AjaxResult getInfo(@PathVariable("orginId") String orginId)
+    {
+        return AjaxResult.success(scheduleArrangeService.selectScheduleArrangeByOrginId(orginId));
+    }
+
+    /**
+     * 新增日程安排
+     */
+    @PreAuthorize("@ss.hasPermi('major:arrange:add')")
+    @Log(title = "日程安排", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ScheduleArrange scheduleArrange)
+    {
+        return toAjax(scheduleArrangeService.insertScheduleArrange(scheduleArrange));
+    }
+
+    /**
+     * 修改日程安排
+     */
+    @PreAuthorize("@ss.hasPermi('major:arrange:edit')")
+    @Log(title = "日程安排", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ScheduleArrange scheduleArrange)
+    {
+        return toAjax(scheduleArrangeService.updateScheduleArrange(scheduleArrange));
+    }
+
+    /**
+     * 删除日程安排
+     */
+    @PreAuthorize("@ss.hasPermi('major:arrange:remove')")
+    @Log(title = "日程安排", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{orginIds}")
+    public AjaxResult remove(@PathVariable String[] orginIds)
+    {
+        return toAjax(scheduleArrangeService.deleteScheduleArrangeByOrginIds(orginIds));
+    }
+}

admin-major/src/main/java/com/admin/major/domain/ScheduleArrange.java

@@ -0,0 +1,170 @@
+package com.admin.major.domain;
+
+import com.admin.common.annotation.Excel;
+import com.admin.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 日程安排对象 m_schedule_arrange
+ * 
+ * @author zewei
+ */
+public class ScheduleArrange extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 源数据id */
+    @Excel(name = "源数据id")
+    private String orginId;
+
+    /** 日程id */
+    @Excel(name = "日程id")
+    private Long scheduleId;
+
+    /** 日程名称 */
+    @Excel(name = "日程名称")
+    private String scheduleName;
+
+    /** 年份 */
+    @Excel(name = "年份")
+    private String year;
+
+    /** 开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date startDate;
+
+    /** 结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date endDate;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private Long status;
+
+    /** 更新用户 */
+    @Excel(name = "更新用户")
+    private String updateUserId;
+
+    /** 创建用户 */
+    @Excel(name = "创建用户")
+    private String createUserId;
+
+    /** 学院id */
+    @Excel(name = "学院id")
+    private Long collegeId;
+
+    public void setOrginId(String orginId) 
+    {
+        this.orginId = orginId;
+    }
+
+    public String getOrginId() 
+    {
+        return orginId;
+    }
+    public void setScheduleId(Long scheduleId) 
+    {
+        this.scheduleId = scheduleId;
+    }
+
+    public Long getScheduleId() 
+    {
+        return scheduleId;
+    }
+    public void setScheduleName(String scheduleName) 
+    {
+        this.scheduleName = scheduleName;
+    }
+
+    public String getScheduleName() 
+    {
+        return scheduleName;
+    }
+    public void setYear(String year) 
+    {
+        this.year = year;
+    }
+
+    public String getYear() 
+    {
+        return year;
+    }
+    public void setStartDate(Date startDate) 
+    {
+        this.startDate = startDate;
+    }
+
+    public Date getStartDate() 
+    {
+        return startDate;
+    }
+    public void setEndDate(Date endDate) 
+    {
+        this.endDate = endDate;
+    }
+
+    public Date getEndDate() 
+    {
+        return endDate;
+    }
+    public void setStatus(Long status) 
+    {
+        this.status = status;
+    }
+
+    public Long getStatus() 
+    {
+        return status;
+    }
+    public void setUpdateUserId(String updateUserId) 
+    {
+        this.updateUserId = updateUserId;
+    }
+
+    public String getUpdateUserId() 
+    {
+        return updateUserId;
+    }
+    public void setCreateUserId(String createUserId) 
+    {
+        this.createUserId = createUserId;
+    }
+
+    public String getCreateUserId() 
+    {
+        return createUserId;
+    }
+    public void setCollegeId(Long collegeId) 
+    {
+        this.collegeId = collegeId;
+    }
+
+    public Long getCollegeId() 
+    {
+        return collegeId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+            .append("orginId", getOrginId())
+            .append("scheduleId", getScheduleId())
+            .append("scheduleName", getScheduleName())
+            .append("year", getYear())
+            .append("startDate", getStartDate())
+            .append("endDate", getEndDate())
+            .append("status", getStatus())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("updateUserId", getUpdateUserId())
+            .append("createUserId", getCreateUserId())
+            .append("collegeId", getCollegeId())
+            .toString();
+    }
+}

admin-major/src/main/java/com/admin/major/mapper/ScheduleArrangeMapper.java

@@ -0,0 +1,61 @@
+package com.admin.major.mapper;
+
+import java.util.List;
+import com.admin.major.domain.ScheduleArrange;
+
+/**
+ * 日程安排Mapper接口
+ * 
+ * @author zewei
+ * @date 2022-03-20
+ */
+public interface ScheduleArrangeMapper 
+{
+    /**
+     * 查询日程安排
+     * 
+     * @param orginId 日程安排主键
+     * @return 日程安排
+     */
+    public ScheduleArrange selectScheduleArrangeByOrginId(String orginId);
+
+    /**
+     * 查询日程安排列表
+     * 
+     * @param scheduleArrange 日程安排
+     * @return 日程安排集合
+     */
+    public List<ScheduleArrange> selectScheduleArrangeList(ScheduleArrange scheduleArrange);
+
+    /**
+     * 新增日程安排
+     * 
+     * @param scheduleArrange 日程安排
+     * @return 结果
+     */
+    public int insertScheduleArrange(ScheduleArrange scheduleArrange);
+
+    /**
+     * 修改日程安排
+     * 
+     * @param scheduleArrange 日程安排
+     * @return 结果
+     */
+    public int updateScheduleArrange(ScheduleArrange scheduleArrange);
+
+    /**
+     * 删除日程安排
+     * 
+     * @param orginId 日程安排主键
+     * @return 结果
+     */
+    public int deleteScheduleArrangeByOrginId(String orginId);
+
+    /**
+     * 批量删除日程安排
+     * 
+     * @param orginIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteScheduleArrangeByOrginIds(String[] orginIds);
+}

admin-major/src/main/java/com/admin/major/service/IScheduleArrangeService.java

@@ -0,0 +1,61 @@
+package com.admin.major.service;
+
+import java.util.List;
+import com.admin.major.domain.ScheduleArrange;
+
+/**
+ * 日程安排Service接口
+ * 
+ * @author zewei
+ * @date 2022-03-20
+ */
+public interface IScheduleArrangeService 
+{
+    /**
+     * 查询日程安排
+     * 
+     * @param orginId 日程安排主键
+     * @return 日程安排
+     */
+    public ScheduleArrange selectScheduleArrangeByOrginId(String orginId);
+
+    /**
+     * 查询日程安排列表
+     * 
+     * @param scheduleArrange 日程安排
+     * @return 日程安排集合
+     */
+    public List<ScheduleArrange> selectScheduleArrangeList(ScheduleArrange scheduleArrange);
+
+    /**
+     * 新增日程安排
+     * 
+     * @param scheduleArrange 日程安排
+     * @return 结果
+     */
+    public int insertScheduleArrange(ScheduleArrange scheduleArrange);
+
+    /**
+     * 修改日程安排
+     * 
+     * @param scheduleArrange 日程安排
+     * @return 结果
+     */
+    public int updateScheduleArrange(ScheduleArrange scheduleArrange);
+
+    /**
+     * 批量删除日程安排
+     * 
+     * @param orginIds 需要删除的日程安排主键集合
+     * @return 结果
+     */
+    public int deleteScheduleArrangeByOrginIds(String[] orginIds);
+
+    /**
+     * 删除日程安排信息
+     * 
+     * @param orginId 日程安排主键
+     * @return 结果
+     */
+    public int deleteScheduleArrangeByOrginId(String orginId);
+}

admin-major/src/main/java/com/admin/major/service/impl/ScheduleArrangeServiceImpl.java

@@ -0,0 +1,96 @@
+package com.admin.major.service.impl;
+
+import java.util.List;
+import com.admin.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.admin.major.mapper.ScheduleArrangeMapper;
+import com.admin.major.domain.ScheduleArrange;
+import com.admin.major.service.IScheduleArrangeService;
+
+/**
+ * 日程安排Service业务层处理
+ * 
+ * @author zewei
+ * @date 2022-03-20
+ */
+@Service
+public class ScheduleArrangeServiceImpl implements IScheduleArrangeService 
+{
+    @Autowired
+    private ScheduleArrangeMapper scheduleArrangeMapper;
+
+    /**
+     * 查询日程安排
+     * 
+     * @param orginId 日程安排主键
+     * @return 日程安排
+     */
+    @Override
+    public ScheduleArrange selectScheduleArrangeByOrginId(String orginId)
+    {
+        return scheduleArrangeMapper.selectScheduleArrangeByOrginId(orginId);
+    }
+
+    /**
+     * 查询日程安排列表
+     * 
+     * @param scheduleArrange 日程安排
+     * @return 日程安排
+     */
+    @Override
+    public List<ScheduleArrange> selectScheduleArrangeList(ScheduleArrange scheduleArrange)
+    {
+        return scheduleArrangeMapper.selectScheduleArrangeList(scheduleArrange);
+    }
+
+    /**
+     * 新增日程安排
+     * 
+     * @param scheduleArrange 日程安排
+     * @return 结果
+     */
+    @Override
+    public int insertScheduleArrange(ScheduleArrange scheduleArrange)
+    {
+        scheduleArrange.setCreateTime(DateUtils.getNowDate());
+        return scheduleArrangeMapper.insertScheduleArrange(scheduleArrange);
+    }
+
+    /**
+     * 修改日程安排
+     * 
+     * @param scheduleArrange 日程安排
+     * @return 结果
+     */
+    @Override
+    public int updateScheduleArrange(ScheduleArrange scheduleArrange)
+    {
+        scheduleArrange.setUpdateTime(DateUtils.getNowDate());
+        return scheduleArrangeMapper.updateScheduleArrange(scheduleArrange);
+    }
+
+    /**
+     * 批量删除日程安排
+     * 
+     * @param orginIds 需要删除的日程安排主键
+     * @return 结果
+     */
+    @Override
+    public int deleteScheduleArrangeByOrginIds(String[] orginIds)
+    {
+        return scheduleArrangeMapper.deleteScheduleArrangeByOrginIds(orginIds);
+    }
+
+    /**
+     * 删除日程安排信息
+     * 
+     * @param orginId 日程安排主键
+     * @return 结果
+     */
+    @Override
+    public int deleteScheduleArrangeByOrginId(String orginId)
+    {
+        return scheduleArrangeMapper.deleteScheduleArrangeByOrginId(orginId);
+    }
+}

admin-major/src/main/resources/mapper/major/ScheduleArrangeMapper.xml

@@ -0,0 +1,107 @@
+<?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.admin.major.mapper.ScheduleArrangeMapper">
+    
+    <resultMap type="ScheduleArrange" id="ScheduleArrangeResult">
+        <result property="orginId"    column="orgin_id"    />
+        <result property="scheduleId"    column="schedule_id"    />
+        <result property="scheduleName"    column="schedule_name"    />
+        <result property="year"    column="year"    />
+        <result property="startDate"    column="start_date"    />
+        <result property="endDate"    column="end_date"    />
+        <result property="status"    column="status"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="updateUserId"    column="update_user_id"    />
+        <result property="createUserId"    column="create_user_id"    />
+        <result property="collegeId"    column="college_id"    />
+    </resultMap>
+
+    <sql id="selectScheduleArrangeVo">
+        select orgin_id, schedule_id, schedule_name, year, start_date, end_date, status, create_time, update_time, update_user_id, create_user_id, college_id from m_schedule_arrange
+    </sql>
+
+    <select id="selectScheduleArrangeList" parameterType="ScheduleArrange" resultMap="ScheduleArrangeResult">
+        <include refid="selectScheduleArrangeVo"/>
+        <where>  
+            <if test="orginId != null  and orginId != ''"> and orgin_id = #{orginId}</if>
+            <if test="scheduleId != null "> and schedule_id = #{scheduleId}</if>
+            <if test="scheduleName != null  and scheduleName != ''"> and schedule_name like concat('%', #{scheduleName}, '%')</if>
+            <if test="year != null  and year != ''"> and year = #{year}</if>
+            <if test="startDate != null "> and start_date = #{startDate}</if>
+            <if test="endDate != null "> and end_date = #{endDate}</if>
+            <if test="status != null "> and status = #{status}</if>
+            <if test="updateUserId != null  and updateUserId != ''"> and update_user_id = #{updateUserId}</if>
+            <if test="createUserId != null  and createUserId != ''"> and create_user_id = #{createUserId}</if>
+            <if test="collegeId != null "> and college_id = #{collegeId}</if>
+        </where>
+    </select>
+    
+    <select id="selectScheduleArrangeByOrginId" parameterType="String" resultMap="ScheduleArrangeResult">
+        <include refid="selectScheduleArrangeVo"/>
+        where orgin_id = #{orginId}
+    </select>
+        
+    <insert id="insertScheduleArrange" parameterType="ScheduleArrange">
+        insert into m_schedule_arrange
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="orginId != null">orgin_id,</if>
+            <if test="scheduleId != null">schedule_id,</if>
+            <if test="scheduleName != null">schedule_name,</if>
+            <if test="year != null">year,</if>
+            <if test="startDate != null">start_date,</if>
+            <if test="endDate != null">end_date,</if>
+            <if test="status != null">status,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="updateUserId != null">update_user_id,</if>
+            <if test="createUserId != null">create_user_id,</if>
+            <if test="collegeId != null">college_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="orginId != null">#{orginId},</if>
+            <if test="scheduleId != null">#{scheduleId},</if>
+            <if test="scheduleName != null">#{scheduleName},</if>
+            <if test="year != null">#{year},</if>
+            <if test="startDate != null">#{startDate},</if>
+            <if test="endDate != null">#{endDate},</if>
+            <if test="status != null">#{status},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="updateUserId != null">#{updateUserId},</if>
+            <if test="createUserId != null">#{createUserId},</if>
+            <if test="collegeId != null">#{collegeId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateScheduleArrange" parameterType="ScheduleArrange">
+        update m_schedule_arrange
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="scheduleId != null">schedule_id = #{scheduleId},</if>
+            <if test="scheduleName != null">schedule_name = #{scheduleName},</if>
+            <if test="year != null">year = #{year},</if>
+            <if test="startDate != null">start_date = #{startDate},</if>
+            <if test="endDate != null">end_date = #{endDate},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="updateUserId != null">update_user_id = #{updateUserId},</if>
+            <if test="createUserId != null">create_user_id = #{createUserId},</if>
+            <if test="collegeId != null">college_id = #{collegeId},</if>
+        </trim>
+        where orgin_id = #{orginId}
+    </update>
+
+    <delete id="deleteScheduleArrangeByOrginId" parameterType="String">
+        delete from m_schedule_arrange where orgin_id = #{orginId}
+    </delete>
+
+    <delete id="deleteScheduleArrangeByOrginIds" parameterType="String">
+        delete from m_schedule_arrange where orgin_id in 
+        <foreach item="orginId" collection="array" open="(" separator="," close=")">
+            #{orginId}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -32,7 +32,7 @@ public class SwaggerConfig
 {
     /** 系统基础配置 */
     @Autowired
-    private AdminConfig ruoyiConfig;
+    private AdminConfig adminConfig;
 
     /** 是否开启swagger */
     @Value("${swagger.enabled}")
@@ -113,13 +113,13 @@ public class SwaggerConfig
         // 用ApiInfoBuilder进行定制
         return new ApiInfoBuilder()
                 // 设置标题
-                .title("标题：若依管理系统_接口文档")
+                .title("水利学院")
                 // 描述
-                .description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...")
+                .description("专业自动分流")
                 // 作者信息
-                .contact(new Contact(ruoyiConfig.getName(), null, null))
+                .contact(new Contact(adminConfig.getName(), null, null))
                 // 版本
-                .version("版本号:" + ruoyiConfig.getVersion())
+                .version("版本号:" + adminConfig.getVersion())
                 .build();
     }
 }

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

@@ -89,7 +89,7 @@ token:
     # 令牌密钥
     secret: abcdefghijklmnopqrstuvwxyz
     # 令牌有效期（默认30分钟）
-    expireTime: 30
+    expireTime: 60
   
 # MyBatis配置
 mybatis:

admin-ui/src/api/major/arrange.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询日程安排列表
+export function listArrange(query) {
+  return request({
+    url: '/major/arrange/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询日程安排详细
+export function getArrange(orginId) {
+  return request({
+    url: '/major/arrange/' + orginId,
+    method: 'get'
+  })
+}
+
+// 新增日程安排
+export function addArrange(data) {
+  return request({
+    url: '/major/arrange',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改日程安排
+export function updateArrange(data) {
+  return request({
+    url: '/major/arrange',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除日程安排
+export function delArrange(orginId) {
+  return request({
+    url: '/major/arrange/' + orginId,
+    method: 'delete'
+  })
+}

admin-ui/src/views/major/arrange/index.vue

@@ -0,0 +1,385 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="源数据id" prop="orginId">
+        <el-input
+          v-model="queryParams.orginId"
+          placeholder="请输入源数据id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="日程id" prop="scheduleId">
+        <el-input
+          v-model="queryParams.scheduleId"
+          placeholder="请输入日程id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="日程名称" prop="scheduleName">
+        <el-input
+          v-model="queryParams.scheduleName"
+          placeholder="请输入日程名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="年份" prop="year">
+        <el-input
+          v-model="queryParams.year"
+          placeholder="请输入年份"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="开始时间" prop="startDate">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.startDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择开始时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="结束时间" prop="endDate">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.endDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择结束时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="更新用户" prop="updateUserId">
+        <el-input
+          v-model="queryParams.updateUserId"
+          placeholder="请输入更新用户"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建用户" prop="createUserId">
+        <el-input
+          v-model="queryParams.createUserId"
+          placeholder="请输入创建用户"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="学院id" prop="collegeId">
+        <el-input
+          v-model="queryParams.collegeId"
+          placeholder="请输入学院id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['major:arrange:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['major:arrange:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['major:arrange:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['major:arrange:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="arrangeList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="源数据id" align="center" prop="orginId" />
+      <el-table-column label="日程id" align="center" prop="scheduleId" />
+      <el-table-column label="日程名称" align="center" prop="scheduleName" />
+      <el-table-column label="年份" align="center" prop="year" />
+      <el-table-column label="开始时间" align="center" prop="startDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="结束时间" align="center" prop="endDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="status" />
+      <el-table-column label="更新用户" align="center" prop="updateUserId" />
+      <el-table-column label="创建用户" align="center" prop="createUserId" />
+      <el-table-column label="学院id" align="center" prop="collegeId" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['major:arrange:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['major:arrange:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改日程安排对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="源数据id" prop="orginId">
+          <el-input v-model="form.orginId" placeholder="请输入源数据id" />
+        </el-form-item>
+        <el-form-item label="日程id" prop="scheduleId">
+          <el-input v-model="form.scheduleId" placeholder="请输入日程id" />
+        </el-form-item>
+        <el-form-item label="日程名称" prop="scheduleName">
+          <el-input v-model="form.scheduleName" placeholder="请输入日程名称" />
+        </el-form-item>
+        <el-form-item label="年份" prop="year">
+          <el-input v-model="form.year" placeholder="请输入年份" />
+        </el-form-item>
+        <el-form-item label="开始时间" prop="startDate">
+          <el-date-picker clearable size="small"
+            v-model="form.startDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择开始时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束时间" prop="endDate">
+          <el-date-picker clearable size="small"
+            v-model="form.endDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择结束时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="更新用户" prop="updateUserId">
+          <el-input v-model="form.updateUserId" placeholder="请输入更新用户" />
+        </el-form-item>
+        <el-form-item label="创建用户" prop="createUserId">
+          <el-input v-model="form.createUserId" placeholder="请输入创建用户" />
+        </el-form-item>
+        <el-form-item label="学院id" prop="collegeId">
+          <el-input v-model="form.collegeId" placeholder="请输入学院id" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listArrange, getArrange, delArrange, addArrange, updateArrange } from "@/api/major/arrange";
+
+export default {
+  name: "Arrange",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 日程安排表格数据
+      arrangeList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        orginId: null,
+        scheduleId: null,
+        scheduleName: null,
+        year: null,
+        startDate: null,
+        endDate: null,
+        status: null,
+        updateUserId: null,
+        createUserId: null,
+        collegeId: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询日程安排列表 */
+    getList() {
+      this.loading = true;
+      listArrange(this.queryParams).then(response => {
+        this.arrangeList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        orginId: null,
+        scheduleId: null,
+        scheduleName: null,
+        year: null,
+        startDate: null,
+        endDate: null,
+        status: 0,
+        createTime: null,
+        updateTime: null,
+        updateUserId: null,
+        createUserId: null,
+        collegeId: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.orginId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加日程安排";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const orginId = row.orginId || this.ids
+      getArrange(orginId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改日程安排";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.orginId != null) {
+            updateArrange(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addArrange(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const orginIds = row.orginId || this.ids;
+      this.$modal.confirm('是否确认删除日程安排编号为"' + orginIds + '"的数据项？').then(function() {
+        return delArrange(orginIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('major/arrange/export', {
+        ...this.queryParams
+      }, `arrange_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

doc/开发流程.md

@@ -0,0 +1,28 @@
+##前言
+代码生成工具本质是提升开发效率，不是代替开发过程，所以并不能尽善尽美
+
+##生成代码
+注意事项：代码工具本身只对 主键和createTime字段做了特殊处理
+需要自定义模板时请看 admin-generator/src/main/resources
+
+###进入代码生成页面
+![img.png](img.png)
+
+###配置页面展示的内容
+红框中选择适合场景下出现的值
+
+![img_1.png](img_1.png)
+
+###配置生成参数
+![img_2.png](img_2.png)
+
+###导出代码
+下载的zip包解压后，复制到对应路径下即可直接使用
+![img_4.png](img_4.png)
+
+
+###新增一个菜单
+![img_3.png](img_3.png)
+
+###访问页面
+![img_5.png](img_5.png)

pom.xml

@@ -192,6 +192,13 @@
                 <version>${admin.version}</version>
             </dependency>
 
+            <!-- 系统模块-->
+            <dependency>
+                <groupId>com.admin</groupId>
+                <artifactId>admin-major</artifactId>
+                <version>${admin.version}</version>
+            </dependency>
+
             <!-- 通用工具-->
             <dependency>
                 <groupId>com.admin</groupId>
@@ -209,6 +216,7 @@
         <module>admin-quartz</module>
         <module>admin-generator</module>
         <module>admin-common</module>
+        <module>admin-major</module>
     </modules>
     <packaging>pom</packaging>
 

sql/major.sql

@@ -9,15 +9,19 @@ drop table if exists m_schedule_arrange;
 drop table if exists m_special_apply;
 
 drop table if exists m_student_info;
+
+
 /*==============================================================*/
 /* Table: m_adjust_result                                       */
 /*==============================================================*/
 create table m_adjust_result
 (
-   batch_id             char(8),
-   student_id           varchar(32),
-   admit_major_id       varchar(32),
-   special_flag         char(1)
+    batch_id             char(8) comment '分流批次',
+    student_id           varchar(32) comment '学生id',
+    admit_major_id       varchar(32) comment '录取专业',
+    special_flag         tinyint comment '是否特殊审批',
+    adjust_flag          tinyint comment '是否调剂分配',
+    college_id           bigint(20) comment '学院id'
 );
 
 alter table m_adjust_result comment '分流结果表';
@@ -27,20 +31,19 @@ alter table m_adjust_result comment '分流结果表';
 /*==============================================================*/
 create table m_major_apply
 (
-   major_apply_id       varchar(32),
-   student_id           varchar(32),
-   major_id_1st         varchar(32),
-   major_id_2nd         varchar(32),
-   major_id_3rd         varchar(32),
-   major_id_4th         varchar(32),
-   major_id_5th         varchar(32),
-   sign                 text,
-   apply_status         char(1),
-   status               char(1),
-   adjust_flag          char(1),
-   apply_date           datetime,
-   create_time          datetime,
-   update_time          datetime
+    major_apply_id       varchar(32),
+    student_id           varchar(32) comment '学生id',
+    major_id_1st         varchar(32) comment '第一志愿',
+    major_id_2nd         varchar(32) comment '第二志愿',
+    major_id_3rd         varchar(32) comment '第三志愿',
+    major_id_4th         varchar(32) comment '第四志愿',
+    major_id_5th         varchar(32) comment '第五志愿',
+    sign                 text comment '学生签名',
+    apply_status         char(1) comment '申请状态（0未提交 1已提交 2通过 3驳回）',
+    status               char(1) comment '状态（1启用 0弃用）',
+    apply_date           datetime comment '申请时间',
+    create_time          datetime comment '创建时间',
+    update_time          datetime comment '更新时间'
 );
 
 alter table m_major_apply comment '专业分流申请表';
@@ -50,13 +53,15 @@ alter table m_major_apply comment '专业分流申请表';
 /*==============================================================*/
 create table m_major_info
 (
-   major_id             varchar(32),
-   major_name           varchar(32),
-   plan_num             int,
-   status               char(1),
-   create_time          datetime,
-   update_time          datetime,
-   update_user_id       varchar(32)
+    major_id             varchar(32) comment '专业id',
+    major_name           varchar(32) comment '专业名称',
+    plan_num             int comment '计划数',
+    status               char(1) comment '状态',
+    create_time          datetime comment '创建时间',
+    update_time          datetime comment '更新时间',
+    update_user_id       varchar(32) comment '更新用户',
+    create_user_id       varchar(32) comment '创建用户',
+    college_id           bigint(20) comment '学院id'
 );
 
 alter table m_major_info comment '专业信息表';
@@ -66,14 +71,18 @@ alter table m_major_info comment '专业信息表';
 /*==============================================================*/
 create table m_schedule_arrange
 (
-   schedule_id          int,
-   schedule_name        varchar(32),
-   start_date           date,
-   end_date             date,
-   create_time          datetime,
-   update_time          datetime,
-   update_user_id       datetime,
-   status               char(1)
+    orgin_id             varchar(32) comment '源数据id',
+    schedule_id          int comment '日程id',
+    schedule_name        varchar(32) comment '日程名称',
+    year                 varchar(4) comment '年份',
+    start_date           date comment '开始时间',
+    end_date             date comment '结束时间',
+    status               tinyint comment '状态',
+    create_time          datetime comment '创建时间',
+    update_time          datetime comment '更新时间',
+    update_user_id       varchar(32) comment '更新用户',
+    create_user_id       varchar(32) comment '创建用户',
+    college_id           bigint(20) comment '学院id'
 );
 
 alter table m_schedule_arrange comment '日程安排';
@@ -83,20 +92,21 @@ alter table m_schedule_arrange comment '日程安排';
 /*==============================================================*/
 create table m_special_apply
 (
-   special_apply_id     varchar(32),
-   student_id           varchar(32),
-   major_id             varchar(32),
-   apply_reason         text,
-   college_opinion      text,
-   aca_affairs_opinion  text,
-   leader_opinion       text,
-   sign                 text,
-   guardin_sign         text,
-   apply_status         char(1),
-   status               char(1),
-   apply_date           datetime,
-   create_time          datetime,
-   update_time          datetime
+    special_apply_id     varchar(32),
+    student_id           varchar(32) comment '学生id',
+    major_id             varchar(32) comment '专业id',
+    apply_reason         text comment '申请原因',
+    college_opinion      text comment '学院意见（保留字段）',
+    aca_affairs_opinion  text comment '教导处意见（保留字段）',
+    leader_opinion       text comment '领导意见（保留字段）',
+    sign                 text comment '学生签名',
+    guardin_sign         text comment '领导签名',
+    apply_status         char(1) comment '申请状态（0未提交 1已提交 2通过 3驳回）',
+    status               char(1) comment '状态（1启用 0弃用）',
+    apply_date           datetime comment '提交时间',
+    create_time          datetime comment '创建时间',
+    update_time          datetime comment '更新时间',
+    update_user_id       char(10) comment '更新用户'
 );
 
 alter table m_special_apply comment '特别申请';
@@ -106,16 +116,22 @@ alter table m_special_apply comment '特别申请';
 /*==============================================================*/
 create table m_student_info
 (
-   student_id           varchar(32),
-   student_name         char(10),
-   class_name           varchar(32),
-   score                decimal(4,4),
-   rank                 int,
-   phone                char(11),
-   gender               char(1),
-   guardian_phone        char(11),
-   create_time          datetime,
-   update_time          datetime
+    orgin_id             varchar(32) comment '源数据id',
+    open_id              varchar(48),
+    student_id           varchar(32) comment '学号',
+    student_name         char(10) comment '学生名称',
+    class_name           varchar(32) comment '班级名称',
+    score                decimal(4,4) comment '绩点',
+    `rank`                 int comment '排名',
+    phonenumber          char(11) comment '联系号码',
+    email                varchar(50) comment '邮箱',
+    gender               char(1) comment '性别',
+    guardian_phone       char(11) comment '监护人号码',
+    create_time          datetime comment '创建时间',
+    update_time          datetime comment '更新时间',
+    create_user_id       varchar(32) comment '创建用户',
+    update_user_id       varchar(32) comment '更新用户id',
+    college_id           bigint(20) comment '学院id'
 );
 
 alter table m_student_info comment '学生信息表';