供应商代码风格统一 up by dh

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/ISupplierManagementAppService.java

@@ -0,0 +1,103 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.datadictionary.appservice;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.MessageUtils;
+import com.core.common.utils.bean.BeanUtils;
+import com.openhis.administration.domain.Supplier;
+import com.openhis.administration.mapper.SupplierMapper;
+import com.openhis.administration.service.ISupplierService;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.AccountStatus;
+import com.openhis.common.enums.SupplierType;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.common.utils.HisPageUtils;
+import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.web.datadictionary.dto.SupplierDto;
+import com.openhis.web.datadictionary.dto.SupplierInitDto;
+import com.openhis.web.datadictionary.dto.SupplierSearchParam;
+import com.openhis.web.datadictionary.dto.SupplierUpDto;
+import com.openhis.web.inventorymanage.dto.InventoryReceiptDto;
+import com.openhis.web.inventorymanage.dto.InventorySearchParam;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * 厂商/产地 service
+ *
+ * @author dh
+ * @date 2025-03-10
+ */
+public interface ISupplierManagementAppService {
+
+    /**
+     * 厂商/产地初始化
+     *
+     * @return
+     */
+    @GetMapping("/information-init")
+    R<?> getSupplierInit();
+
+    /**
+     * 厂商/产地查询
+     *
+     * @param supplierSearchParam 查询条件
+     * @param searchKey 查询条件-模糊查询
+     * @param pageNo 查询条件
+     * @param pageSize 查询条件
+     * @return 厂商/产地查询结果
+     */
+    R<?> getSupplierList(SupplierSearchParam supplierSearchParam, String searchKey, Integer pageNo, Integer pageSize,
+        HttpServletRequest request);
+
+    /**
+     * 添加供应商信息
+     *
+     * @param supplierUpDto 供应商信息
+     */
+    R<?> addSupplyRequest(SupplierUpDto supplierUpDto);
+
+    /**
+     * 编辑供应商信息
+     *
+     * @param supplierUpDto 供应商信息
+     */
+    R<?> editSupplyRequest(SupplierUpDto supplierUpDto);
+
+    /**
+     * 厂商/产地详细查询
+     *
+     * @param id 查询条件
+     * @return 厂商/产地查询结果
+     */
+    R<?> getSupplierDetail(@PathVariable("id") Long id);
+
+    /**
+     * 厂商/产地停用
+     *
+     * @param ids 厂商/产地ID列表
+     * @return
+     */
+    R<?> editSupplierStop(@RequestBody List<Long> ids);
+
+    /**
+     * 厂商/产地启用
+     *
+     * @param ids 厂商/产地ID列表
+     * @return
+     */
+    R<?> editSupplierStart(@RequestBody List<Long> ids);
+}

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/SupplierManagementAppServiceImpl.java

