修改首页信息以及miniadmin源码

src/main/java/com/dreamchaser/depository_manage/controller/PageController.java

@@ -314,57 +314,10 @@ public class PageController {
         if (b) {
             mv.setViewName("pages/other/welcome_mobile");
         } else {
-            Map<String, Object> paramForTask = new HashMap<>();
-            paramForTask.put("isDone", 0);
-            paramForTask.put("userId", userToken.getId());
-            paramForTask.put("departmentHead", userToken.getNumber());
-
-            // 定义任务列表
-            List<SimpleTaskP> list = new ArrayList<>();
-
-            // 查询出库任务
-            List<SimpleApplicationOutOrInRecordP> myTaskOut = depositoryRecordService.findMyTaskOut(paramForTask, userToken);
-
-            for (SimpleApplicationOutOrInRecordP simpleApplicationOutOrInRecordP : myTaskOut) {
-                SimpleTaskP simpleTaskP = new SimpleTaskP(simpleApplicationOutOrInRecordP);
-                list.add(simpleTaskP);
-            }
-            // 查询盘点任务
-            List<SimpleStockTakingP> task = stockTakingService.findMyTask(paramForTask, request);
-            for (SimpleStockTakingP simpleStockTakingP : task) {
-                SimpleTaskP simpleTaskP = new SimpleTaskP(simpleStockTakingP);
-                list.add(simpleTaskP);
-            }
-
-            // 查询入库任务
-            List<SimpleApplicationOutOrInRecordP> myTaskIn = depositoryRecordService.findMyTaskIn(paramForTask, userToken);
-            for (SimpleApplicationOutOrInRecordP simpleApplicationOutOrInRecordP : myTaskIn) {
-                SimpleTaskP simpleTaskP = new SimpleTaskP(simpleApplicationOutOrInRecordP);
-                list.add(simpleTaskP);
-            }
-
-            String key = "user:" + userToken.getId().toString();
-            String minRecord = (String) redisTemplateForHash.opsForHash().get(key, "minRecord");
-            if (minRecord != null) {
-                // 获取子订单键值
-                String[] split = minRecord.replace("[", "").replace("]", "").split(",");
-                for (String s : split) {
-                    if ("".equals(s)) {
-                        continue;
-                    }
-                    Integer minRecordId = ObjectFormatUtil.toInteger(s.split(":")[1].trim());
-                    ApplicationOutRecordMinP applicationOutMinById = depositoryRecordService.findApplicationOutMinById(minRecordId);
-                    ApplicationOutRecordP applicationOutRecordPById = depositoryRecordService.findApplicationOutRecordPById(applicationOutMinById.getParentId());
-                    UserByPort userByPort = LinkInterfaceUtil.FindUserById(applicationOutRecordPById.getApplicantId(), userToken);
-                    applicationOutRecordPById.setApplicantName(userByPort.getName());
-                    SimpleTaskP simpleTaskP = new SimpleTaskP(applicationOutRecordPById, applicationOutMinById);
-                    list.add(simpleTaskP);
-                }
-            }
+            List<SimpleTaskP> list = getUserSimpleTaskP(userToken);
             mv.setViewName("pages/other/welcome");
             mv.addObject("myTaskList", list);
 
-
             Map<String, Object> map = new HashMap<>();
             map.put("begin", 0);
             map.put("size", 6);
@@ -3188,6 +3141,8 @@ public class PageController {
     }
 
 
+
+
     // 用于跳转到库存盘点时编辑页面
     @GetMapping("/stockTakingInfoForInventory")
     public ModelAndView stockTakingInfoForInventory(@RequestParam Map<String, String> param, HttpServletRequest request) {
@@ -3228,4 +3183,63 @@ public class PageController {
         return mv;
     }
 
+
+    /**
+     * 用于获取当前用户的任务列表
+     * @param userToken 当前用户
+     * @return
+     */
+    public List<SimpleTaskP> getUserSimpleTaskP(UserByPort userToken){
+        Map<String, Object> paramForTask = new HashMap<>();
+        paramForTask.put("isDone", 0);
+        paramForTask.put("userId", userToken.getId());
+        paramForTask.put("departmentHead", userToken.getNumber());
+
+        // 定义任务列表
+        List<SimpleTaskP> list = new ArrayList<>();
+
+        // 查询出库任务
+        List<SimpleApplicationOutOrInRecordP> myTaskOut = depositoryRecordService.findMyTaskOut(paramForTask, userToken);
+
+        for (SimpleApplicationOutOrInRecordP simpleApplicationOutOrInRecordP : myTaskOut) {
+            SimpleTaskP simpleTaskP = new SimpleTaskP(simpleApplicationOutOrInRecordP);
+            list.add(simpleTaskP);
+        }
+        // 查询盘点任务
+        List<SimpleStockTakingP> task = stockTakingService.findMyTask(paramForTask, userToken);
+        for (SimpleStockTakingP simpleStockTakingP : task) {
+            SimpleTaskP simpleTaskP = new SimpleTaskP(simpleStockTakingP);
+            list.add(simpleTaskP);
+        }
+
+        // 查询入库任务
+        List<SimpleApplicationOutOrInRecordP> myTaskIn = depositoryRecordService.findMyTaskIn(paramForTask, userToken);
+        for (SimpleApplicationOutOrInRecordP simpleApplicationOutOrInRecordP : myTaskIn) {
+            SimpleTaskP simpleTaskP = new SimpleTaskP(simpleApplicationOutOrInRecordP);
+            list.add(simpleTaskP);
+        }
+
+        String key = "user:" + userToken.getId().toString();
+        String minRecord = (String) redisTemplateForHash.opsForHash().get(key, "minRecord");
+        if (minRecord != null) {
+            // 获取子订单键值
+            String[] split = minRecord.replace("[", "").replace("]", "").split(",");
+            for (String s : split) {
+                if ("".equals(s)) {
+                    continue;
+                }
+                Integer minRecordId = ObjectFormatUtil.toInteger(s.split(":")[1].trim());
+                ApplicationOutRecordMinP applicationOutMinById = depositoryRecordService.findApplicationOutMinById(minRecordId);
+                ApplicationOutRecordP applicationOutRecordPById = depositoryRecordService.findApplicationOutRecordPById(applicationOutMinById.getParentId());
+                UserByPort userByPort = LinkInterfaceUtil.FindUserById(applicationOutRecordPById.getApplicantId(), userToken);
+                applicationOutRecordPById.setApplicantName(userByPort.getName());
+                SimpleTaskP simpleTaskP = new SimpleTaskP(applicationOutRecordPById, applicationOutMinById);
+                list.add(simpleTaskP);
+            }
+        }
+        return list;
+    }
+
+
+
 }

src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java

@@ -212,7 +212,7 @@ public class StockTakingController {
         }
         UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
         map.put("departmentHead", userToken.getNumber());
-        List<SimpleStockTakingP> myTask = stockTakingService.findMyTask(map, request);
+        List<SimpleStockTakingP> myTask = stockTakingService.findMyTask(map, userToken);
         return new RestResponse(myTask, stockTakingService.findMyTaskCount(map), 200);
     }
 
@@ -265,7 +265,7 @@ public class StockTakingController {
         }
         UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
         map.put("userId", userToken.getId());
-        List<SimpleStockTakingP> myTask = stockTakingService.findMyApply(map, request);
+        List<SimpleStockTakingP> myTask = stockTakingService.findMyApply(map, userToken);
         return new RestResponse(myTask, stockTakingService.findMyApplyCount(map), 200);
     }
 

