feat: update something

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/aspect/DeptPermissionAspect.java

@@ -40,7 +40,7 @@
 // 	 */
 // 	@Pointcut(value = "execution(* com.qunzhixinxi.hnqz.admin.controller.ReportExportController.exportNbReport(..)) " +
 // 			"|| execution(* com.qunzhixinxi.hnqz.admin.controller.ReportExportController.exportZbReport(..)) " +
-// 			"|| execution(* com.qunzhixinxi.hnqz.admin.controller.WmTaskController.exportNba(..)) " +
+// 			"|| execution(* com.qunzhixinxi.hnqz.admin.controller.task.WmTaskController.exportNba(..)) " +
 // 			"|| execution(* com.qunzhixinxi.hnqz.admin.controller.ReportExportController.exportZbInfoJs(..)) " +
 // 			"|| execution(* com.qunzhixinxi.hnqz.admin.controller.ReportExportController.exportZbInfoFormWeiNew(..))")
 // 	public void controllerAspect() {

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysAreaController.java → hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/area/SysAreaController.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.controller;
+package com.qunzhixinxi.hnqz.admin.controller.area;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.tree.Tree;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysFileController.java → hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/file/SysFileController.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.controller;
+package com.qunzhixinxi.hnqz.admin.controller.file;
 
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysLogController.java → hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/log/SysLogController.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.controller;
+package com.qunzhixinxi.hnqz.admin.controller.log;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysMenuController.java → hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/menu/SysMenuController.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.controller;
+package com.qunzhixinxi.hnqz.admin.controller.menu;
 
 import com.qunzhixinxi.hnqz.admin.api.dto.MenuTree;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmScorePackageStatusController.java → hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/pkg/WmScorePackageStatusController.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.controller;
+package com.qunzhixinxi.hnqz.admin.controller.pkg;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmScorePackageTaskRefController.java → hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/pkg/WmScorePackageTaskRefController.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.controller;
+package com.qunzhixinxi.hnqz.admin.controller.pkg;
 
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -7,7 +7,6 @@ import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmScorePackageTaskRef;
 import com.qunzhixinxi.hnqz.admin.service.WmScorePackageTaskRefService;
-import org.springframework.security.access.prepost.PreAuthorize;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmScoreTaskTypeController.java → hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/pkg/WmScoreTaskTypeController.java

@@ -1,5 +1,5 @@
 
-package com.qunzhixinxi.hnqz.admin.controller;
+package com.qunzhixinxi.hnqz.admin.controller.pkg;
 
 import com.alibaba.csp.sentinel.util.StringUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmSupervisionController.java → hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/supervision/WmSupervisionController.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.controller;
+package com.qunzhixinxi.hnqz.admin.controller.supervision;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qunzhixinxi.hnqz.admin.api.dto.WmSupervisionDto;
@@ -16,9 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.io.IOException;
 import java.time.LocalDate;
-import java.util.List;
 import java.util.Map;
 
 /**

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmTaskContentConfigController.java → hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/task/WmTaskContentConfigController.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.controller;
+package com.qunzhixinxi.hnqz.admin.controller.task;
 
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmTaskContentController.java → hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/task/WmTaskContentController.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.controller;
+package com.qunzhixinxi.hnqz.admin.controller.task;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmTaskController.java → hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/task/WmTaskController.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.controller;
+package com.qunzhixinxi.hnqz.admin.controller.task;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmTaskRuleController.java → hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/task/WmTaskRuleController.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.controller;
+package com.qunzhixinxi.hnqz.admin.controller.task;
 
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmTaskSubmissionPercentRuleController.java → hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/task/WmTaskSubmissionPercentRuleController.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.controller;
+package com.qunzhixinxi.hnqz.admin.controller.task;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmTaskSubmissionRuleController.java → hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/task/WmTaskSubmissionRuleController.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.controller;
+package com.qunzhixinxi.hnqz.admin.controller.task;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmTaskTypeController.java → hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/task/WmTaskTypeController.java

@@ -1,18 +1,16 @@
-package com.qunzhixinxi.hnqz.admin.controller;
+package com.qunzhixinxi.hnqz.admin.controller.task;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qunzhixinxi.hnqz.admin.api.dto.WmTaskDTO;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmDaAgent;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmDaDrugEnt;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmRelation;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmScoreTaskType;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTask;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskTypeEntRef;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskTypeTree;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmTaskTypeEntRefController.java → hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/task/WmTaskTypeEntRefController.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.controller;
+package com.qunzhixinxi.hnqz.admin.controller.task;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmTaskTypeScoreRefController.java → hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/task/WmTaskTypeScoreRefController.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.controller;
+package com.qunzhixinxi.hnqz.admin.controller.task;
 
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysUserController.java → hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/user/SysUserController.java

@@ -1,11 +1,9 @@
-package com.qunzhixinxi.hnqz.admin.controller;
+package com.qunzhixinxi.hnqz.admin.controller.user;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.lang.tree.Tree;
-import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.IdcardUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
@@ -21,10 +19,8 @@ import com.qunzhixinxi.hnqz.admin.api.dto.UserDTO;
 import com.qunzhixinxi.hnqz.admin.api.dto.UserInfo;
 import com.qunzhixinxi.hnqz.admin.api.dto.UserPwd;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysAreaEntity;
-import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysRole;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
-import com.qunzhixinxi.hnqz.admin.api.entity.SysUserRole;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmPlatformQuizTestResult;
 import com.qunzhixinxi.hnqz.admin.api.model.WmQuizResultModel;
 import com.qunzhixinxi.hnqz.admin.api.vo.UserVO;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysUserRecordController.java → hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/user/SysUserRecordController.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.controller;
+package com.qunzhixinxi.hnqz.admin.controller.user;
 
 import com.qunzhixinxi.hnqz.admin.api.entity.UserRecord;
 import com.qunzhixinxi.hnqz.admin.service.UserRecordSerivce;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmUserSignController.java → hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/user/WmUserSignController.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.controller;
+package com.qunzhixinxi.hnqz.admin.controller.user;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;