@@ -0,0 +1,192 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.datadictionary.appservice.impl;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.openhis.administration.domain.Supplier;
+import com.openhis.administration.mapper.SupplierMapper;
+import com.openhis.administration.service.ISupplierService;
+import com.openhis.common.enums.AccountStatus;
+import com.openhis.common.enums.SupplierType;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.web.datadictionary.appservice.ISupplierManagementAppService;
+import com.openhis.web.datadictionary.dto.SupplierDto;
+import com.openhis.web.datadictionary.dto.SupplierInitDto;
+import com.openhis.web.datadictionary.dto.SupplierSearchParam;
+import com.openhis.web.datadictionary.dto.SupplierUpDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.MessageUtils;
+import com.core.common.utils.bean.BeanUtils;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.utils.HisPageUtils;
+import com.openhis.common.utils.HisQueryUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 厂商/产地 impl
+ *
+ * @author dh
+ * @date 2025-03-10
+ */
+@Service
+public class SupplierManagementAppServiceImpl implements ISupplierManagementAppService {
+
+    @Autowired
+    private ISupplierService supplierService;
+    @Autowired
+    private SupplierMapper supplierMapper;
+
+    /**
+     * 厂商/产地初始化
+     *
+     * @return
+     */
+    @Override
+    public R<?> getSupplierInit() {
+        SupplierInitDto supplierInitDto = new SupplierInitDto();
+        // 获取厂商/产地种类
+        List<SupplierInitDto.supplierTypeOption> supplierTypeOption = Stream.of(SupplierType.values())
+            .map(status -> new SupplierInitDto.supplierTypeOption(status.getValue(), status.getInfo()))
+            .collect(Collectors.toList());
+        supplierInitDto.setSupplierTypeOptions(supplierTypeOption);
+        return R.ok(supplierInitDto);
+    }
+
+    /**
+     * 厂商/产地查询
+     *
+     * @param supplierSearchParam 查询条件
+     * @param searchKey 查询条件-模糊查询
+     * @param pageNo 查询条件
+     * @param pageSize 查询条件
+     * @return 厂商/产地查询结果
+     */
+    @Override
+    public R<?> getSupplierList(SupplierSearchParam supplierSearchParam,
+        @RequestParam(value = "searchKey", defaultValue = "") String searchKey,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
+
+        // 构建查询条件
+        QueryWrapper<Supplier> queryWrapper = HisQueryUtils.buildQueryWrapper(supplierSearchParam, searchKey,
+            new HashSet<>(Arrays.asList("bus_no", "name", "py_str", "wb_str")), request);
+        // 设置排序
+        queryWrapper.orderByAsc("bus_no");
+        // 分页查询
+        Page<SupplierDto> supplierPage =
+            HisPageUtils.selectPage(supplierMapper, queryWrapper, pageNo, pageSize, SupplierDto.class);
+        // 枚举类回显赋值
+        supplierPage.getRecords()
+            .forEach(e -> e.setActiveFlag_enumText(EnumUtils.getInfoByValue(AccountStatus.class, e.getActiveFlag())));
+        // 返回【病种目录列表DTO】分页
+        return R.ok(supplierPage);
+    }
+
+    /**
+     * 添加供应商信息
+     *
+     * @param supplierUpDto 供应商信息
+     */
+    @Override
+    public R<?> addSupplyRequest(@Validated @RequestBody SupplierUpDto supplierUpDto) {
+
+        Supplier supplierInfo = new Supplier();
+        BeanUtils.copyProperties(supplierUpDto, supplierInfo);
+        return supplierService.addSupplier(supplierInfo)
+            ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"厂商/供应商信息"}))
+            : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00008, null));
+    }
+
+    /**
+     * 编辑供应商信息
+     *
+     * @param supplierUpDto 供应商信息
+     */
+    @Override
+    public R<?> editSupplyRequest(@Validated @RequestBody SupplierUpDto supplierUpDto) {
+
+        Supplier supplier = new Supplier();
+        BeanUtils.copyProperties(supplierUpDto, supplier);
+
+        // 更新供应商信息信息
+        return supplierService.updateById(supplier)
+            ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"厂商/供应商信息"}))
+            : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+    }
+
+    /**
+     * 厂商/产地详细查询
+     *
+     * @param id 查询条件
+     * @return 厂商/产地查询结果
+     */
+    @Override
+    public R<?> getSupplierDetail(@PathVariable("id") Long id) {
+        SupplierDto supplierDto = new SupplierDto();
+        // 根据ID查询【供应商信息】
+        Supplier supplier = supplierService.getById(id);
+        BeanUtils.copyProperties(supplier, supplierDto);
+        return R.ok(supplierDto);
+    }
+
+    /**
+     * 厂商/产地停用
+     *
+     * @param ids 厂商/产地ID列表
+     * @return
+     */
+    @Override
+    public R<?> editSupplierStop(List<Long> ids) {
+        List<Supplier> supplierList = new CopyOnWriteArrayList<>();
+
+        // 取得更新值
+        for (Long detail : ids) {
+            Supplier supplier = new Supplier();
+            supplier.setId(detail);
+            supplier.setActiveFlag(0);
+            supplierList.add(supplier);
+        }
+        // 更新厂商/产地信息
+        return supplierService.updateBatchById(supplierList)
+            ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"疾病目录"}))
+            : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+    }
+
+    /**
+     * 厂商/产地启用
+     *
+     * @param ids 厂商/产地ID列表
+     * @return
+     */
+    @Override
+    public R<?> editSupplierStart(List<Long> ids) {
+        List<Supplier> supplierListStart = new CopyOnWriteArrayList<>();
+
+        // 取得更新值
+        for (Long detail : ids) {
+            Supplier supplier = new Supplier();
+            supplier.setId(detail);
+            supplier.setActiveFlag(1);
+            supplierListStart.add(supplier);
+        }
+        // 更新厂商/产地信息
+        return supplierService.updateBatchById(supplierListStart)
+            ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"疾病目录"}))
+            : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+    }
+}

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/SupplierManagementController.java