src/main/java/com/dreamchaser/depository_manage/service/StockTakingService.java

@@ -40,7 +40,7 @@ public interface StockTakingService {
      * @param map 查询参数
      * @return 我的任务
      */
-    List<SimpleStockTakingP> findMyTask(Map<String, Object> map, HttpServletRequest request);
+    List<SimpleStockTakingP> findMyTask(Map<String, Object> map, UserByPort userToken);
 
     /**
      * 查询用户的任务数量
@@ -54,7 +54,7 @@ public interface StockTakingService {
      * @param map 查询参数
      * @return 我的任务
      */
-    List<SimpleStockTakingP> findMyApply(Map<String, Object> map, HttpServletRequest request);
+    List<SimpleStockTakingP> findMyApply(Map<String, Object> map, UserByPort userToken);
 
     /**
      * 查询用户的申请数量

src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java

@@ -239,12 +239,7 @@ public class StockTakingServiceImpl implements StockTakingService {
      * @return 我的任务
      */
     @Override
-    public List<SimpleStockTakingP> findMyTask(Map<String, Object> map, HttpServletRequest request) {
-        String token = request.getHeader("user-token");
-        if (token == null) {
-            token = (String) request.getSession().getAttribute("userToken");
-        }
-        UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
+    public List<SimpleStockTakingP> findMyTask(Map<String, Object> map,UserByPort userToken) {
         Integer size = 10, page = 1;
         if (map.containsKey("size")) {
             size = ObjectFormatUtil.toInteger(map.get("size"));
@@ -287,13 +282,8 @@ public class StockTakingServiceImpl implements StockTakingService {
      * @return 我的任务
      */
     @Override
-    public List<SimpleStockTakingP> findMyApply(Map<String, Object> map, HttpServletRequest request) {
+    public List<SimpleStockTakingP> findMyApply(Map<String, Object> map, UserByPort userToken) {
         Integer size = 10, page = 1;
-        String token = request.getHeader("user-token");
-        if (token == null) {
-            token = (String) request.getSession().getAttribute("userToken");
-        }
-        UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
         if (map.containsKey("size")) {
             size = ObjectFormatUtil.toInteger(map.get("size"));
             map.put("size", size);