fix: 新增清除异常接口

guzijian
1 parent 7330037d
Showing 9 changed files with 513 additions and 3 deletions
ruoyi-admin/src/main/java/com/ruoyi/num/controller/RuleNumController.java
ruoyi-admin/src/main/java/com/ruoyi/num/domain/RuleNum.java
ruoyi-admin/src/main/java/com/ruoyi/num/mapper/RuleNumMapper.java
ruoyi-admin/src/main/java/com/ruoyi/num/service/IRuleNumService.java
ruoyi-admin/src/main/java/com/ruoyi/num/service/impl/RuleNumServiceImpl.java
ruoyi-admin/src/main/resources/application-druid-prd.yml
ruoyi-admin/src/main/resources/keystore.jks
ruoyi-admin/src/main/resources/logback.xml
ruoyi-admin/src/main/resources/mapper/num/RuleNumMapper.xml
+package com.ruoyi.num.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.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.num.domain.RuleNum;
+import com.ruoyi.num.service.IRuleNumService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 班次管理Controller
+ * 
+ * @author guzijian
+ * @date 2023-08-03
+ */
+@RestController
+@RequestMapping("/num/num")
+public class RuleNumController extends BaseController
+{
+    @Autowired
+    private IRuleNumService ruleNumService;
+
+    /**
+     * 查询班次管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('num:num:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(RuleNum ruleNum)
+    {
+        startPage();
+        List<RuleNum> list = ruleNumService.selectRuleNumList(ruleNum);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出班次管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('num:num:export')")
+    @Log(title = "班次管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, RuleNum ruleNum)
+    {
+        List<RuleNum> list = ruleNumService.selectRuleNumList(ruleNum);
+        ExcelUtil<RuleNum> util = new ExcelUtil<RuleNum>(RuleNum.class);
+        util.exportExcel(response, list, "班次管理数据");
+    }
+
+    /**
+     * 获取班次管理详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('num:num:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(ruleNumService.selectRuleNumById(id));
+    }
+
+    /**
+     * 新增班次管理
+     */
+    @PreAuthorize("@ss.hasPermi('num:num:add')")
+    @Log(title = "班次管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody RuleNum ruleNum)
+    {
+        return toAjax(ruleNumService.insertRuleNum(ruleNum));
+    }
+
+    /**
+     * 修改班次管理
+     */
+    @PreAuthorize("@ss.hasPermi('num:num:edit')")
+    @Log(title = "班次管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody RuleNum ruleNum)
+    {
+        return toAjax(ruleNumService.updateRuleNum(ruleNum));
+    }
+
+    /**
+     * 删除班次管理
+     */
+    @PreAuthorize("@ss.hasPermi('num:num:remove')")
+    @Log(title = "班次管理", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(ruleNumService.deleteRuleNumByIds(ids));
+    }
+}
+package com.ruoyi.num.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;
+
+/**
+ * 班次管理对象 rule_num
+ * 
+ * @author guzijian
+ * @date 2023-08-03
+ */
+public class RuleNum extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long id;
+
+    /** 班型名称 */
+    @Excel(name = "班型名称")
+    private String ruleDictName;
+
+    /** 班次类型 */
+    @Excel(name = "班次类型")
+    private Long ruleType;
+
+    /** 工作天数 */
+    @Excel(name = "工作天数")
+    private Long workDay;
+
+    /** 休息天数 */
+    @Excel(name = "休息天数")
+    private Long freeDay;
+
+    /** 星期翻班详情 */
+    @Excel(name = "星期翻班详情")
+    private String ruleWeek;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setRuleDictName(String ruleDictName)
+    {
+        this.ruleDictName = ruleDictName;
+    }
+
+    public String getRuleDictName()
+    {
+        return ruleDictName;
+    }
+    public void setRuleType(Long ruleType) 
+    {
+        this.ruleType = ruleType;
+    }
+
+    public Long getRuleType() 
+    {
+        return ruleType;
+    }
+    public void setWorkDay(Long workDay) 
+    {
+        this.workDay = workDay;
+    }
+
+    public Long getWorkDay() 
+    {
+        return workDay;
+    }
+    public void setFreeDay(Long freeDay) 
+    {
+        this.freeDay = freeDay;
+    }
+
+    public Long getFreeDay() 
+    {
+        return freeDay;
+    }
+    public void setRuleWeek(String ruleWeek) 
+    {
+        this.ruleWeek = ruleWeek;
+    }
+
+    public String getRuleWeek() 
+    {
+        return ruleWeek;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("ruleDictName", getRuleDictName())
+            .append("ruleType", getRuleType())
+            .append("workDay", getWorkDay())
+            .append("freeDay", getFreeDay())
+            .append("ruleWeek", getRuleWeek())
+            .toString();
+    }
+}
+package com.ruoyi.num.mapper;
+
+import java.util.List;
+import com.ruoyi.num.domain.RuleNum;
+
+/**
+ * 班次管理Mapper接口
+ * 
+ * @author guzijian
+ * @date 2023-08-03
+ */
+public interface RuleNumMapper 
+{
+    /**
+     * 查询班次管理
+     * 
+     * @param id 班次管理主键
+     * @return 班次管理
+     */
+    public RuleNum selectRuleNumById(Long id);
+
+    /**
+     * 查询班次管理列表
+     * 
+     * @param ruleNum 班次管理
+     * @return 班次管理集合
+     */
+    public List<RuleNum> selectRuleNumList(RuleNum ruleNum);
+
+    /**
+     * 新增班次管理
+     * 
+     * @param ruleNum 班次管理
+     * @return 结果
+     */
+    public int insertRuleNum(RuleNum ruleNum);
+
+    /**
+     * 修改班次管理
+     * 
+     * @param ruleNum 班次管理
+     * @return 结果
+     */
+    public int updateRuleNum(RuleNum ruleNum);
+
+    /**
+     * 删除班次管理
+     * 
+     * @param id 班次管理主键
+     * @return 结果
+     */
+    public int deleteRuleNumById(Long id);
+
+    /**
+     * 批量删除班次管理
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteRuleNumByIds(Long[] ids);
+}
+package com.ruoyi.num.service;
+
+import java.util.List;
+import com.ruoyi.num.domain.RuleNum;
+
+/**
+ * 班次管理Service接口
+ * 
+ * @author guzijian
+ * @date 2023-08-03
+ */
+public interface IRuleNumService 
+{
+    /**
+     * 查询班次管理
+     * 
+     * @param id 班次管理主键
+     * @return 班次管理
+     */
+    public RuleNum selectRuleNumById(Long id);
+
+    /**
+     * 查询班次管理列表
+     * 
+     * @param ruleNum 班次管理
+     * @return 班次管理集合
+     */
+    public List<RuleNum> selectRuleNumList(RuleNum ruleNum);
+
+    /**
+     * 新增班次管理
+     * 
+     * @param ruleNum 班次管理
+     * @return 结果
+     */
+    public int insertRuleNum(RuleNum ruleNum);
+
+    /**
+     * 修改班次管理
+     * 
+     * @param ruleNum 班次管理
+     * @return 结果
+     */
+    public int updateRuleNum(RuleNum ruleNum);
+
+    /**
+     * 批量删除班次管理
+     * 
+     * @param ids 需要删除的班次管理主键集合
+     * @return 结果
+     */
+    public int deleteRuleNumByIds(Long[] ids);
+
+    /**
+     * 删除班次管理信息
+     * 
+     * @param id 班次管理主键
+     * @return 结果
+     */
+    public int deleteRuleNumById(Long id);
+}
+package com.ruoyi.num.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.num.mapper.RuleNumMapper;
+import com.ruoyi.num.domain.RuleNum;
+import com.ruoyi.num.service.IRuleNumService;
+
+/**
+ * 班次管理Service业务层处理
+ * 
+ * @author guzijian
+ * @date 2023-08-03
+ */
+@Service
+public class RuleNumServiceImpl implements IRuleNumService 
+{
+    @Autowired
+    private RuleNumMapper ruleNumMapper;
+
+    /**
+     * 查询班次管理
+     * 
+     * @param id 班次管理主键
+     * @return 班次管理
+     */
+    @Override
+    public RuleNum selectRuleNumById(Long id)
+    {
+        return ruleNumMapper.selectRuleNumById(id);
+    }
+
+    /**
+     * 查询班次管理列表
+     * 
+     * @param ruleNum 班次管理
+     * @return 班次管理
+     */
+    @Override
+    public List<RuleNum> selectRuleNumList(RuleNum ruleNum)
+    {
+        return ruleNumMapper.selectRuleNumList(ruleNum);
+    }
+
+    /**
+     * 新增班次管理
+     * 
+     * @param ruleNum 班次管理
+     * @return 结果
+     */
+    @Override
+    public int insertRuleNum(RuleNum ruleNum)
+    {
+        return ruleNumMapper.insertRuleNum(ruleNum);
+    }
+
+    /**
+     * 修改班次管理
+     * 
+     * @param ruleNum 班次管理
+     * @return 结果
+     */
+    @Override
+    public int updateRuleNum(RuleNum ruleNum)
+    {
+        return ruleNumMapper.updateRuleNum(ruleNum);
+    }
+
+    /**
+     * 批量删除班次管理
+     * 
+     * @param ids 需要删除的班次管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteRuleNumByIds(Long[] ids)
+    {
+        return ruleNumMapper.deleteRuleNumByIds(ids);
+    }
+
+    /**
+     * 删除班次管理信息
+     * 
+     * @param id 班次管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteRuleNumById(Long id)
+    {
+        return ruleNumMapper.deleteRuleNumById(id);
+    }
+}
@@ -9,7 +9,8 @@ spring:
                 # 测试地址
                 url: jdbc:mysql://127.0.0.1:3306/all-in-one?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&useAffectedRows=true&allowMultiQueries=true
                 username: root
-                password: qinpugongjiao20230730
+#                password: qinpugongjiao20230730
+                password: guzijian
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
@@ -117,7 +118,13 @@ ruoyi:
     # 验证码类型 math 数字计算 char 字符验证
     captchaType: math
 # 开发环境配置
+    #SSL Key Info
+security:
+    require-ssl: true
 server:
+    ssl:
+        key-store-password: guzijian
+        key-store: ruoyi-admin/src/main/resources/keystore.jks
     # 服务器的HTTP端口，默认为8080
     port: 8080
     servlet:
@@ -179,4 +186,4 @@ api:
         people:
             url: https://api.dingtalk.com/v1.0/yida/forms/instances/search
 log:
-    path: E:/ruoyi/logs
 \ No newline at end of file
+    path: E:/ruoyi/logs
@@ -3,7 +3,7 @@
     <!-- 日志存放路径 -->
 <!--	<property name="log.path" value="E:/ruoyi/logs" />-->
 <!--	<property name="log.path" value="D:/ruoyi/logs" />-->
-    <springProperty scope="context" name="log.path" source="log.path"/>
+	<property name="log.path" value="/home/ruoyi/logs" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
+<?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.num.mapper.RuleNumMapper">
+    
+    <resultMap type="RuleNum" id="RuleNumResult">
+        <result property="id"    column="id"    />
+        <result property="ruleDictName"    column="rule_dict_name"    />
+        <result property="ruleType"    column="rule_type"    />
+        <result property="workDay"    column="work_day"    />
+        <result property="freeDay"    column="free_day"    />
+        <result property="ruleWeek"    column="rule_week"    />
+    </resultMap>
+
+    <sql id="selectRuleNumVo">
+        select id, rule_dict_name, rule_type, work_day, free_day, rule_week from rule_num
+    </sql>
+
+    <select id="selectRuleNumList" parameterType="RuleNum" resultMap="RuleNumResult">
+        <include refid="selectRuleNumVo"/>
+        <where>  
+            <if test="ruleDictName != null "> and rule_dict_name like concat('%', #{ruleDictName}, '%')</if>
+            <if test="ruleType != null "> and rule_type = #{ruleType}</if>
+            <if test="workDay != null "> and work_day = #{workDay}</if>
+            <if test="freeDay != null "> and free_day = #{freeDay}</if>
+            <if test="ruleWeek != null  and ruleWeek != ''"> and rule_week = #{ruleWeek}</if>
+        </where>
+    </select>
+    
+    <select id="selectRuleNumById" parameterType="Long" resultMap="RuleNumResult">
+        <include refid="selectRuleNumVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertRuleNum" parameterType="RuleNum" useGeneratedKeys="true" keyProperty="id">
+        insert into rule_num
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="ruleDictName != null">rule_dict_name,</if>
+            <if test="ruleType != null">rule_type,</if>
+            <if test="workDay != null">work_day,</if>
+            <if test="freeDay != null">free_day,</if>
+            <if test="ruleWeek != null">rule_week,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="ruleDictName != null">#{ruleDictName},</if>
+            <if test="ruleType != null">#{ruleType},</if>
+            <if test="workDay != null">#{workDay},</if>
+            <if test="freeDay != null">#{freeDay},</if>
+            <if test="ruleWeek != null">#{ruleWeek},</if>
+         </trim>
+    </insert>
+
+    <update id="updateRuleNum" parameterType="RuleNum">
+        update rule_num
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="ruleDictName != null">rule_dict_name = #{ruleDictName},</if>
+            <if test="ruleType != null">rule_type = #{ruleType},</if>
+            <if test="workDay != null">work_day = #{workDay},</if>
+            <if test="freeDay != null">free_day = #{freeDay},</if>
+            <if test="ruleWeek != null">rule_week = #{ruleWeek},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteRuleNumById" parameterType="Long">
+        delete from rule_num where id = #{id}
+    </delete>
+
+    <delete id="deleteRuleNumByIds" parameterType="String">
+        delete from rule_num where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
 \ No newline at end of file