`fix`

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/util/CabinetUtil.java

@@ -42,15 +42,6 @@ import java.util.*;
 @Component
 public class CabinetUtil {
 
-    @Autowired
-    ISysDictDataService sysDictDataService;
-
-    @Autowired
-    ITblExpressStaticsService tblExpressStaticsService;
-
-    @Autowired
-    ISysUserService userService;
-
     private  final static String appid = "bw_open_express_A8C848769E5C04E0";
     private  final static String appkey = "5AFC6E07CFCF4A359B775D1416A9799A";
 
@@ -109,16 +100,14 @@ public class CabinetUtil {
 
 
     @Scheduled(cron = "0 10 0 ? * ? ")
+//    @Scheduled(cron = "0/10 * * * * * ")
     private void getExpressStatic() {
-        ThreadUtil.execAsync(new Runnable() {
-            @Override
-            public void run() {
+
+
                 SysUserBo sysUserBo = new SysUserBo();
                 sysUserBo.setRoleId(1763484881548447746L);
-                PageQuery pageQuery = new PageQuery();
-                pageQuery.setPageSize(1000);
-                pageQuery.setPageNum(1);
-                List<SysUserVo> userlist =  userService.selectAllocatedList(sysUserBo,pageQuery).getRows();
+
+                List<SysUserVo> userlist =  SpringUtils.getBean(ISysUserService.class).getUserList(sysUserBo);
                 log.info(String.valueOf(userlist.size()));
                 for(SysUserVo vo:userlist){
                     if(!vo.getPhonenumber().isEmpty() && vo.getPhonenumber() != null){
@@ -133,12 +122,12 @@ public class CabinetUtil {
                             TblExpressStaticsBo query = new TblExpressStaticsBo();
                             query.setMonth(month);
                             query.setUserId(vo.getUserId());
-                            List<TblExpressStaticsVo> list = tblExpressStaticsService.queryList(query);
+                            List<TblExpressStaticsVo> list = SpringUtils.getBean(ITblExpressStaticsService.class).queryList(query);
                             if(list.size() > 0){
                                 bo.setId(list.get(0).getId());
-                                tblExpressStaticsService.updateByBo(bo);
+                                SpringUtils.getBean(ITblExpressStaticsService.class).updateByBo(bo);
                             }else{
-                                tblExpressStaticsService.insertByBo(bo);
+                                SpringUtils.getBean(ITblExpressStaticsService.class).insertByBo(bo);
                             }
                             log.info("----------------------快递员{}结束同步----------------------",vo.getNickName());
                         }catch (Exception e){
@@ -147,8 +136,7 @@ public class CabinetUtil {
                     }
                 }
 
-            }
-        });
+
 
 
 
@@ -303,7 +291,7 @@ public class CabinetUtil {
         //获取所有站点led
         SysDictDataBo bo =new SysDictDataBo();
         bo.setDictType("tbl_sites");
-        List<SysDictDataVo> allstations = sysDictDataService.selectDictDataList(bo);
+        List<SysDictDataVo> allstations = SpringUtils.getBean(ISysDictDataService.class).selectDictDataList(bo);
         for (SysDictDataVo station:allstations) {
             //获取led
             if(StringUtils.isNotEmpty(station.getRemark())) {
@@ -335,12 +323,12 @@ public class CabinetUtil {
             TblExpressStaticsBo query = new TblExpressStaticsBo();
             query.setMonth(month);
             query.setUserId(1L);
-            List<TblExpressStaticsVo> list = tblExpressStaticsService.queryList(query);
+            List<TblExpressStaticsVo> list = SpringUtils.getBean(ITblExpressStaticsService.class).queryList(query);
             if(list.size() > 0){
                 bo.setId(list.get(0).getId());
-                tblExpressStaticsService.updateByBo(bo);
+                SpringUtils.getBean(ITblExpressStaticsService.class).updateByBo(bo);
             }else{
-                tblExpressStaticsService.insertByBo(bo);
+                SpringUtils.getBean(ITblExpressStaticsService.class).insertByBo(bo);
             }
             return R.ok(bo);
         }catch (Exception e){

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java

@@ -37,6 +37,9 @@ public interface SysUserMapper extends BaseMapperPlus<SysUser, SysUserVo> {
     })
     List<SysUserVo> selectUserList(@Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper);
 
+
+    List<SysUserVo> getUserList(@Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper);
+
     /**
      * 根据条件分页查询已配用户角色列表
      *

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java

@@ -25,6 +25,7 @@ public interface ISysUserService {
      */
     List<SysUserVo> selectUserList(SysUserBo user);
 
+    List<SysUserVo> getUserList(SysUserBo user);
     /**
      * 根据条件分页查询已分配用户角色列表
      *

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java

@@ -85,6 +85,10 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
         return baseMapper.selectUserList(this.buildQueryWrapper(user));
     }
 
+    @Override
+    public List<SysUserVo> getUserList(SysUserBo user) {
+        return baseMapper.getUserList(this.buildQueryWrapper(user));
+    }
     private Wrapper<SysUser> buildQueryWrapper(SysUserBo user) {
         Map<String, Object> params = user.getParams();
         QueryWrapper<SysUser> wrapper = Wrappers.query();

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -76,6 +76,15 @@
     </select>
 
 
+    <select id="getUserList" resultMap="SysUserResult">
+        select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,
+               u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
+               d.dept_name, d.leader, u1.user_name as leaderName
+        from sys_user u
+                 left join sys_dept d on u.dept_id = d.dept_id
+                 left join sys_user u1 on u1.user_id = d.leader
+            ${ew.getCustomSqlSegment}
+    </select>
 
 
     <select id="selectUserList" resultMap="SysUserResult">