fix: 新增修改人

guzijian
1 parent f140e57a
Showing 14 changed files with 149 additions and 26 deletions
ruoyi-admin/src/main/java/com/ruoyi/controller/AttendanceController.java
ruoyi-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/num/domain/RuleNum.java
ruoyi-admin/src/main/java/com/ruoyi/num/service/impl/RuleNumServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/vo/SchedulingResponseVo.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/vo/TableMonthResponseVo.java
ruoyi-admin/src/main/java/com/ruoyi/scheduling/domain/RuleScheduling.java
ruoyi-admin/src/main/java/com/ruoyi/scheduling/service/impl/RuleSchedulingServiceImpl.java
ruoyi-admin/src/main/resources/application-druid-dev.yml
ruoyi-admin/src/main/resources/application-druid-prd.yml
ruoyi-admin/src/main/resources/application.yml
ruoyi-admin/src/main/resources/mapper/eexception/EquipmentExceptionMapper.xml
ruoyi-admin/src/main/resources/mapper/num/RuleNumMapper.xml
ruoyi-admin/src/main/resources/mapper/scheduling/RuleSchedulingMapper.xml
 package com.ruoyi.controller;
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.global.Result;
 import com.ruoyi.domain.RuleAttendanceMain;
 import com.ruoyi.pojo.dto.SchedulingDto;
