Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/interview/InterviewTableController.java

@@ -0,0 +1,106 @@
+package com.ruoyi.web.controller.interview;
+
+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.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.InterviewTable;
+import com.ruoyi.system.service.IInterviewTableService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 网页访问记录Controller
+ * 
+ * @author ruoyi
+ * @date 2023-10-16
+ */
+@RestController
+@RequestMapping("/interview/table")
+public class InterviewTableController extends BaseController
+{
+    @Autowired
+    private IInterviewTableService interviewTableService;
+
+    /**
+     * 查询网页访问记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('interview:table:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(InterviewTable interviewTable)
+    {
+        startPage();
+        List<InterviewTable> list = interviewTableService.selectInterviewTableList(interviewTable);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出网页访问记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('interview:table:export')")
+    @Log(title = "网页访问记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, InterviewTable interviewTable)
+    {
+        List<InterviewTable> list = interviewTableService.selectInterviewTableList(interviewTable);
+        ExcelUtil<InterviewTable> util = new ExcelUtil<InterviewTable>(InterviewTable.class);
+        util.exportExcel(response, list, "网页访问记录数据");
+    }
+
+    /**
+     * 获取网页访问记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('interview:table:query')")
+    @GetMapping(value = "/{interviewId}")
+    public AjaxResult getInfo(@PathVariable("interviewId") Long interviewId)
+    {
+        return success(interviewTableService.selectInterviewTableByInterviewId(interviewId));
+    }
+
+    /**
+     * 新增网页访问记录
+     */
+    @PreAuthorize("@ss.hasPermi('interview:table:add')")
+    @Log(title = "网页访问记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody InterviewTable interviewTable)
+    {
+        return toAjax(interviewTableService.insertInterviewTable(interviewTable));
+    }
+
+    /**
+     * 修改网页访问记录
+     */
+    @PreAuthorize("@ss.hasPermi('interview:table:edit')")
+    @Log(title = "网页访问记录", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody InterviewTable interviewTable)
+    {
+        return toAjax(interviewTableService.updateInterviewTable(interviewTable));
+    }
+
+    /**
+     * 删除网页访问记录
+     */
+    @PreAuthorize("@ss.hasPermi('interview:table:remove')")
+    @Log(title = "网页访问记录", businessType = BusinessType.DELETE)
+	@GetMapping("/delete/{interviewIds}")
+    public AjaxResult remove(@PathVariable Long[] interviewIds)
+    {
+        return toAjax(interviewTableService.deleteInterviewTableByInterviewIds(interviewIds));
+    }
+
+
+}

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

@@ -20,7 +20,7 @@ spring:
     basename: i18n/messages
   profiles:
     active: druid
-    #active: prod
+    # active: prod
   # 文件上传
   servlet:
     multipart:

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

@@ -0,0 +1,112 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 网页访问记录对象 interview_table
+ * 
+ * @author ruoyi
+ * @date 2023-10-16
+ */
+public class InterviewTable extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long interviewId;
+
+    /** 设备id */
+    @Excel(name = "设备id")
+    private String equipmentId;
+
+    /** 访问时间（分钟，保留两位小数） */
+    @Excel(name = "访问时间")
+    private String interviewTime;
+
+    /** 年 */
+    @Excel(name = "年")
+    private String year;
+
+    /** 月 */
+    @Excel(name = "月")
+    private String month;
+
+    /** 日 */
+    @Excel(name = "日")
+    private String day;
+
+    public void setInterviewId(Long interviewId) 
+    {
+        this.interviewId = interviewId;
+    }
+
+    public Long getInterviewId() 
+    {
+        return interviewId;
+    }
+    public void setEquipmentId(String equipmentId) 
+    {
+        this.equipmentId = equipmentId;
+    }
+
+    public String getEquipmentId() 
+    {
+        return equipmentId;
+    }
+    public void setInterviewTime(String interviewTime) 
+    {
+        this.interviewTime = interviewTime;
+    }
+
+    public String getInterviewTime() 
+    {
+        return interviewTime;
+    }
+    public void setYear(String year) 
+    {
+        this.year = year;
+    }
+
+    public String getYear() 
+    {
+        return year;
+    }
+    public void setMonth(String month) 
+    {
+        this.month = month;
+    }
+
+    public String getMonth() 
+    {
+        return month;
+    }
+    public void setDay(String day) 
+    {
+        this.day = day;
+    }
+
+    public String getDay() 
+    {
+        return day;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("interviewId", getInterviewId())
+            .append("equipmentId", getEquipmentId())
+            .append("interviewTime", getInterviewTime())
+            .append("year", getYear())
+            .append("month", getMonth())
+            .append("day", getDay())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.InterviewTable;
+
+/**
+ * 网页访问记录Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-10-16
+ */
+public interface InterviewTableMapper 
+{
+    /**
+     * 查询网页访问记录
+     * 
+     * @param interviewId 网页访问记录主键
+     * @return 网页访问记录
+     */
+    public InterviewTable selectInterviewTableByInterviewId(Long interviewId);
+
+    /**
+     * 查询网页访问记录列表
+     * 
+     * @param interviewTable 网页访问记录
+     * @return 网页访问记录集合
+     */
+    public List<InterviewTable> selectInterviewTableList(InterviewTable interviewTable);
+
+    /**
+     * 新增网页访问记录
+     * 
+     * @param interviewTable 网页访问记录
+     * @return 结果
+     */
+    public int insertInterviewTable(InterviewTable interviewTable);
+
+    /**
+     * 修改网页访问记录
+     * 
+     * @param interviewTable 网页访问记录
+     * @return 结果
+     */
+    public int updateInterviewTable(InterviewTable interviewTable);
+
+    /**
+     * 删除网页访问记录
+     * 
+     * @param interviewId 网页访问记录主键
+     * @return 结果
+     */
+    public int deleteInterviewTableByInterviewId(Long interviewId);
+
+    /**
+     * 批量删除网页访问记录
+     * 
+     * @param interviewIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteInterviewTableByInterviewIds(Long[] interviewIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.InterviewTable;
+
+/**
+ * 网页访问记录Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-10-16
+ */
+public interface IInterviewTableService 
+{
+    /**
+     * 查询网页访问记录
+     * 
+     * @param interviewId 网页访问记录主键
+     * @return 网页访问记录
+     */
+    public InterviewTable selectInterviewTableByInterviewId(Long interviewId);
+
+    /**
+     * 查询网页访问记录列表
+     * 
+     * @param interviewTable 网页访问记录
+     * @return 网页访问记录集合
+     */
+    public List<InterviewTable> selectInterviewTableList(InterviewTable interviewTable);
+
+    /**
+     * 新增网页访问记录
+     * 
+     * @param interviewTable 网页访问记录
+     * @return 结果
+     */
+    public int insertInterviewTable(InterviewTable interviewTable);
+
+    /**
+     * 修改网页访问记录
+     * 
+     * @param interviewTable 网页访问记录
+     * @return 结果
+     */
+    public int updateInterviewTable(InterviewTable interviewTable);
+
+    /**
+     * 批量删除网页访问记录
+     * 
+     * @param interviewIds 需要删除的网页访问记录主键集合
+     * @return 结果
+     */
+    public int deleteInterviewTableByInterviewIds(Long[] interviewIds);
+
+    /**
+     * 删除网页访问记录信息
+     * 
+     * @param interviewId 网页访问记录主键
+     * @return 结果
+     */
+    public int deleteInterviewTableByInterviewId(Long interviewId);
+}

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

@@ -0,0 +1,107 @@
+package com.ruoyi.system.service.impl;
+
+import java.time.LocalDate;
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.InterviewTableMapper;
+import com.ruoyi.system.domain.InterviewTable;
+import com.ruoyi.system.service.IInterviewTableService;
+
+/**
+ * 网页访问记录Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2023-10-16
+ */
+@Service
+public class InterviewTableServiceImpl implements IInterviewTableService 
+{
+    @Autowired
+    private InterviewTableMapper interviewTableMapper;
+
+    /**
+     * 查询网页访问记录
+     * 
+     * @param interviewId 网页访问记录主键
+     * @return 网页访问记录
+     */
+    @Override
+    public InterviewTable selectInterviewTableByInterviewId(Long interviewId)
+    {
+        return interviewTableMapper.selectInterviewTableByInterviewId(interviewId);
+    }
+
+    /**
+     * 查询网页访问记录列表
+     * 
+     * @param interviewTable 网页访问记录
+     * @return 网页访问记录
+     */
+    @Override
+    public List<InterviewTable> selectInterviewTableList(InterviewTable interviewTable)
+    {
+        return interviewTableMapper.selectInterviewTableList(interviewTable);
+    }
+
+    /**
+     * 新增网页访问记录
+     * 
+     * @param interviewTable 网页访问记录
+     * @return 结果
+     */
+    @Override
+    public int insertInterviewTable(InterviewTable interviewTable)
+    {
+        String time = DateUtils.getDate();
+        //获取年
+        String year = time.split("-")[0];
+        interviewTable.setYear(year);
+        //获取月
+        String month = time.split("-")[2];
+        interviewTable.setMonth(month);
+        //获取日
+        String date = time.split("-")[3];
+        interviewTable.setDay(date);
+        interviewTable.setCreateTime(DateUtils.getNowDate());
+        return interviewTableMapper.insertInterviewTable(interviewTable);
+    }
+
+    /**
+     * 修改网页访问记录
+     * 
+     * @param interviewTable 网页访问记录
+     * @return 结果
+     */
+    @Override
+    public int updateInterviewTable(InterviewTable interviewTable)
+    {
+        interviewTable.setUpdateTime(DateUtils.getNowDate());
+        return interviewTableMapper.updateInterviewTable(interviewTable);
+    }
+
+    /**
+     * 批量删除网页访问记录
+     * 
+     * @param interviewIds 需要删除的网页访问记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteInterviewTableByInterviewIds(Long[] interviewIds)
+    {
+        return interviewTableMapper.deleteInterviewTableByInterviewIds(interviewIds);
+    }
+
+    /**
+     * 删除网页访问记录信息
+     * 
+     * @param interviewId 网页访问记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteInterviewTableByInterviewId(Long interviewId)
+    {
+        return interviewTableMapper.deleteInterviewTableByInterviewId(interviewId);
+    }
+}

ruoyi-system/src/main/resources/mapper/system/InterviewTableMapper.xml

@@ -0,0 +1,96 @@
+<?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.ruoyi.system.mapper.InterviewTableMapper">
+    
+    <resultMap type="InterviewTable" id="InterviewTableResult">
+        <result property="interviewId"    column="interview_id"    />
+        <result property="equipmentId"    column="equipment_id"    />
+        <result property="interviewTime"    column="interview_time"    />
+        <result property="year"    column="year"    />
+        <result property="month"    column="month"    />
+        <result property="day"    column="day"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectInterviewTableVo">
+        select interview_id, equipment_id, interview_time, year, month, day, create_by, create_time, update_by, update_time, remark from interview_table
+    </sql>
+
+    <select id="selectInterviewTableList" parameterType="InterviewTable" resultMap="InterviewTableResult">
+        <include refid="selectInterviewTableVo"/>
+        <where>  
+            <if test="equipmentId != null  and equipmentId != ''"> and equipment_id = #{equipmentId}</if>
+            <if test="interviewTime != null  and interviewTime != ''"> and interview_time = #{interviewTime}</if>
+            <if test="year != null  and year != ''"> and year = #{year}</if>
+            <if test="month != null  and month != ''"> and month = #{month}</if>
+            <if test="day != null  and day != ''"> and day = #{day}</if>
+        </where>
+    </select>
+    
+    <select id="selectInterviewTableByInterviewId" parameterType="Long" resultMap="InterviewTableResult">
+        <include refid="selectInterviewTableVo"/>
+        where interview_id = #{interviewId}
+    </select>
+        
+    <insert id="insertInterviewTable" parameterType="InterviewTable" useGeneratedKeys="true" keyProperty="interviewId">
+        insert into interview_table
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="equipmentId != null">equipment_id,</if>
+            <if test="interviewTime != null">interview_time,</if>
+            <if test="year != null">year,</if>
+            <if test="month != null">month,</if>
+            <if test="day != null">day,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="equipmentId != null">#{equipmentId},</if>
+            <if test="interviewTime != null">#{interviewTime},</if>
+            <if test="year != null">#{year},</if>
+            <if test="month != null">#{month},</if>
+            <if test="day != null">#{day},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateInterviewTable" parameterType="InterviewTable">
+        update interview_table
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="equipmentId != null">equipment_id = #{equipmentId},</if>
+            <if test="interviewTime != null">interview_time = #{interviewTime},</if>
+            <if test="year != null">year = #{year},</if>
+            <if test="month != null">month = #{month},</if>
+            <if test="day != null">day = #{day},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where interview_id = #{interviewId}
+    </update>
+
+    <delete id="deleteInterviewTableByInterviewId" parameterType="Long">
+        delete from interview_table where interview_id = #{interviewId}
+    </delete>
+
+    <delete id="deleteInterviewTableByInterviewIds" parameterType="String">
+        delete from interview_table where interview_id in 
+        <foreach item="interviewId" collection="array" open="(" separator="," close=")">
+            #{interviewId}
+        </foreach>
+    </delete>
+</mapper>