张涛 1 年之前
父節點
當前提交
c942ff5964
共有 23 個文件被更改,包括 622 次插入51 次删除
  1. 0
    2
      application/src/main/java/com/lyg/application/DTO/ErrorDto.java
  2. 7
    3
      application/src/main/java/com/lyg/application/controller/TaMandatoryLeaveController.java
  3. 119
    0
      application/src/main/java/com/lyg/application/controller/TaMessageController.java
  4. 0
    29
      application/src/main/java/com/lyg/application/controller/TaRotationController.java
  5. 119
    0
      application/src/main/java/com/lyg/application/controller/TaSendingController.java
  6. 18
    11
      application/src/main/java/com/lyg/application/controller/UploadController.java
  7. 68
    0
      application/src/main/java/com/lyg/application/entity/TaMessage.java
  8. 64
    0
      application/src/main/java/com/lyg/application/entity/TaSending.java
  9. 16
    0
      application/src/main/java/com/lyg/application/mapper/TaMessageMapper.java
  10. 4
    0
      application/src/main/java/com/lyg/application/mapper/TaRotationMapper.java
  11. 16
    0
      application/src/main/java/com/lyg/application/mapper/TaSendingMapper.java
  12. 14
    0
      application/src/main/java/com/lyg/application/service/TaMessageService.java
  13. 2
    0
      application/src/main/java/com/lyg/application/service/TaRotationService.java
  14. 14
    0
      application/src/main/java/com/lyg/application/service/TaSendingService.java
  15. 18
    0
      application/src/main/java/com/lyg/application/service/impl/TaMessageServiceImpl.java
  16. 78
    6
      application/src/main/java/com/lyg/application/service/impl/TaRotationServiceImpl.java
  17. 18
    0
      application/src/main/java/com/lyg/application/service/impl/TaSendingServiceImpl.java
  18. 6
    0
      application/src/main/resources/mapper/TaMessageMapper.xml
  19. 9
    0
      application/src/main/resources/mapper/TaRotationMapper.xml
  20. 6
    0
      application/src/main/resources/mapper/TaSendingMapper.xml
  21. 1
    0
      system/src/main/java/com/lyg/system/controller/BaseController.java
  22. 6
    0
      system/src/main/java/com/lyg/system/mapper/SysUserMapper.java
  23. 19
    0
      system/src/main/resources/mapper/SysUserMapper.xml

+ 0
- 2
application/src/main/java/com/lyg/application/DTO/ErrorDto.java 查看文件

