策略中规则管理、参数设置管理、配置设置管理导出

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configurationsetting/ConfigurationsettingController.java

@@ -10,8 +10,11 @@ import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.configurationsetting.vo.ConfigurationsettingRespVO;
 import com.win.module.wms.controller.configurationsetting.vo.*;
+import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO;
 import com.win.module.wms.convert.configurationsetting.ConfigurationsettingConvert;
+import com.win.module.wms.convert.itembasic.ItembasicConvert;
 import com.win.module.wms.dal.dataobject.configurationsetting.ConfigurationsettingDO;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.enums.DictTypeConstants;
 import com.win.module.wms.service.configurationsetting.ConfigurationsettingService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -79,15 +82,6 @@ public class ConfigurationsettingController {
         return success(ConfigurationsettingConvert.INSTANCE.convert(configurationsetting));
     }
 
-    @GetMapping("/list")
-    @Operation(summary = "获得配置设置列表")
-    @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
-    @PreAuthorize("@ss.hasPermission('wms:configurationsetting:query')")
-    public CommonResult<List<ConfigurationsettingRespVO>> getConfigurationsettingList(@RequestParam("ids") Collection<Long> ids) {
-        List<ConfigurationsettingDO> list = configurationsettingService.getConfigurationsettingList(ids);
-        return success(ConfigurationsettingConvert.INSTANCE.convertList(list));
-    }
-
     @GetMapping("/page")
     @Operation(summary = "获得配置设置分页")
     @PreAuthorize("@ss.hasPermission('wms:configurationsetting:query')")
@@ -115,22 +109,37 @@ public class ConfigurationsettingController {
     public void exportConfigurationsettingExcel(@Valid ConfigurationsettingExportReqVO exportReqVO,
               HttpServletResponse response) throws IOException {
         List<ConfigurationsettingDO> list = configurationsettingService.getConfigurationsettingList(exportReqVO);
-        // 导出 Excel
-        List<ConfigurationsettingExcelVO> datas = ConfigurationsettingConvert.INSTANCE.convertList02(list);
-        for(ConfigurationsettingExcelVO vo : datas) {
-            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
-            //后端创建个字段作为前端展示的虚拟字段
-            vo.setCreator(user.getNickname());
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<ConfigurationsettingExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "配置设置.xlsx", "数据", ConfigurationsettingExcelVO.class, resultList, mapDropDown);
     }
+    @PostMapping("/export-excel-senior")
+    @Operation(summary = "导出配置设置 Excel")
+    @PreAuthorize("@ss.hasPermission('wms:configurationsetting:export')")
+    @OperateLog(type = EXPORT)
+    public void exportConfigurationsettingExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
+        List<ConfigurationsettingDO> list = configurationsettingService.getConfigurationsettingList(conditions);
         Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<ConfigurationsettingExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "配置设置.xlsx", "数据", ConfigurationsettingExcelVO.class, resultList, mapDropDown);
+    }
+    private List<ConfigurationsettingExcelVO> getExcelVo(List<ConfigurationsettingDO> list, Map<Integer, String[]> mapDropDown) {
         String[] strategyType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.STRATEGY_TYPE);
         mapDropDown.put(0, strategyType);
         String[] isRequired = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
         mapDropDown.put(3, isRequired);
         String[] dataType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.DATA_TYPE);
         mapDropDown.put(4, dataType);
-        ExcelUtils.write(response, "配置设置.xls", "数据", ConfigurationsettingExcelVO.class, datas,mapDropDown);
+        // 导出 Excel
+        List<ConfigurationsettingExcelVO> resultList = ConfigurationsettingConvert.INSTANCE.convertList02(list);
+        for(ConfigurationsettingExcelVO vo : resultList) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
         }
