库房管理-图表统计功能实现

supervision-admin/src/main/java/com/supervision/web/controller/materialManagement/MaterialRegistrationController.java

@@ -1,7 +1,9 @@
 package com.supervision.web.controller.materialManagement;
 
 import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 
 import com.supervision.common.core.domain.entity.SysDictData;
 import com.supervision.common.core.domain.entity.SysUser;
@@ -153,4 +155,26 @@ public class  MaterialRegistrationController extends BaseController
         map.put("date",sysDictData1);
         return AjaxResult.success(map);
     }
+
+    @GetMapping("/echarts/storage/list")
+    public AjaxResult earchartsStorageList(){
+
+        SysDictData sysDictData = new SysDictData();
+        sysDictData.setDictType("storage_room");
+        List<SysDictData> sysDictData1 = dictDataService.selectDictDataList(sysDictData);
+        HashMap<String, Object> map = new HashMap<>();
+
+        List<Map<String,Object>> result = new LinkedList<>();
+        for (SysDictData dictData : sysDictData1){
+            Map<String,Object> warehouseMap = new HashMap<>();
+            String warehouse = dictData.getDictLabel();
+            List<Map<String,Object>> list = materialRegistrationService.selectMaterialStorageByWarehouse(warehouse);
+            warehouseMap.put("warehouse",warehouse);
+            warehouseMap.put("data",list);
+            result.add(warehouseMap);
+        }
+        map.put("data",result);
+        map.put("number",sysDictData1.size());
+        return AjaxResult.success(map);
+    }
 }

supervision-framework/src/main/java/com/supervision/framework/config/SecurityConfig.java

@@ -115,7 +115,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .antMatchers("/peopleManage/people/countPeopletype").anonymous()
                 .antMatchers("/api/v1/situation/**").anonymous()
                 .antMatchers("/api/huaRuApi/**").anonymous()
-//                .antMatchers("/grassrootsregistration/inspect/**").anonymous()
+//                .antMatchers("/materialManagement/materialRegistration/echarts/storage/list").anonymous()
 
                 // 除上面外的所有请求全部需要鉴权认证
                 .anyRequest().authenticated()
@@ -125,7 +125,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
         // 添加JWT filter
         httpSecurity.addFilterBefore(authenticationTokenFilter, UsernamePasswordAuthenticationFilter.class);
         // 添加CORS filter
-        httpSecurity.addFilterBefore(corsFilter, JwtAuthenticationTokenFilter.class);
+        httpSecurity.addFilterBefore(corsFilter, UsernamePasswordAuthenticationFilter.class);
         httpSecurity.addFilterBefore(corsFilter, LogoutFilter.class);
     }
 

supervision-system/src/main/java/com/supervision/materialManagement/mapper/MaterialRegistrationMapper.java

@@ -1,6 +1,8 @@
 package com.supervision.materialManagement.mapper;
 
 import java.util.List;
+import java.util.Map;
+
 import com.supervision.materialManagement.domain.MaterialRegistration;
 
 /**
@@ -60,4 +62,7 @@ public interface MaterialRegistrationMapper
     public int deleteMaterialRegistrationByIds(Long[] ids);
     
     MaterialRegistration selectMaterialRegistrationByBarCode(String barcode);
+
+
+    List<Map<String, Object>> selectMaterialStorageByWarehouse(String warehouse);
 }

supervision-system/src/main/java/com/supervision/materialManagement/service/IMaterialRegistrationService.java

@@ -1,6 +1,8 @@
 package com.supervision.materialManagement.service;
 
 import java.util.List;
+import java.util.Map;
+
 import com.supervision.materialManagement.domain.MaterialRegistration;
 
 /**
@@ -60,4 +62,7 @@ public interface IMaterialRegistrationService
     public int deleteMaterialRegistrationById(Long id);
     
     MaterialRegistration selectMaterialRegistrationByBarCode(String barcode);
+
+
+    List<Map<String, Object>> selectMaterialStorageByWarehouse(String warehouse);
 }

supervision-system/src/main/java/com/supervision/materialManagement/service/impl/MaterialRegistrationServiceImpl.java

@@ -2,6 +2,7 @@ package com.supervision.materialManagement.service.impl;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import com.supervision.common.core.domain.AjaxResult;
 import com.supervision.common.core.domain.entity.SysDictData;
@@ -119,6 +120,10 @@ public class MaterialRegistrationServiceImpl implements IMaterialRegistrationSer
         return materialRegistrationMapper.selectMaterialRegistrationByBarCode(barcode);
     }
 
+    @Override
+    public List<Map<String, Object>> selectMaterialStorageByWarehouse(String warehouse) {
+        return materialRegistrationMapper.selectMaterialStorageByWarehouse(warehouse);
+    }
 
 
 }

supervision-system/src/main/resources/mapper/materialManagement/MaterialRegistrationMapper.xml

@@ -155,4 +155,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
+    <select id="selectMaterialStorageByWarehouse" resultType="java.util.Map">
+        select * from material_registration join material_archives on material_registration.barcode = material_archives.barcode where material_registration.warehouse = #{warehouse}
+    </select>
 </mapper>