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

sapi/src/main/java/com/xhkjedu/sapi/controller/assess/AssessUserController.java

@@ -5,9 +5,9 @@ import com.github.pagehelper.PageInfo;
 import com.xhkjedu.annotation.Action;
 import com.xhkjedu.sapi.model.assess.TAssessUser;
 import com.xhkjedu.sapi.service.assess.AssessUserService;
+import com.xhkjedu.sapi.utils.PoiUtils;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.utils.PageUtil;
-import com.xhkjedu.sapi.utils.PoiUtils;
 import com.xhkjedu.vo.PageResult;
 import com.xhkjedu.vo.ResultVo;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -77,7 +77,7 @@ public class AssessUserController {
 
     @PostMapping("/import")
     @Action("评价录入-导入用户")
-    public ResultVo importAssess(MultipartFile file, TAssessUser user) {
+    public ResultVo importAssess(TAssessUser user,MultipartFile file) {
         Integer schoolid = user.getSchoolid();
         Integer assessid = user.getAssessid();
         Integer templateid = user.getTemplateid();

scommons/src/main/java/com/xhkjedu/model/slog/THandleLog.java

@@ -45,9 +45,6 @@ public class THandleLog extends BaseBean {
     //操作状态1成功2失败
     private Integer handlestate;
 
-    //操作内容
-    private String handlecontent;
-
     //操作参数
     private String handleparas;
 

sexam/src/main/java/com/xhkjedu/sexam/controller/paperstudent/EPsqbatchController.java

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

slive/src/main/java/com/xhkjedu/slive/controller/xz/XzController.java

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

slog/src/main/java/com/xhkjedu/slog/controller/log/HandleLogController.java

@@ -28,25 +28,6 @@ public class HandleLogController {
     @Resource
     private HandleLogService handleLogService;
 
-    /*
-     * @Description 保存操作日志
-     * @Date 2023/11/15 11:01:32
-     * @Author WN
-     * @Param [log]
-     * @Return com.xhkjedu.vo.ResultVo
-     **/
-    @PostMapping("/add")
-    public ResultVo add(@RequestBody THandleLog log){
-
-        int handleid = handleLogService.add(log);
-        if(handleid > 0){
-            return new ResultVo(0, "保存成功");
-        }else{
-            return new ResultVo(1, "保存失败");
-        }
-    }
-
-
     /*
      * @Description 操作日志-校园列表
      * @Date 2023/11/15 10:59:59

slog/src/main/resources/mapper/log/HandleLogMapper.xml

@@ -26,7 +26,7 @@
                 and versionnum=#{log.versionnum}
             </if>
             <if test="log.handleparas!=null and log.handleparas!=''">
-                and (handleparas like '%${log.handleparas}%' or handlemodel like '%${log.handleparas}%')
+                and (handleaction like '%${log.handleparas}%' or handlemodel like '%${log.handleparas}%')
             </if>
         </where>
         order by handleid desc
@@ -58,7 +58,7 @@
                 and l.versionnum=#{log.versionnum}
             </if>
             <if test="log.handleparas!=null and log.handleparas!=''">
-                and (handleparas like '%${log.handleparas}%' or handlemodel like '%${log.handleparas}%')
+                and (handleaction like '%${log.handleparas}%' or handlemodel like '%${log.handleparas}%')
             </if>
         </where>
         order by l.handleid desc

suser/src/main/java/com/xhkjedu/suser/controller/gradeclass/ClassStudentController.java

@@ -108,14 +108,14 @@ public class ClassStudentController {
 
     @PostMapping("/import_user")
     @Action("班级学生-导入")
-    public ResultVo importUser(MultipartFile file,TClassStudent tClassStudent) {
+    public ResultVo importUser(TClassStudent tClassStudent,MultipartFile file) {
         return classStudentService.importUser(file, tClassStudent);
     }
 
     //提高班学生导入
     @PostMapping("/import_user2")
     @Action("班级学生-导入")
-    public ResultVo importUser2(MultipartFile file,TClassStudent tClassStudent) {
+    public ResultVo importUser2(TClassStudent tClassStudent,MultipartFile file) {
         return classStudentService.importUser2(file, tClassStudent);
     }
 

suser/src/main/java/com/xhkjedu/suser/controller/system/UserController.java

@@ -279,7 +279,7 @@ public class UserController {
      **/
     @PostMapping("/import_teacher")
     @Action("用户管理-导入教师")
-    public ResultVo importTeacher(MultipartFile file, TUser user) {
+    public ResultVo importTeacher(TUser user, MultipartFile file) {
         return userService.importTeacher(file, user);
     }