+        return resultList;
+    }
+
     @GetMapping("/get-import-template")
     @Operation(summary = "获得导入配置模板")
     public void importTemplate(HttpServletResponse response) throws IOException {

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/paramsetting/ParamsettingController.java

@@ -8,8 +8,11 @@ import com.win.framework.excel.core.util.ExcelUtils;
 import com.win.framework.operatelog.core.annotations.OperateLog;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO;
 import com.win.module.wms.controller.paramsetting.vo.*;
+import com.win.module.wms.convert.itembasic.ItembasicConvert;
 import com.win.module.wms.convert.paramsetting.ParamsettingConvert;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.paramsetting.ParamsettingDO;
 import com.win.module.wms.enums.DictTypeConstants;
 import com.win.module.wms.service.paramsetting.ParamsettingService;
@@ -78,15 +81,6 @@ public class ParamsettingController {
         return success(ParamsettingConvert.INSTANCE.convert(paramsetting));
     }
 
-    @GetMapping("/list")
-    @Operation(summary = "获得参数设置列表")
-    @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
-    @PreAuthorize("@ss.hasPermission('wms:paramsetting:query')")
-    public CommonResult<List<ParamsettingRespVO>> getParamsettingList(@RequestParam("ids") Collection<Long> ids) {
-        List<ParamsettingDO> list = paramsettingService.getParamsettingList(ids);
-        return success(ParamsettingConvert.INSTANCE.convertList(list));
-    }
-
     @GetMapping("/page")
     @Operation(summary = "获得参数设置分页")
     @PreAuthorize("@ss.hasPermission('wms:paramsetting:query')")
@@ -102,15 +96,31 @@ public class ParamsettingController {
     public void exportParamsettingExcel(@Valid ParamsettingExportReqVO exportReqVO,
               HttpServletResponse response) throws IOException {
         List<ParamsettingDO> list = paramsettingService.getParamsettingList(exportReqVO);
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<ParamsettingExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "参数设置.xlsx", "数据", ParamsettingExcelVO.class, resultList, mapDropDown);
+    }
+    @PostMapping("/export-excel-senior")
+    @Operation(summary = "导出参数设置 Excel")
+    @PreAuthorize("@ss.hasPermission('wms:paramsetting:export')")
+    @OperateLog(type = EXPORT)
+    public void exportParamsettingExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
+        List<ParamsettingDO> list = paramsettingService.getParamsettingList(conditions);
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<ParamsettingExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "参数设置.xlsx", "数据", ParamsettingExcelVO.class, resultList, mapDropDown);
+    }
+    private List<ParamsettingExcelVO> getExcelVo(List<ParamsettingDO> list, Map<Integer, String[]> mapDropDown) {
         // 导出 Excel
-        List<ParamsettingExcelVO> datas = ParamsettingConvert.INSTANCE.convertList02(list);
-        for(ParamsettingExcelVO vo : datas) {
+        List<ParamsettingExcelVO> resultList = ParamsettingConvert.INSTANCE.convertList02(list);
+        for(ParamsettingExcelVO vo : resultList) {
             AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
             //后端创建个字段作为前端展示的虚拟字段
             vo.setCreator(user.getNickname());
         }
-        ExcelUtils.write(response, "参数设置.xls", "数据", ParamsettingExcelVO.class, datas);
+        return resultList;
     }
+
     @GetMapping("/get-import-template")
     @Operation(summary = "获得导入参数设置模板")
     public void importTemplate(HttpServletResponse response) throws IOException {

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/configurationsetting/ConfigurationsettingMapper.java

@@ -11,6 +11,7 @@ import com.win.module.wms.controller.configurationsetting.vo.Configurationsettin
 import com.win.module.wms.controller.configurationsetting.vo.ConfigurationsettingPageReqVO;
 import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
 import com.win.module.wms.dal.dataobject.configurationsetting.ConfigurationsettingDO;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -48,5 +49,7 @@ public interface ConfigurationsettingMapper extends BaseMapperX<Configurationset
                 .eqIfPresent(ConfigurationsettingDO::getIsRequired, reqVO.getIsRequired())
                 .orderByDesc(ConfigurationsettingDO::getId));
     }
-
+    default List<ConfigurationsettingDO> selectSeniorList(CustomConditions conditions) {
+        return selectList(QueryWrapperUtils.structure(conditions));
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/paramsetting/ParamsettingMapper.java

@@ -7,6 +7,7 @@ import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.paramsetting.vo.ParamsettingExportReqVO;
 import com.win.module.wms.controller.paramsetting.vo.ParamsettingPageReqVO;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.paramsetting.ParamsettingDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -51,5 +52,7 @@ public interface ParamsettingMapper extends BaseMapperX<ParamsettingDO> {
                 .eqIfPresent(ParamsettingDO::getIsRequired, reqVO.getIsRequired())
                 .orderByDesc(ParamsettingDO::getId));
     }
-
+    default List<ParamsettingDO> selectSeniorList(CustomConditions conditions) {
+        return selectList(QueryWrapperUtils.structure(conditions));
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/configurationsetting/ConfigurationsettingService.java

@@ -49,10 +49,10 @@ public interface ConfigurationsettingService {
     /**
      * 获得配置设置列表
      *
-     * @param ids 编号
+     * @param conditions 编号
      * @return 配置设置列表
      */
-    List<ConfigurationsettingDO> getConfigurationsettingList(Collection<Long> ids);
+    List<ConfigurationsettingDO> getConfigurationsettingList(CustomConditions conditions);
 
     /**
      * 获得配置设置分页

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/configurationsetting/ConfigurationsettingServiceImpl.java

@@ -77,8 +77,8 @@ public class ConfigurationsettingServiceImpl implements ConfigurationsettingServ
     }
 
     @Override
-    public List<ConfigurationsettingDO> getConfigurationsettingList(Collection<Long> ids) {
-        return configurationsettingMapper.selectBatchIds(ids);
+    public List<ConfigurationsettingDO> getConfigurationsettingList(CustomConditions conditions) {
+        return configurationsettingMapper.selectSeniorList(conditions);
     }
 
     @Override

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/paramsetting/ParamsettingService.java

@@ -49,10 +49,10 @@ public interface ParamsettingService {
     /**
      * 获得参数设置列表
      *
-     * @param ids 编号
+     * @param conditions 编号
      * @return 参数设置列表
      */
-    List<ParamsettingDO> getParamsettingList(Collection<Long> ids);
+    List<ParamsettingDO> getParamsettingList(CustomConditions conditions);
 
     /**
      * 获得参数设置分页

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/paramsetting/ParamsettingServiceImpl.java

@@ -70,8 +70,8 @@ public class ParamsettingServiceImpl implements ParamsettingService {
     }
 
     @Override
-    public List<ParamsettingDO> getParamsettingList(Collection<Long> ids) {
-        return paramsettingMapper.selectBatchIds(ids);
+    public List<ParamsettingDO> getParamsettingList(CustomConditions conditions) {
+        return paramsettingMapper.selectSeniorList(conditions);
     }
 
     @Override