@@ -24,8 +24,6 @@ public class ErrorDto {
24 24
     private String specificNameOrgRotation; //轮岗列表 轮岗之后单位名
25 25
     private String orgNumJobRotation; //轮岗列表 轮岗之后单位号
26 26
 
27
-//    private String counterImpPositionRotation; //轮岗列表 原来岗位
28
-//    private String counterImpPostRotation;//轮岗列表 轮岗之后的岗位
29 27
 
30 28
 
31 29
 

+ 7
- 3
application/src/main/java/com/lyg/application/controller/TaMandatoryLeaveController.java 查看文件

@@ -10,6 +10,8 @@ import com.lyg.common.util.StringUtil;
10 10
 import com.lyg.framework.accesslimit.AccessLimit;
11 11
 import com.lyg.framework.log.OpLog;
12 12
 import com.lyg.system.controller.BaseController;
13
+import com.lyg.system.entity.SysOrg;
14
+import com.lyg.system.mapper.SysOrgMapper;
13 15
 import io.swagger.annotations.Api;
14 16
 import io.swagger.annotations.ApiOperation;
15 17
 import io.swagger.annotations.ApiParam;
@@ -29,8 +31,11 @@ public class TaMandatoryLeaveController extends BaseController {
29 31
     
30 32
     @Autowired
31 33
     private TaMandatoryLeaveService taMandatoryLeaveService;
32
-    
33
-    /** 
34
+     @Autowired
35
+     private SysOrgMapper sysOrgMapper;
36
+
37
+
38
+     /**
34 39
      * 通过ID查询单条数据 
35 40
      *
36 41
      * @param id 主键
@@ -114,7 +119,6 @@ public class TaMandatoryLeaveController extends BaseController {
114 119
     @PutMapping("/taMandatoryLeave/{id}")
115 120
     public SaResult edit(@ApiParam("对象实体") @Validated @RequestBody TaMandatoryLeave taMandatoryLeave,
116 121
                             @ApiParam("对象ID") @PathVariable String id ) throws Exception {
117
-        taMandatoryLeave.setLeaveId(id);
118 122
         taMandatoryLeaveService.updateById(taMandatoryLeave);
119 123
         return SaResult.data(taMandatoryLeave);
120 124
     }

+ 119
- 0
application/src/main/java/com/lyg/application/controller/TaMessageController.java 查看文件

@@ -0,0 +1,119 @@
1
+package com.lyg.application.controller;
2
+
3
+import cn.dev33.satoken.util.SaResult;
4
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
5
+import com.baomidou.mybatisplus.core.metadata.IPage;
6
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
7
+import com.lyg.application.entity.TaMessage;
8
+import com.lyg.application.service.TaMessageService;
9
+import com.lyg.common.util.StringUtil;
10
+import com.lyg.framework.accesslimit.AccessLimit;
11
+import com.lyg.framework.log.OpLog;
12
+import com.lyg.system.controller.BaseController;
13
+import io.swagger.annotations.Api;
14
+import io.swagger.annotations.ApiOperation;
15
+import io.swagger.annotations.ApiParam;
16
+import org.springframework.beans.factory.annotation.Autowired;
17
+import org.springframework.validation.annotation.Validated;
18
+import org.springframework.web.bind.annotation.*;
19
+
20
+/**
21
+ * 消息表;(ta_massage)表控制层
22
+ *
23
+ * @author : http://njyunzhi.com
24
+ * @date : 2024-3-14
25
+ */
26
+@Api(tags = "消息表对象功能接口")
27
+@RestController
28
+@RequestMapping("/")
29
+public class TaMessageController extends BaseController {
30
+
31
+    @Autowired
32
+    private TaMessageService taMessageService;
33
+
34
+    /**
35
+     * 通过ID查询单条数据
36
+     *
37
+     * @param id 主键
38
+     * @return 实例对象
39
+     */
40
+    @OpLog(module = "消息表", action = "查询单条数据", desc = "ID:{{#id}}")
41
+    @AccessLimit()
42
+    @ApiOperation("通过ID查询单条数据")
43
+    @GetMapping("/taMessage/{id}")
44
+    public SaResult queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
45
+        return SaResult.data(taMessageService.getById(id));
46
+    }
47
+
48
+    /**
49
+     * 分页查询
50
+     *
51
+     * @param pageNum  当前页码
52
+     * @param pageSize 每页条数
53
+     * @return 查询结果
54
+     */
55
+    @OpLog(module = "消息表", action = "分页列表查询")
56
+    @AccessLimit()
57
+    @ApiOperation("分页查询")
58
+    @GetMapping("/taMessage")
59
+    public SaResult list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
60
+                         @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
61
+                         @ApiParam("正序排列") @RequestParam(value = "sortAsc", required = false) String sortAsc,
62
+                         @ApiParam("倒序排列") @RequestParam(value = "sortDesc", defaultValue = "create_date") String sortDesc) throws Exception {
63
+
64
+        IPage<TaMessage> pg = new Page<>(pageNum, pageSize);
65
+        QueryWrapper<TaMessage> queryWrapper = new QueryWrapper<>();
66
+        queryWrapper.orderByAsc(StringUtil.isNotEmpty(sortAsc), StringUtil.humpToLine(sortAsc));
67
+        queryWrapper.orderByDesc(StringUtil.isNotEmpty(sortDesc), StringUtil.humpToLine(sortDesc));
68
+        IPage<TaMessage> result = taMessageService.page(pg, queryWrapper);
69
+
70
+        return SaResult.data(result);
71
+    }
72
+
73
+    /**
74
+     * 新增数据
75
+     *
76
+     * @param taMessage 实例对象
77
+     * @return 实例对象
78
+     */
79
+    @OpLog(module = "消息表", action = "新增数据")
80
+    @AccessLimit()
81
+    @ApiOperation("新增数据")
82
+    @PostMapping("/taMessage")
83
+    public SaResult add(@ApiParam("对象实体") @Validated @RequestBody TaMessage taMessage) throws Exception {
84
+        taMessageService.save(taMessage);
85
+        return SaResult.data(taMessage);
86
+    }
87
+
88
+    /**
89
+     * 更新数据
90
+     *
91
+     * @param taMessage 实例对象
92
+     * @return 实例对象
93
+     */
94
+    @OpLog(module = "消息表", action = "更新数据")
95
+    @AccessLimit()
96
+    @ApiOperation("更新数据")
97
+    @PutMapping("/taMessage/{id}")
98
+    public SaResult edit(@ApiParam("对象实体") @Validated @RequestBody TaMessage taMessage,
99
+                         @ApiParam("对象ID") @PathVariable String id) throws Exception {
100
+        taMessage.setMessageId(id);
101
+        taMessageService.updateById(taMessage);
102
+        return SaResult.data(taMessage);
103
+    }
104
+
105
+    /**
106
+     * 通过主键删除数据
107
+     *
108
+     * @param id 主键
109
+     * @return 是否成功
110
+     */
111
+    @OpLog(module = "消息表", action = "删除数据", desc = "ID:{{#id}}")
112
+    @AccessLimit()
113
+    @ApiOperation("通过主键删除数据")
114
+    @DeleteMapping("/taMessage/{id}")
115
+    public SaResult deleteById(@ApiParam("对象ID") @PathVariable String id) {
116
+        taMessageService.removeById(id);
117
+        return SaResult.data("success");
118
+    }
119
+}

+ 0
- 29
application/src/main/java/com/lyg/application/controller/TaRotationController.java 查看文件

