Browse Source

优化文件导入功能操作日志

tags/正式3.13.0
王宁 1 year ago
parent
commit
c37350f9d9

+ 2
- 2
sapi/src/main/java/com/xhkjedu/sapi/controller/assess/AssessUserController.java View File

5
 import com.xhkjedu.annotation.Action;
5
 import com.xhkjedu.annotation.Action;
6
 import com.xhkjedu.sapi.model.assess.TAssessUser;
6
 import com.xhkjedu.sapi.model.assess.TAssessUser;
7
 import com.xhkjedu.sapi.service.assess.AssessUserService;
7
 import com.xhkjedu.sapi.service.assess.AssessUserService;
8
+import com.xhkjedu.sapi.utils.PoiUtils;
8
 import com.xhkjedu.utils.N_Utils;
9
 import com.xhkjedu.utils.N_Utils;
9
 import com.xhkjedu.utils.PageUtil;
10
 import com.xhkjedu.utils.PageUtil;
10
-import com.xhkjedu.sapi.utils.PoiUtils;
11
 import com.xhkjedu.vo.PageResult;
11
 import com.xhkjedu.vo.PageResult;
12
 import com.xhkjedu.vo.ResultVo;
12
 import com.xhkjedu.vo.ResultVo;
13
 import org.springframework.web.bind.annotation.PostMapping;
13
 import org.springframework.web.bind.annotation.PostMapping;
77
 
77
 
78
     @PostMapping("/import")
78
     @PostMapping("/import")
79
     @Action("评价录入-导入用户")
79
     @Action("评价录入-导入用户")