@@ -24,7 +24,10 @@ import com.openhis.common.enums.SupplierType;
 import com.openhis.common.utils.EnumUtils;
 import com.openhis.common.utils.HisPageUtils;
 import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.web.datadictionary.appservice.ISupplierManagementAppService;
 import com.openhis.web.datadictionary.dto.*;
+import com.openhis.web.inventorymanage.appservice.IPurchaseInventoryAppService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -44,8 +47,9 @@ import javax.servlet.http.HttpServletRequest;
 @Slf4j
 @AllArgsConstructor
 public class SupplierManagementController {
-    private final ISupplierService supplierService;
+
-    private final SupplierMapper supplierMapper;
+    @Autowired
+    private ISupplierManagementAppService supplierManagementAppService;
 
     /**
      * 厂商/产地初始化
@@ -54,13 +58,13 @@ public class SupplierManagementController {
      */
     @GetMapping("/information-init")
     public R<?> getSupplierInit() {
-        SupplierInitDto supplierInitDto = new SupplierInitDto();
+        // SupplierInitDto supplierInitDto = new SupplierInitDto();
-        // 获取厂商/产地种类
+        // // 获取厂商/产地种类
-        List<SupplierInitDto.supplierTypeOption> supplierTypeOption = Stream.of(SupplierType.values())
+        // List<SupplierInitDto.supplierTypeOption> supplierTypeOption = Stream.of(SupplierType.values())
-                .map(status -> new SupplierInitDto.supplierTypeOption(status.getValue(), status.getInfo()))
+        // .map(status -> new SupplierInitDto.supplierTypeOption(status.getValue(), status.getInfo()))
-                .collect(Collectors.toList());
+        // .collect(Collectors.toList());
-        supplierInitDto.setSupplierTypeOptions(supplierTypeOption);
+        // supplierInitDto.setSupplierTypeOptions(supplierTypeOption);
-        return R.ok(supplierInitDto);
+        return R.ok(supplierManagementAppService.getSupplierInit());
     }
 
     /**
@@ -78,20 +82,21 @@ public class SupplierManagementController {
         @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
 
-        // 构建查询条件
+        // // 构建查询条件
-        QueryWrapper<Supplier> queryWrapper = HisQueryUtils.buildQueryWrapper(supplierSearchParam,
+        // QueryWrapper<Supplier> queryWrapper = HisQueryUtils.buildQueryWrapper(supplierSearchParam,
-                searchKey, new HashSet<>(Arrays.asList("bus_no", "name", "py_str", "wb_str")), request);
+        // searchKey, new HashSet<>(Arrays.asList("bus_no", "name", "py_str", "wb_str")), request);
-        // 设置排序
+        // // 设置排序
-        queryWrapper.orderByAsc("bus_no");
+        // queryWrapper.orderByAsc("bus_no");
-        // 分页查询
+        // // 分页查询
-        Page<SupplierDto> supplierPage =
+        // Page<SupplierDto> supplierPage =
-                HisPageUtils.selectPage(supplierMapper, queryWrapper, pageNo, pageSize, SupplierDto.class);
+        // HisPageUtils.selectPage(supplierMapper, queryWrapper, pageNo, pageSize, SupplierDto.class);
-        // 枚举类回显赋值
+        // // 枚举类回显赋值
-        supplierPage.getRecords().forEach(e ->
+        // supplierPage.getRecords().forEach(e ->
-                        e.setActiveFlag_enumText(EnumUtils.getInfoByValue(AccountStatus.class, e.getActiveFlag()))
+        // e.setActiveFlag_enumText(EnumUtils.getInfoByValue(AccountStatus.class, e.getActiveFlag()))
-        );
+        // );
         // 返回【病种目录列表DTO】分页
-        return R.ok(supplierPage);
+        return R.ok(
+            supplierManagementAppService.getSupplierList(supplierSearchParam, searchKey, pageNo, pageSize, request));
     }
 
     /**
@@ -101,12 +106,7 @@ public class SupplierManagementController {
      */
     @PostMapping("/add-supplier")
     public R<?> addSupplyRequest(@Validated @RequestBody SupplierUpDto supplierUpDto) {
-
+        return R.ok(supplierManagementAppService.addSupplyRequest(supplierUpDto));
-        Supplier supplierInfo = new Supplier();
-        BeanUtils.copyProperties(supplierUpDto, supplierInfo);
-        return supplierService.addSupplier(supplierInfo)
-                ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"厂商/供应商信息"}))
-                : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00008, null));
     }
 
     /**
@@ -117,16 +117,10 @@ public class SupplierManagementController {
     @PutMapping("/edit-supplier")
     public R<?> editSupplyRequest(@Validated @RequestBody SupplierUpDto supplierUpDto) {
 
-        Supplier supplier = new Supplier();
-        BeanUtils.copyProperties(supplierUpDto, supplier);
-
         // 更新供应商信息信息
-        return supplierService.updateById(supplier)
+        return R.ok(supplierManagementAppService.addSupplyRequest(supplierUpDto));
-                ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"厂商/供应商信息"}))
-                : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
     }
 
-
     /**
      * 厂商/产地详细查询
      *
@@ -135,11 +129,7 @@ public class SupplierManagementController {
      */
     @GetMapping(value = "/get-supplier-detail/{id}")
     public R<?> getSupplierDetail(@PathVariable("id") Long id) {
-        SupplierDto supplierDto = new SupplierDto();
+        return R.ok(supplierManagementAppService.getSupplierDetail(id));
-        // 根据ID查询【供应商信息】
-        Supplier supplier = supplierService.getById(id);
-        BeanUtils.copyProperties(supplier, supplierDto);
-        return R.ok(supplierDto);
     }
 
     /**
@@ -150,19 +140,8 @@ public class SupplierManagementController {
      */
     @PutMapping("/information-stop")
     public R<?> editSupplierStop(@RequestBody List<Long> ids) {
-        List<Supplier> supplierList = new CopyOnWriteArrayList<>();
-
-        // 取得更新值
-        for (Long detail : ids) {
-            Supplier supplier = new Supplier();
-            supplier.setId(detail);
-            supplier.setActiveFlag(0);
-            supplierList.add(supplier);
-        }
         // 更新厂商/产地信息
-        return supplierService.updateBatchById(supplierList)
+        return R.ok(supplierManagementAppService.editSupplierStop(ids));
-                ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"疾病目录"}))
-                : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
     }
 
     /**
@@ -173,18 +152,7 @@ public class SupplierManagementController {
      */
     @PutMapping("/information-start")
     public R<?> editSupplierStart(@RequestBody List<Long> ids) {
-        List<Supplier> supplierList = new CopyOnWriteArrayList<>();
-
-        // 取得更新值
-        for (Long detail : ids) {
-            Supplier supplier = new Supplier();
-            supplier.setId(detail);
-            supplier.setActiveFlag(1);
-            supplierList.add(supplier);
-        }
         // 更新厂商/产地信息
-        return supplierService.updateBatchById(supplierList)
+        return R.ok(supplierManagementAppService.editSupplierStart(ids));
-                ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"疾病目录"}))
-                : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
     }
 }