@@ -109,25 +109,8 @@ public class TaRotationController extends BaseController {
109 109
     @ApiOperation("新增数据")
110 110
     @PostMapping("/taRotation")
111 111
     public SaResult add(@ApiParam("对象实体") @Validated @RequestBody TaRotation taRotation) throws Exception {
112
-
113
-
114
-        String specificOrgNum = taRotation.getSpecificOrgName();//轮岗前具体单位名称 传来的是orgId
115
-//        String specificOrgNum = taRotation.getSpecificOrgNum();//轮岗前单位号
116
-        String OrgRotationId = taRotation.getSpecificNameOrgRotation();//轮岗后具体单位名称 传来的是orgId
117
-//        String orgNumJobRotation = taRotation.getOrgNumJobRotation();//轮岗后单位号
118
-
119
-        String specificOrgName = sysOrgMapper.getOrgId(specificOrgNum);
120
-        taRotation.setSpecificOrgNum(specificOrgNum);
121
-        taRotation.setSpecificOrgName(specificOrgName);
122
-
123
-        String orgNameJobRotation = sysOrgMapper.getOrgId(OrgRotationId);
124
-        taRotation.setOrgNumJobRotation(OrgRotationId);
125
-        taRotation.setSpecificNameOrgRotation(orgNameJobRotation);
126
-
127
-
128 112
         taRotationService.save(taRotation);
129 113
         Object result = rule.taRotationRule(taRotation);
130
-
131 114
         return SaResult.data(result);
132 115
     }
133 116
 
@@ -143,18 +126,6 @@ public class TaRotationController extends BaseController {
143 126
     @PutMapping("/taRotation/{id}")
144 127
     public SaResult edit(@ApiParam("对象实体") @Validated @RequestBody TaRotation taRotation,
145 128
                          @ApiParam("对象ID") @PathVariable String id) throws Exception {
146
-        String specificOrgNum = taRotation.getSpecificOrgName();//轮岗前具体单位名称 传来的是orgId
147
-//        String specificOrgNum = taRotation.getSpecificOrgNum();//轮岗前单位号
148
-        String OrgRotationId = taRotation.getSpecificNameOrgRotation();//轮岗后具体单位名称 传来的是orgId
149
-//        String orgNumJobRotation = taRotation.getOrgNumJobRotation();//轮岗后单位号
150
-
151
-        String specificOrgName = sysOrgMapper.getOrgId(specificOrgNum);
152
-        taRotation.setSpecificOrgNum(specificOrgNum);
153
-        taRotation.setSpecificOrgName(specificOrgName);
154
-
155
-        String orgNameJobRotation = sysOrgMapper.getOrgId(OrgRotationId);
156
-        taRotation.setOrgNumJobRotation(OrgRotationId);
157
-        taRotation.setSpecificNameOrgRotation(orgNameJobRotation);
158 129
 
159 130
         taRotation.setRotationId(id);
160 131
         taRotationService.updateById(taRotation);

+ 119
- 0
application/src/main/java/com/lyg/application/controller/TaSendingController.java 查看文件

@@ -0,0 +1,119 @@
1
+package com.lyg.application.controller;
2
+
3
+import cn.dev33.satoken.util.SaResult;
4
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
5
+import com.baomidou.mybatisplus.core.metadata.IPage;
6
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
7
+import java.util.List;
8
+import com.lyg.common.Constants;
9
+import com.lyg.common.util.StringUtil;
10
+import com.lyg.framework.log.OpLog;
11
+import com.lyg.system.controller.BaseController;
12
+import com.lyg.framework.accesslimit.AccessLimit;
13
+import io.swagger.annotations.Api;
14
+import io.swagger.annotations.ApiOperation;
15
+import io.swagger.annotations.ApiParam;
16
+import org.springframework.beans.factory.annotation.Autowired;
17
+import org.springframework.validation.annotation.Validated;
18
+import org.springframework.web.bind.annotation.*;
19
+import com.lyg.application.entity.TaSending;
20
+import com.lyg.application.service.TaSendingService;
21
+
22
+ /**
23
+ * 发送消息;(ta_sending)表控制层
24
+ * @author : http://njyunzhi.com
25
+ * @date : 2024-3-14
26
+ */
27
+@Api(tags = "发送消息对象功能接口")
28
+@RestController
29
+@RequestMapping("/")
30
+public class TaSendingController extends BaseController {
31
+    
32
+    @Autowired
33
+    private TaSendingService taSendingService;
34
+    
35
+    /** 
36
+     * 通过ID查询单条数据 
37
+     *
38
+     * @param id 主键
39
+     * @return 实例对象
40
+     */
41
+    @OpLog(module = "发送消息", action = "查询单条数据", desc = "ID:{{#id}}")
42
+    @AccessLimit()
43
+    @ApiOperation("通过ID查询单条数据")
44
+    @GetMapping("/taSending/{id}")
45
+    public SaResult queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
46
+        return SaResult.data(taSendingService.getById(id));
47
+    }
48
+    
49
+    /** 
50
+     * 分页查询
51
+     *
52
+     * @param pageNum 当前页码
53
+     * @param pageSize 每页条数
54
+     * @return 查询结果
55
+     */
56
+    @OpLog(module = "发送消息", action = "分页列表查询")
57
+    @AccessLimit()
58
+    @ApiOperation("分页查询")
59
+    @GetMapping("/taSending")
60
+    public SaResult list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
61
+                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
62
+                            @ApiParam("正序排列") @RequestParam(value ="sortAsc", required = false) String sortAsc,
63
+                         @ApiParam("倒序排列") @RequestParam(value ="sortDesc", defaultValue = "create_date") String sortDesc) throws Exception {
64
+        IPage<TaSending> pg = new Page<>(pageNum, pageSize);
65
+        QueryWrapper<TaSending> queryWrapper = new QueryWrapper<>();
66
+        queryWrapper.orderByAsc(StringUtil.isNotEmpty(sortAsc), StringUtil.humpToLine(sortAsc));
67
+        queryWrapper.orderByDesc(StringUtil.isNotEmpty(sortDesc), StringUtil.humpToLine(sortDesc));
68
+        IPage<TaSending> result = taSendingService.page(pg, queryWrapper);
69
+        
70
+        return SaResult.data(result);
71
+    }
72
+    
73
+    /** 
74
+     * 新增数据
75
+     *
76
+     * @param taSending 实例对象
77
+     * @return 实例对象
78
+     */
79
+    @OpLog(module = "发送消息", action = "新增数据")
80
+    @AccessLimit()
81
+    @ApiOperation("新增数据")
82
+    @PostMapping("/taSending")
83
+    public SaResult add(@ApiParam("对象实体") @Validated @RequestBody TaSending taSending) throws Exception {
84
+        taSendingService.save(taSending);
85
+        return SaResult.data(taSending);
86
+    }
87
+    
88
+    /** 
89
+     * 更新数据
90
+     *
91
+     * @param taSending 实例对象
92
+     * @return 实例对象
93
+     */
94
+    @OpLog(module = "发送消息", action = "更新数据")
95
+    @AccessLimit()
96
+    @ApiOperation("更新数据")
97
+    @PutMapping("/taSending/{id}")
98
+    public SaResult edit(@ApiParam("对象实体") @Validated @RequestBody TaSending taSending,
99
+                            @ApiParam("对象ID") @PathVariable String id ) throws Exception {
100
+        taSending.setSendingId(id);
101
+        taSendingService.updateById(taSending);
102
+        return SaResult.data(taSending);
103
+    }
104
+    
105
+    /** 
106
+     * 通过主键删除数据
107
+     *
108
+     * @param id 主键
109
+     * @return 是否成功
110
+     */
111
+    @OpLog(module = "发送消息", action = "删除数据", desc = "ID:{{#id}}")
112
+    @AccessLimit()
113
+    @ApiOperation("通过主键删除数据")
114
+    @DeleteMapping("/taSending/{id}")
115
+    public SaResult deleteById(@ApiParam("对象ID") @PathVariable String id){
116
+        taSendingService.removeById(id);
117
+        return SaResult.data("success");
118
+    }
119
+}

+ 18
- 11
application/src/main/java/com/lyg/application/controller/UploadController.java 查看文件

@@ -2,10 +2,12 @@ package com.lyg.application.controller;
2 2
 
3 3
 import cn.dev33.satoken.util.SaResult;
4 4
 import com.alibaba.excel.EasyExcel;
5
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
5 6
 import com.lyg.application.Listener.TaMandatoryLeaveListener;
6 7
 import com.lyg.application.Listener.TaRotationListener;
7 8
 import com.lyg.application.entity.TaMandatoryLeave;
8 9
 import com.lyg.application.entity.TaRotation;
10
+import com.lyg.application.mapper.TaRotationMapper;
9 11
 import com.lyg.application.service.TaMandatoryLeaveService;
10 12
 import com.lyg.application.service.TaRotationService;
11 13
 import com.lyg.application.service.impl.TaMandatoryLeaveServiceImpl;
@@ -40,6 +42,8 @@ public class UploadController extends BaseController {
40 42
     @Autowired
41 43
     private TaRotationService taRotationService;
42 44
 
45
+
46
+
43 47
     @Autowired
44 48
     private TaRotationServiceImpl taRotationServiceImpl;
45 49
     @Autowired
@@ -115,18 +119,21 @@ public class UploadController extends BaseController {
115 119
     }
116 120
 
117 121
 
118
-//
119
-//    @AccessLimit()
120
-//    @ApiOperation("提示/预警")
122
+    @AccessLimit()
123
+    @ApiOperation("提示/预警")
121 124
 //    @Scheduled(cron = "0 45 2 1 1,4,7,10 ?")
122
-//    @GetMapping("/prompt/warning")
123
-//    public SaResult promptWarning() throws Exception {
124
-//
125
-//
126
-//return  SaResult.data("");
127
-//
128
-//
129
-//    }
125
+    @GetMapping("/prompt/warning")
126
+    public SaResult promptWarning() throws Exception {
127
+
128
+        taRotationService.selectGetWaring();
129
+
130
+
131
+
132
+
133
+        return SaResult.data("");
134
+
135
+
136
+    }
130 137
 
131 138
 
132 139
 }

+ 68
- 0
application/src/main/java/com/lyg/application/entity/TaMessage.java 查看文件

@@ -0,0 +1,68 @@
1
+package com.lyg.application.entity;
2
+
3
+import io.swagger.annotations.ApiModel;
4
+import io.swagger.annotations.ApiModelProperty;
5
+import com.baomidou.mybatisplus.annotation.*;
6
+import java.io.Serializable;
7
+import java.time.LocalDateTime;
8
+import lombok.Data;
9
+import lombok.EqualsAndHashCode;
10
+import lombok.experimental.Accessors;
11
+import javax.validation.constraints.NotBlank;
12
+
13
+/**
14
+ * 消息表;
15
+ * @author : http://www.chiner.pro
16
+ * @date : 2024-3-14
17
+ */
18
+@Data
19
+@EqualsAndHashCode(callSuper = false)
20
+@Accessors(chain = true)
21
+@ApiModel(value = "消息表",description = "")
22
+@TableName("ta_message")
23
+public class TaMessage implements Serializable,Cloneable{
24
+
25
+    @ApiModelProperty(name = "预警Id",notes = "")
26
+    @TableId(value = "message_id", type = IdType.ASSIGN_UUID)
27
+    private String messageId ;
28
+
29
+    @ApiModelProperty(name = "来源Id",notes = "")
30
+    private String sourceId ;
31
+
32
+    @NotBlank(message = "来源表名称不能为空")
33
+    @ApiModelProperty(name = "来源表名称",notes = "")
34
+    private String sourceName ;
35
+
36
+    @ApiModelProperty(name = "内容",notes = "")
37
+    private String contentSent ;
38
+
39
+    @ApiModelProperty(name = "核查反馈",notes = "")
40
+    private String remark ;
41
+
42
+    @ApiModelProperty(name = "预警 waring  提示 prompt",notes = "预警 超过轮岗截止日期  提示提前一个月提醒")
43
+    private String waringStatus ;
44
+
45
+    @ApiModelProperty(name = "状态 1正常 0不正常",notes = "")
46
+    private Integer status ;
47
+
48
+    @ApiModelProperty(name = "创建人",notes = "")
49
+    @TableField(fill = FieldFill.INSERT)
50
+    private String createUser ;
51
+
52
+    @ApiModelProperty(name = "创建时间",notes = "")
53
+    @TableField(fill = FieldFill.INSERT)
54
+    private LocalDateTime createDate ;
55
+
56
+    @ApiModelProperty(name = "更新人",notes = "")
57
+    @TableField(fill = FieldFill.INSERT_UPDATE)
58
+    private String updateUser ;
59
+
60
+    @ApiModelProperty(name = "更新时间",notes = "")
61
+    @TableField(fill = FieldFill.INSERT_UPDATE)
62
+    private LocalDateTime updateDate ;
63
+
64
+    @ApiModelProperty(name = "删除标志",notes = "1删除")
65
+    @TableField(fill = FieldFill.INSERT)
66
+    private Integer deleted ;
67
+
68
+}

+ 64
- 0
application/src/main/java/com/lyg/application/entity/TaSending.java 查看文件

@@ -0,0 +1,64 @@
1
+package com.lyg.application.entity;
2
+
3
+import io.swagger.annotations.ApiModel;
4
+import io.swagger.annotations.ApiModelProperty;
5
+import com.baomidou.mybatisplus.annotation.*;
6
+import java.io.Serializable;
7
+import java.time.LocalDateTime;
8
+import lombok.Data;
9
+import lombok.EqualsAndHashCode;
10
+import lombok.experimental.Accessors;
11
+import javax.validation.constraints.NotBlank;
12
+
13
+ /**
14
+ * 发送消息;
15
+ * @author : http://www.chiner.pro
16
+ * @date : 2024-3-14
17
+ */
18
+@Data
19
+@EqualsAndHashCode(callSuper = false)
20
+@Accessors(chain = true)
21
+@ApiModel(value = "发送消息",description = "")
22
+@TableName("ta_sending")
23
+public class TaSending implements Serializable,Cloneable{
24
+    
25
+    @ApiModelProperty(name = "发送消息id",notes = "")
26
+    @TableId(value = "sending_id", type = IdType.ASSIGN_UUID)
27
+    private String sendingId ;
28
+    
29
+    @ApiModelProperty(name = "消息id",notes = "")
30
+    private String messageId ;
31
+    
32
+    @ApiModelProperty(name = "接收人id",notes = "")
33
+    private String recipientId ;
34
+    
35
+    @ApiModelProperty(name = "1 已读 0未读",notes = "")
36
+    private Integer isRead ;
37
+    
38
+    @ApiModelProperty(name = "1 已处理 0未处理",notes = "")
39
+    private Integer isHandle ;
40
+    
41
+    @ApiModelProperty(name = "状态 1正常 0不正常",notes = "")
42
+    private Integer status ;
43
+    
44
+    @ApiModelProperty(name = "创建人",notes = "")
45
+    @TableField(fill = FieldFill.INSERT)
46
+    private String createUser ;
47
+    
48
+    @ApiModelProperty(name = "创建时间",notes = "")
49
+    @TableField(fill = FieldFill.INSERT)
50
+    private LocalDateTime createDate ;
51
+    
52
+    @ApiModelProperty(name = "更新人",notes = "")
53
+    @TableField(fill = FieldFill.INSERT_UPDATE)
54
+    private String updateUser ;
55
+    
56
+    @ApiModelProperty(name = "更新时间",notes = "")
57
+    @TableField(fill = FieldFill.INSERT_UPDATE)
58
+    private LocalDateTime updateDate ;
59
+    
60
+    @ApiModelProperty(name = "删除标志",notes = "1删除")
61
+    @TableField(fill = FieldFill.INSERT)
62
+    private Integer deleted ;
63
+
64
+}

+ 16
- 0
application/src/main/java/com/lyg/application/mapper/TaMessageMapper.java 查看文件

@@ -0,0 +1,16 @@
1
+package com.lyg.application.mapper;
2
+
3
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
+import com.lyg.application.entity.TaMessage;
5
+import org.apache.ibatis.annotations.Mapper;
6
+
7
+/**
8
+ * 消息表;(ta_massage)表数据库访问层
9
+ *
10
+ * @author : http://njyunzhi.com
11
+ * @date : 2024-3-14
12
+ */
13
+@Mapper
14
+public interface TaMessageMapper extends BaseMapper<TaMessage> {
15
+
16
+}

+ 4
- 0
application/src/main/java/com/lyg/application/mapper/TaRotationMapper.java 查看文件

@@ -19,4 +19,8 @@ import java.util.Map;
19 19
 public interface TaRotationMapper extends BaseMapper<TaRotation> {
20 20
 
21 21
     List<TaRotation> selectRepel(@Param("orgList") List<String> orgList, @Param("targetList") List<String> targetList, @Param("newDate") LocalDate newDate, @Param("params") Map<String, String> params);
22
+
23
+    List<TaRotation> waring(@Param("localDate") LocalDate localDate);
24
+
25
+    List<TaRotation> prompt(@Param("localDate") LocalDate localDate);
22 26
 }

+ 16
- 0
application/src/main/java/com/lyg/application/mapper/TaSendingMapper.java 查看文件

@@ -0,0 +1,16 @@
1
+package com.lyg.application.mapper;
2
+
3
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
+import org.apache.ibatis.annotations.Mapper;
5
+import org.apache.ibatis.annotations.Param;
6
+import com.lyg.application.entity.TaSending;
7
+
8
+ /**
9
+ * 发送消息;(ta_sending)表数据库访问层
10
+ * @author : http://njyunzhi.com
11
+ * @date : 2024-3-14
12
+ */
13
+@Mapper
14
+public interface TaSendingMapper  extends BaseMapper<TaSending>{
15
+    
16
+}

+ 14
- 0
application/src/main/java/com/lyg/application/service/TaMessageService.java 查看文件

@@ -0,0 +1,14 @@
1
+package com.lyg.application.service;
2
+
3
+import com.lyg.application.entity.TaMessage;
4
+import com.lyg.system.service.IBaseService;
5
+
6
+/**
7
+ * 消息表;(ta_massage)表服务接口
8
+ *
9
+ * @author : http://njyunzhi.com
10
+ * @date : 2024-3-14
11
+ */
12
+public interface TaMessageService extends IBaseService<TaMessage> {
13
+
14
+}

+ 2
- 0
application/src/main/java/com/lyg/application/service/TaRotationService.java 查看文件

@@ -16,6 +16,8 @@ public interface TaRotationService extends IBaseService<TaRotation> {
16 16
     TaRotation handleEntity(TaRotation entity,Integer index) throws Exception;
17 17
     void saveEntityBatch(List<TaRotation> entityList);
18 18
 
19
+    void selectGetWaring();
20
+
19 21
 //
20 22
 //    void handleEntity(List<T> entityList) throws Exception;
21 23
 //

+ 14
- 0
application/src/main/java/com/lyg/application/service/TaSendingService.java 查看文件

@@ -0,0 +1,14 @@
1
+package com.lyg.application.service;
2
+
3
+import com.baomidou.mybatisplus.extension.service.IService;
4
+import com.lyg.application.entity.TaSending;
5
+import com.lyg.system.service.IBaseService;
6
+
7
+ /**
8
+ * 发送消息;(ta_sending)表服务接口
9
+ * @author : http://njyunzhi.com
10
+ * @date : 2024-3-14
11
+ */
12
+public interface TaSendingService extends IBaseService<TaSending> {
13
+    
14
+}

+ 18
- 0
application/src/main/java/com/lyg/application/service/impl/TaMessageServiceImpl.java 查看文件

@@ -0,0 +1,18 @@
1
+package com.lyg.application.service.impl;
2
+
3
+import com.lyg.application.entity.TaMessage;
4
+import com.lyg.application.mapper.TaMessageMapper;
5
+import com.lyg.application.service.TaMessageService;
6
+import com.lyg.system.service.impl.BaseServiceImpl;
7
+import org.springframework.stereotype.Service;
8
+
9
+/**
10
+ * 消息表;(ta_massage)表服务实现类
11
+ *
12
+ * @author : http://www.chiner.pro
13
+ * @date : 2024-3-14
14
+ */
15
+@Service
16
+public class TaMessageServiceImpl extends BaseServiceImpl<TaMessageMapper, TaMessage> implements TaMessageService {
17
+
18
+}

+ 78
- 6
application/src/main/java/com/lyg/application/service/impl/TaRotationServiceImpl.java 查看文件

@@ -1,12 +1,20 @@
1 1
 package com.lyg.application.service.impl;
2 2
 
3
+import com.lyg.application.entity.TaMessage;
3 4
 import com.lyg.application.entity.TaRotation;
5
+import com.lyg.application.entity.TaSending;
6
+import com.lyg.application.mapper.TaMessageMapper;
4 7
 import com.lyg.application.mapper.TaRotationMapper;
8
+import com.lyg.application.mapper.TaSendingMapper;
5 9
 import com.lyg.application.service.TaRotationService;
6 10
 import com.lyg.application.util.Rule;
11
+import com.lyg.common.util.StringUtil;
12
+import com.lyg.system.entity.SysUser;
7 13
 import com.lyg.system.mapper.SysPositionMapper;
14
+import com.lyg.system.mapper.SysUserMapper;
8 15
 import com.lyg.system.service.SysOrgService;
9 16
 import com.lyg.system.service.SysPositionService;
17
+import com.lyg.system.service.SysUserService;
10 18
 import com.lyg.system.service.impl.BaseServiceImpl;
11 19
 import org.springframework.beans.factory.annotation.Autowired;
12 20
 import org.springframework.stereotype.Service;
@@ -34,6 +42,15 @@ public class TaRotationServiceImpl extends BaseServiceImpl<TaRotationMapper, TaR
34 42
     private SysPositionService sysPositionService;
35 43
     @Autowired
36 44
     private SysPositionMapper sysPositionMapper;
45
+    @Autowired
46
+    private TaMessageMapper taMessageMapper;
47
+    @Autowired
48
+    private TaSendingMapper taSendingMapper;
49
+
50
+    @Autowired
51
+    private SysUserService sysUserService;
52
+    @Autowired
53
+    private SysUserMapper sysUserMapper;
37 54
 
38 55
     public TaRotation handleEntity(TaRotation entity, Integer index) throws Exception {
39 56
 //校验验证
@@ -58,10 +75,10 @@ public class TaRotationServiceImpl extends BaseServiceImpl<TaRotationMapper, TaR
58 75
 //        轮岗之前岗位名  获取id
59 76
         String rotationId = sysPositionMapper.getPostId(rotationName);
60 77
         entity.setCounterImpPositions(rotationId);
61
-        if(impPostRotation!=null){
62
-        //   轮岗之后岗位名  获取id
63
-        String impPostRotationId = sysPositionMapper.getPostId(impPostRotation);
64
-        entity.setCounterImpPostRotation(impPostRotationId);
78
+        if (impPostRotation != null) {
79
+            //   轮岗之后岗位名  获取id
80
+            String impPostRotationId = sysPositionMapper.getPostId(impPostRotation);
81
+            entity.setCounterImpPostRotation(impPostRotationId);
65 82
         }
66 83
 
67 84
 
@@ -109,13 +126,68 @@ public class TaRotationServiceImpl extends BaseServiceImpl<TaRotationMapper, TaR
109 126
         System.out.println("******************************entityList**************************************");
110 127
         System.out.println(entityList);
111 128
         for (TaRotation taRotation : entityList) {
112
-
113
-
114 129
             baseMapper.insert(taRotation);
115 130
 
116 131
         }
117 132
     }
118 133
 
134
+    @Override
135
+    public void selectGetWaring() {
136
+        LocalDate localDate = LocalDate.now();
137
+
138
+//预警 消息
139
+        List<TaRotation> earlyWaringList = baseMapper.waring(localDate);
140
+        if (earlyWaringList.size() != 0) {
141
+            for (TaRotation item : earlyWaringList) {
142
+                TaMessage taMessage = new TaMessage();
143
+                String uuid = StringUtil.UUID();
144
+                taMessage.setMessageId(uuid);
145
+                taMessage.setSourceId(item.getRotationId());
146
+                String contentSent = "工号:" + item.getEmployeeNum() + ", 名字:" + item.getEmployeeName() + ", 业务条线:" + item.getCounterHeadOfficeLine() + ", 超过轮岗截止日期, 请及时处理";
147
+                taMessage.setContentSent(contentSent);
148
+                taMessage.setSourceName("taRotation");
149
+                taMessage.setWaringStatus("waring");
150
+                taMessageMapper.insert(taMessage);
151
+
152
+
153
+//                item.getCreateUser()  就是新增这个数据的人
154
+                //现在需要去重 创建人和管理员  是一个人只能往  Tasending插入一条数据否则是两条数据
155
+                SysUser sysUserAdmin = sysUserMapper.getAdmin(item.getCreateUser());
156
+//                如果为空 就不是管理员创建的;
157
+                List<String> userIdList = new ArrayList<>();
158
+
159
+                if (sysUserAdmin == null) {
160
+                    userIdList = sysUserMapper.allAdmin();
161
+                    userIdList.add(sysUserAdmin.getUserId());
162
+                }
163
+                for (String it : userIdList) {
164
+                    TaSending taSending = new TaSending();
165
+                    taSending.setMessageId(uuid);
166
+                    taSending.setRecipientId(it);
167
+                    taSendingMapper.insert(taSending);
168
+                }
169
+
170
+
171
+            }
172
+        }
173
+//提示消息
174
+        List<TaRotation> earlyPromptList = baseMapper.prompt(localDate);
175
+        if (earlyPromptList.size() != 0) {
176
+            for (TaRotation item : earlyPromptList) {
177
+                TaMessage taMessage = new TaMessage();
178
+                taMessage.setSourceId(item.getRotationId());
179
+                String contentSent = "工号:" + item.getEmployeeNum() + ", 名字:" + item.getEmployeeName() + ", 业务条线:" + item.getCounterHeadOfficeLine() + ",即将轮岗, 请及时处理";
180
+                taMessage.setContentSent(contentSent);
181
+                taMessage.setSourceName("taRotation");
182
+                taMessage.setWaringStatus("prompt");
183
+                taMessageMapper.insert(taMessage);
184
+            }
185
+        }
186
+
187
+
188
+        return;
189
+    }
190
+
119 191
 
120 192
     public List<Object> getErrorMessages() {
121 193
         return errorMessages;

+ 18
- 0
application/src/main/java/com/lyg/application/service/impl/TaSendingServiceImpl.java 查看文件

@@ -0,0 +1,18 @@
1
+package com.lyg.application.service.impl;
2
+
3
+import com.lyg.system.service.impl.BaseServiceImpl;
4
+import org.springframework.beans.factory.annotation.Autowired;
5
+import org.springframework.stereotype.Service;
6
+import com.lyg.application.entity.TaSending;
7
+import com.lyg.application.mapper.TaSendingMapper;
8
+import com.lyg.application.service.TaSendingService;
9
+
10
+ /**
11
+ * 发送消息;(ta_sending)表服务实现类
12
+ * @author : http://www.chiner.pro
13
+ * @date : 2024-3-14
14
+ */
15
+@Service
16
+public class TaSendingServiceImpl extends BaseServiceImpl<TaSendingMapper, TaSending> implements TaSendingService {
17
+    
18
+}

+ 6
- 0
application/src/main/resources/mapper/TaMessageMapper.xml 查看文件

@@ -0,0 +1,6 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3
+
4
+<mapper namespace="com.lyg.application.mapper.TaMessageMapper">
5
+    
6
+</mapper>

+ 9
- 0
application/src/main/resources/mapper/TaRotationMapper.xml 查看文件

@@ -21,4 +21,13 @@
21 21
             #{item}
22 22
         </foreach>
23 23
     </select>
24
+    <select id="waring" resultType="com.lyg.application.entity.TaRotation">
25
+        SELECT * FROM TA_ROTATION r
26
+        WHERE r.rotation_deadline &lt; #{localDate}
27
+    </select>
28
+    <select id="prompt" resultType="com.lyg.application.entity.TaRotation">
29
+        SELECT * FROM TA_ROTATION r
30
+        WHERE r.rotation_deadline>=ADD_MONTHS(#{localDate} , -1)
31
+        AND r.rotation_deadline &lt; #{localDate}
32
+    </select>
24 33
 </mapper>

+ 6
- 0
application/src/main/resources/mapper/TaSendingMapper.xml 查看文件

@@ -0,0 +1,6 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3
+
4
+<mapper namespace="com.lyg.application.mapper.TaSendingMapper">
5
+    
6
+</mapper>

+ 1
- 0
system/src/main/java/com/lyg/system/controller/BaseController.java 查看文件

@@ -36,6 +36,7 @@ public class BaseController {
36 36
         Integer isAdmin = sysUser.getIsAdmin();
37 37
         if (isAdmin.equals(1)) {
38 38
             //是超级管理员
39
+
39 40
         } else {
40 41
 //            不是管理员
41 42
             String userId = sysUser.getUserId();

+ 6
- 0
system/src/main/java/com/lyg/system/mapper/SysUserMapper.java 查看文件

@@ -3,6 +3,9 @@ package com.lyg.system.mapper;
3 3
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4 4
 import com.lyg.system.entity.SysUser;
5 5
 import org.apache.ibatis.annotations.Mapper;
6
+import org.apache.ibatis.annotations.Param;
7
+
8
+import java.util.List;
6 9
 
7 10
 /**
8 11
  * 用户表;(sys_user)表数据库访问层
@@ -11,4 +14,7 @@ import org.apache.ibatis.annotations.Mapper;
11 14
  */
12 15
 @Mapper
13 16
 public interface SysUserMapper  extends BaseMapper<SysUser>{
17
+    SysUser getAdmin(@Param("createUser") String createUser);
18
+
19
+    List<String> allAdmin();
14 20
 }

+ 19
- 0
system/src/main/resources/mapper/SysUserMapper.xml 查看文件

@@ -3,4 +3,23 @@
3 3
 
4 4
 <mapper namespace="com.lyg.system.mapper.SysUserMapper">
5 5
 
6
+    <select id="getAdmin" resultType="com.lyg.system.entity.SysUser">
7
+        SELECT
8
+        *
9
+        FROM
10
+        SYS_USER u
11
+        WHERE
12
+        u.is_admin = 1
13
+        AND u.user_id = #{createUser}
14
+        AND u.DELETED = 0
15
+    </select>
16
+    <select id="allAdmin" resultType="java.lang.String">
17
+        SELECT
18
+        u.user_id
19
+        FROM
20
+        SYS_USER u
21
+        WHERE
22
+        u.is_admin = 1
23
+        AND u.DELETED = 0
24
+    </select>
6 25
 </mapper>