80
-    public ResultVo importAssess(MultipartFile file, TAssessUser user) {
80
+    public ResultVo importAssess(TAssessUser user,MultipartFile file) {
81
         Integer schoolid = user.getSchoolid();
81
         Integer schoolid = user.getSchoolid();
82
         Integer assessid = user.getAssessid();
82
         Integer assessid = user.getAssessid();
83
         Integer templateid = user.getTemplateid();
83
         Integer templateid = user.getTemplateid();

+ 0
- 3
scommons/src/main/java/com/xhkjedu/model/slog/THandleLog.java View File

45
     //操作状态1成功2失败
45
     //操作状态1成功2失败
46
     private Integer handlestate;
46
     private Integer handlestate;
47
 
47
 
48
-    //操作内容
49
-    private String handlecontent;
50
-
51
     //操作参数
48
     //操作参数
52
     private String handleparas;
49
     private String handleparas;
53
 
50
 

+ 1
- 1
sexam/src/main/java/com/xhkjedu/sexam/controller/paperstudent/EPsqbatchController.java View File

96
      **/
96
      **/
97
     @PostMapping("/import")
97
     @PostMapping("/import")
98
     @Action("考试测评-导入补录成绩")
98
     @Action("考试测评-导入补录成绩")
99
-    public ResultVo importRecord(MultipartFile file, EPsqbatch batch) {
99
+    public ResultVo importRecord(EPsqbatch batch, MultipartFile file) {
100
         N_Utils.validation(new Object[]{batch.getExamid(), "考试id", 1, batch.getSubjectname(), "科目名称", 2
100
         N_Utils.validation(new Object[]{batch.getExamid(), "考试id", 1, batch.getSubjectname(), "科目名称", 2
101
                 , batch.getEpid(), "试卷id", 1, batch.getTeacherid(), "教师id", 1});
101
                 , batch.getEpid(), "试卷id", 1, batch.getTeacherid(), "教师id", 1});
102
         return ePsqbatchService.importRecord(file, batch);
102
         return ePsqbatchService.importRecord(file, batch);

+ 1
- 1
slive/src/main/java/com/xhkjedu/slive/controller/xz/XzController.java View File

206
 
206
 
207
     @PostMapping("/import")
207
     @PostMapping("/import")
208
     @Action("行政直播-导入")
208
     @Action("行政直播-导入")
209
-    public ResultVo importKb(MultipartFile file, LXz xz) {
209
+    public ResultVo importKb(LXz xz,MultipartFile file) {
210
         Integer xzid = xz.getXzid();
210
         Integer xzid = xz.getXzid();
211
         Integer createid = xz.getCreateid();
211
         Integer createid = xz.getCreateid();
212
         N_Utils.validation(new Object[]{xzid, "行政直播id", 1, createid, "创建人id", 1});
212
         N_Utils.validation(new Object[]{xzid, "行政直播id", 1, createid, "创建人id", 1});

+ 0
- 19
slog/src/main/java/com/xhkjedu/slog/controller/log/HandleLogController.java View File

28
     @Resource
28
     @Resource
29
     private HandleLogService handleLogService;
29
     private HandleLogService handleLogService;
30
 
30
 
31
-    /*
32
-     * @Description 保存操作日志
33
-     * @Date 2023/11/15 11:01:32
34
-     * @Author WN
35
-     * @Param [log]
36
-     * @Return com.xhkjedu.vo.ResultVo
37
-     **/
38
-    @PostMapping("/add")
39
-    public ResultVo add(@RequestBody THandleLog log){
40
-
41
-        int handleid = handleLogService.add(log);
42
-        if(handleid > 0){
43
-            return new ResultVo(0, "保存成功");
44
-        }else{
45
-            return new ResultVo(1, "保存失败");
46
-        }
47
-    }
48
-
49
-
50
     /*
31
     /*
51
      * @Description 操作日志-校园列表
32
      * @Description 操作日志-校园列表
52
      * @Date 2023/11/15 10:59:59
33
      * @Date 2023/11/15 10:59:59

+ 2
- 2
slog/src/main/resources/mapper/log/HandleLogMapper.xml View File

26
                 and versionnum=#{log.versionnum}
26
                 and versionnum=#{log.versionnum}
27
             </if>
27
             </if>
28
             <if test="log.handleparas!=null and log.handleparas!=''">
28
             <if test="log.handleparas!=null and log.handleparas!=''">
29
-                and (handleparas like '%${log.handleparas}%' or handlemodel like '%${log.handleparas}%')
29
+                and (handleaction like '%${log.handleparas}%' or handlemodel like '%${log.handleparas}%')
30
             </if>
30
             </if>
31
         </where>
31
         </where>
32
         order by handleid desc
32
         order by handleid desc
58
                 and l.versionnum=#{log.versionnum}
58
                 and l.versionnum=#{log.versionnum}
59
             </if>
59
             </if>
60
             <if test="log.handleparas!=null and log.handleparas!=''">
60
             <if test="log.handleparas!=null and log.handleparas!=''">
61
-                and (handleparas like '%${log.handleparas}%' or handlemodel like '%${log.handleparas}%')
61
+                and (handleaction like '%${log.handleparas}%' or handlemodel like '%${log.handleparas}%')
62
             </if>
62
             </if>
63
         </where>
63
         </where>
64
         order by l.handleid desc
64
         order by l.handleid desc

+ 2
- 2
suser/src/main/java/com/xhkjedu/suser/controller/gradeclass/ClassStudentController.java View File

108
 
108
 
109
     @PostMapping("/import_user")
109
     @PostMapping("/import_user")
110
     @Action("班级学生-导入")
110
     @Action("班级学生-导入")
111
-    public ResultVo importUser(MultipartFile file,TClassStudent tClassStudent) {
111
+    public ResultVo importUser(TClassStudent tClassStudent,MultipartFile file) {
112
         return classStudentService.importUser(file, tClassStudent);
112
         return classStudentService.importUser(file, tClassStudent);
113
     }
113
     }
114
 
114
 
115
     //提高班学生导入
115
     //提高班学生导入
116
     @PostMapping("/import_user2")
116
     @PostMapping("/import_user2")
117
     @Action("班级学生-导入")
117
     @Action("班级学生-导入")
118
-    public ResultVo importUser2(MultipartFile file,TClassStudent tClassStudent) {
118
+    public ResultVo importUser2(TClassStudent tClassStudent,MultipartFile file) {
119
         return classStudentService.importUser2(file, tClassStudent);
119
         return classStudentService.importUser2(file, tClassStudent);
120
     }
120
     }
121
 
121
 

+ 1
- 1
suser/src/main/java/com/xhkjedu/suser/controller/system/UserController.java View File

279
      **/
279
      **/
280
     @PostMapping("/import_teacher")
280
     @PostMapping("/import_teacher")
281
     @Action("用户管理-导入教师")
281
     @Action("用户管理-导入教师")
282
-    public ResultVo importTeacher(MultipartFile file, TUser user) {
282
+    public ResultVo importTeacher(TUser user, MultipartFile file) {
283
         return userService.importTeacher(file, user);
283
         return userService.importTeacher(file, user);
284
     }
284
     }
285
 
285
 

Loading…
Cancel
Save