@@ -64,6 +66,7 @@ public class AttendanceController extends BaseController {
      */
     @ApiOperation("排班设置")
     @PostMapping("/saveSchedulingSetting")
+    @Log(title = "新增排班设置", businessType = BusinessType.INSERT)
     public Result<?> saveSchedulingSetting(@RequestBody @Validated SchedulingSettingDto dto) {
         attendanceService.saveSchedulingSetting(dto);
         return Result.OK("新增成功");
@@ -74,6 +77,7 @@ public class AttendanceController extends BaseController {
      */
     @ApiOperation("排班设置")
     @PutMapping("/updateSchedulingSetting")
+    @Log(title = "修改排班设置", businessType = BusinessType.UPDATE)
     public Result<?> updateSchedulingSetting(@RequestBody @Validated SchedulingDto dto) {
         attendanceService.updateSchedulingSetting(dto);
         return Result.OK("新增成功");
@@ -84,6 +88,7 @@ public class AttendanceController extends BaseController {
      */
     @ApiOperation("排班设置")
     @DeleteMapping("/deleteSchedulingSetting/{settingId}")
+    @Log(title = "删除排班设置", businessType = BusinessType.DELETE)
     public Result<?> deleteSchedulingSetting(@PathVariable("settingId") Integer settingId) {
         attendanceService.deleteSchedulingSetting(settingId);
         return Result.OK("删除成功");
@@ -102,6 +107,7 @@ public class AttendanceController extends BaseController {
     @ApiOperation("修改考情表")
     @PutMapping("/update/attendance")
+    @Log(title = "修改考情表", businessType = BusinessType.UPDATE)
     public Result<?> updateAttendance(@RequestBody @Validated UpdateAttendanceVo vo) {
         try {
             attendanceService.updateAttendance(vo);
@@ -113,6 +119,7 @@ public class AttendanceController extends BaseController {
     @ApiOperation("删除考勤表")
     @PostMapping("/delete/attendance")
+    @Log(title = "删除考勤表", businessType = BusinessType.DELETE)
     public Result<?> deleteAttendance(@RequestBody DeleteAttendanceVo vo) {
         try {
             attendanceService.deleteAttendance(vo);
@@ -127,4 +134,13 @@ public class AttendanceController extends BaseController {
     public Result<?> getPeopleList(@ModelAttribute PeopleRequestVo vo){
         return Result.OK(attendanceService.getPeopleList(vo));
     }
+
+
+    @GetMapping("/table/month")
+    @ApiOperation("获取一个月的table")
+    public Result<?> getTableMonth(){
+        // 修改周期
+        return null;
+    }
+
 }
@@ -401,7 +401,7 @@ public class SignInServiceImpl implements ISignInService {
         Integer count = redisCache.getCacheObject(key);
         if (Objects.isNull(count) || count.equals(0)) {
             count = 1;
-            redisCache.setCacheMapValue(key, signIn.getJobCode(), count);
+            redisCache.setCacheObject(key, count);
         } else {
             redisCache.setCacheObject(key, ++count);
         }
@@ -6,6 +6,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import java.util.Date;
+
 /**
  * 班次管理对象 rule_num
  * 
@@ -40,4 +42,12 @@ public class RuleNum extends BaseEntity
     @Excel(name = "星期翻班详情")
     private String ruleWeek;
+    private Date createTime;
+
+    private Date updateTime;
+
+    private String createBy;
+
+    private String updateBy;
+
 }
@@ -8,6 +8,7 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import cn.hutool.core.bean.BeanUtil;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.pojo.dto.RuleNumDto;
 import com.ruoyi.pojo.vo.RuleNumTemplateVo;
@@ -65,6 +66,11 @@ public class RuleNumServiceImpl implements IRuleNumService
     @Override
     public int insertRuleNum(RuleNum ruleNum)
     {
+        String username = SecurityUtils.getUsername();
+        ruleNum.setCreateBy(username);
+        ruleNum.setUpdateBy(username);
+        ruleNum.setCreateTime(DateUtils.getNowDate());
+        ruleNum.setUpdateTime(DateUtils.getNowDate());
         return ruleNumMapper.insertRuleNum(ruleNum);
     }
@@ -77,6 +83,8 @@ public class RuleNumServiceImpl implements IRuleNumService
     @Override
     public int updateRuleNum(RuleNum ruleNum)
     {
+        ruleNum.setUpdateTime(DateUtils.getNowDate());
+        ruleNum.setUpdateBy(ruleNum.getUpdateBy());
         return ruleNumMapper.updateRuleNum(ruleNum);
     }
@@ -4,6 +4,7 @@ import com.ruoyi.domain.RuleNumSetting;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import java.util.Date;
 import java.util.List;
 /**
@@ -20,4 +21,8 @@ public class SchedulingResponseVo extends RuleNumSetting {
     private List<String> ruleList;
     @ApiModelProperty("适用人员")
     private List<String> peopleList;
+    private Date createTime;
+    private Date updateTime;
+    private String createBy;
+    private String updateBy;
 }
+package com.ruoyi.pojo.vo;
+
+import com.ruoyi.domain.RuleAttendanceMain;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ *
+ * @author 20412
+ */
+@Data
+public class TableMonthResponseVo {
+    private String jobCode;
+    private String name;
+    private String fleetName;
+    private String posts;
+    private List<RuleAttendanceMain> monthList;
+    private Integer nowMonthDaysCount;
+//
+//    @Data
+//    public
+}
@@ -91,4 +91,12 @@ public class RuleScheduling extends BaseEntity
     @Excel(name = "第二段上下班标识，今天时间还是隔天")
     private Integer secondSignDayTomorrow;
+    private Date updateTime;
+
+    private Date createTime;
+
+    private String updateBy;
+
+    private String createBy;
+
 }
@@ -7,6 +7,8 @@ import java.util.List;
 import java.util.stream.Collectors;
 import cn.hutool.core.collection.CollectionUtil;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.pojo.dto.RuleSchedulingDto;
 import com.ruoyi.pojo.vo.RuleSchedulingResponseVo;
 import com.ruoyi.pojo.vo.RuleSchedulingVo;
@@ -62,6 +64,12 @@ public class RuleSchedulingServiceImpl implements IRuleSchedulingService {
     @Override
     public int insertRuleScheduling(RuleScheduling ruleScheduling) {
         handleNewAddScheduling(ruleScheduling);
+        String username = SecurityUtils.getUsername();
+        ruleScheduling.setCreateBy(username);
+        ruleScheduling.setUpdateBy(username);
+        Date date = DateUtils.getNowDate();
+        ruleScheduling.setCreateTime(date);
+        ruleScheduling.setUpdateTime(date);
         return ruleSchedulingMapper.insertRuleScheduling(ruleScheduling);
     }
@@ -85,6 +93,8 @@ public class RuleSchedulingServiceImpl implements IRuleSchedulingService {
     @Override
     public int updateRuleScheduling(RuleScheduling ruleScheduling) {
         handleNewAddScheduling(ruleScheduling);
+        ruleScheduling.setUpdateTime(DateUtils.getNowDate());
+        ruleScheduling.setUpdateBy(SecurityUtils.getUsername());
         return ruleSchedulingMapper.updateRuleScheduling(ruleScheduling);
     }
@@ -99,9 +99,10 @@ spring:
         # redis 配置
         redis:
             # 地址
-            host: 121.41.83.61
+#            host: 121.41.83.61
+            host: 127.0.0.1
             database: 0
-            password: "guzijian"
+#            password: "guzijian"
             port: 6379
             # 连接超时时间
             timeout: 10s
@@ -96,9 +96,10 @@ spring:
         # redis 配置
         redis:
             # 地址
-            host: 121.41.83.61
+#            host: 121.41.83.61
+            host: 127.0.0.1
             database: 0
-            password: "guzijian"
+            password: "@qpgj#redis"
             port: 6379
             # 连接超时时间
             timeout: 10s
@@ -71,24 +71,24 @@ spring:
       # 热部署开关
       enabled: true
   # redis 配置
-  redis:
-    # 地址
-    host: 121.41.83.61
-    database: 0
-    password: "guzijian"
-    port: 6379
-    # 连接超时时间
-    timeout: 10s
-    lettuce:
-      pool:
-        # 连接池中的最小空闲连接
-        min-idle: 0
-        # 连接池中的最大空闲连接
-        max-idle: 8
-        # 连接池的最大数据库连接数
-        max-active: 8
-        # #连接池最大阻塞等待时间（使用负值表示没有限制）
-        max-wait: -1ms
+#  redis:
+#    # 地址
+#    host: 127.0.0.1
+#    database: 0
+##    password: "guzijian"
+#    port: 6379
+#    # 连接超时时间
+#    timeout: 10s
+#    lettuce:
+#      pool:
+#        # 连接池中的最小空闲连接
+#        min-idle: 0
+#        # 连接池中的最大空闲连接
+#        max-idle: 8
+#        # 连接池的最大数据库连接数
+#        max-active: 8
+#        # #连接池最大阻塞等待时间（使用负值表示没有限制）
+#        max-wait: -1ms
 # token配置
 token:
@@ -89,7 +89,12 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="jobCode != null  and jobCode != ''"> and driver.job_code = #{jobCode}</if>
             <if test="exType != null "> and ex_type = #{exType}</if>
             <if test="id != null "> and equipment_exception.id #{id}</if>
-            <if test="date != null "> and equipment_exception.create_time like concat(#{date},'%')</if>
+            <if test="date != null ">
+                and
+                equipment_exception.create_time &gt;= CONCAT(#{date}, ' 02:30:00')
+                and
+        equipment_exception.create_time &lt;= CONCAT(DATE_ADD(#{date}, INTERVAL 1 DAY), ' 02:30:00')
+            </if>
         </where>
     </select>
     <select id="selectEquipmentExceptionByDeviceIdStatus"
@@ -11,6 +11,10 @@
         <result property="workDay" column="work_day"/>
         <result property="freeDay" column="free_day"/>
         <result property="ruleWeek" column="rule_week"/>
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateBy"    column="update_by"    />
     </resultMap>
     <resultMap type="com.ruoyi.pojo.dto.RuleNumDto" id="RuleNumDtoResult">
@@ -21,10 +25,14 @@
         <result property="freeDay" column="free_day"/>
         <result property="ruleWeek" column="rule_week"/>
         <result property="settingId" column="setting_id"/>
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateBy"    column="update_by"    />
     </resultMap>
     <sql id="selectRuleNumVo">
-        select id, rule_dict_name, rule_type, work_day, free_day, rule_week
+        select id, rule_dict_name, rule_type, work_day, free_day, rule_week,update_by,update_time,create_by,create_time
         from rule_num
     </sql>
@@ -70,6 +78,10 @@
             <if test="workDay != null">work_day,</if>
             <if test="freeDay != null">free_day,</if>
             <if test="ruleWeek != null">rule_week,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateBy != null">update_by,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="ruleDictName != null">#{ruleDictName},</if>
@@ -77,6 +89,10 @@
             <if test="workDay != null">#{workDay},</if>
             <if test="freeDay != null">#{freeDay},</if>
             <if test="ruleWeek != null">#{ruleWeek},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateBy != null">#{updateBy},</if>
         </trim>
     </insert>
@@ -88,6 +104,8 @@
             <if test="workDay != null">work_day = #{workDay},</if>
             <if test="freeDay != null">free_day = #{freeDay},</if>
             <if test="ruleWeek != null">rule_week = #{ruleWeek},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
         </trim>
         where id = #{id}
     </update>
@@ -23,6 +23,10 @@
         <result property="secondSignDayTomorrow"    column="second_sign_day_tomorrow"    />
         <result property="settingId"    column="setting_id"    />
         <result property="sort"    column="sort"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateBy"    column="update_by"    />
     </resultMap>
     <resultMap type="RuleScheduling" id="RuleSchedulingResult">
@@ -42,10 +46,14 @@
         <result property="secondQuittingSignInTime"    column="second_quitting_sign_in_time"    />
         <result property="secondSignInQuittingRange"    column="second_sign_in_quitting_range"    />
         <result property="secondSignDayTomorrow"    column="second_sign_day_tomorrow"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateBy"    column="update_by"    />
     </resultMap>
     <sql id="selectRuleSchedulingVo">
-        select id, rule_name, working_hour_plan, working_hour_type, first_work_sign_in_time, first_sign_in_working_range, first_quitting_sign_in_time, first_sign_in_day_tomorrow, first_sign_in_quitting_range, sign_in_time_out_range, second_flag, second_work_sign_in_time, second_sign_in_working_range, second_quitting_sign_in_time, second_sign_in_quitting_range, second_sign_day_tomorrow from rule_scheduling
+        select id, rule_name, working_hour_plan, working_hour_type, first_work_sign_in_time, first_sign_in_working_range, first_quitting_sign_in_time, first_sign_in_day_tomorrow, first_sign_in_quitting_range, sign_in_time_out_range, second_flag, second_work_sign_in_time, second_sign_in_working_range, second_quitting_sign_in_time, second_sign_in_quitting_range, second_sign_day_tomorrow,update_by,update_time,create_by,create_time from rule_scheduling
     </sql>
     <select id="selectRuleSchedulingList" parameterType="RuleScheduling" resultMap="RuleSchedulingResult">
@@ -110,6 +118,10 @@
             <if test="secondQuittingSignInTime != null">second_quitting_sign_in_time,</if>
             <if test="secondSignInQuittingRange != null">second_sign_in_quitting_range,</if>
             <if test="secondSignDayTomorrow != null">second_sign_day_tomorrow,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateBy != null">update_by,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="ruleName != null and ruleName != ''">#{ruleName},</if>
@@ -127,6 +139,10 @@
             <if test="secondQuittingSignInTime != null">#{secondQuittingSignInTime},</if>
             <if test="secondSignInQuittingRange != null">#{secondSignInQuittingRange},</if>
             <if test="secondSignDayTomorrow != null">#{secondSignDayTomorrow},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateBy != null">#{updateBy},</if>
         </trim>
     </insert>
@@ -148,6 +164,8 @@
             <if test="secondQuittingSignInTime != null">second_quitting_sign_in_time = #{secondQuittingSignInTime},</if>
             <if test="secondSignInQuittingRange != null">second_sign_in_quitting_range = #{secondSignInQuittingRange},</if>
             <if test="secondSignDayTomorrow != null">second_sign_day_tomorrow = #{secondSignDayTomorrow},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
         </trim>
         where id = #{id}
     </update>