Merge remote-tracking branch 'origin/dev' into dev

hongjli

2025-05-23 a57390bfc4f92178e2adba3a2973ef6df0807656

 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessServiceImpl.java

@@ -1,14 +1,20 @@
package com.aps.core.service.impl;

import com.aps.common.core.utils.DateUtils;
import com.aps.common.core.utils.StringUtils;
import com.aps.common.security.utils.DictUtils;
import com.aps.common.security.utils.SecurityUtils;
import com.aps.core.domain.ApsShop;
import com.aps.core.domain.ApsStandardProcess;
import com.aps.core.mapper.ApsShopMapper;
import com.aps.core.mapper.ApsStandardProcessMapper;
import com.aps.core.service.IApsStandardProcessService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

/**
 * 标准工序Service业务层处理
@@ -17,10 +23,12 @@
 * @date 2025-04-23
 */
@Service
public class ApsStandardProcessServiceImpl implements IApsStandardProcessService 
{
public class ApsStandardProcessServiceImpl implements IApsStandardProcessService {
    @Autowired
    private ApsStandardProcessMapper apsStandardProcessMapper;

    @Autowired
    private ApsShopMapper apsShopMapper;

    /**
     * 查询标准工序
@@ -29,8 +37,7 @@
     * @return 标准工序
     */
    @Override
    public ApsStandardProcess selectApsStandardProcessById(Long id)
    {
    public ApsStandardProcess selectApsStandardProcessById(Long id) {
        return apsStandardProcessMapper.selectApsStandardProcessById(id);
    }

@@ -41,8 +48,7 @@
     * @return 标准工序
     */
    @Override
    public List<ApsStandardProcess> selectApsStandardProcessList(ApsStandardProcess apsStandardProcess)
    {
    public List<ApsStandardProcess> selectApsStandardProcessList(ApsStandardProcess apsStandardProcess) {
        return apsStandardProcessMapper.selectApsStandardProcessList(apsStandardProcess);
    }

@@ -53,8 +59,7 @@
     * @return 结果
     */
    @Override
    public int insertApsStandardProcess(ApsStandardProcess apsStandardProcess)
    {
    public int insertApsStandardProcess(ApsStandardProcess apsStandardProcess) {
        apsStandardProcess.setCreateTime(DateUtils.getNowDate());
        apsStandardProcess.setCreateBy(SecurityUtils.getUsername());
        return apsStandardProcessMapper.insertApsStandardProcess(apsStandardProcess);
@@ -67,8 +72,7 @@
     * @return 结果
     */
    @Override
    public int updateApsStandardProcess(ApsStandardProcess apsStandardProcess)
    {
    public int updateApsStandardProcess(ApsStandardProcess apsStandardProcess) {
        apsStandardProcess.setUpdateTime(DateUtils.getNowDate());
        apsStandardProcess.setUpdateBy(SecurityUtils.getUsername());
        return apsStandardProcessMapper.updateApsStandardProcess(apsStandardProcess);
@@ -81,8 +85,7 @@
     * @return 结果
     */
    @Override
    public int deleteApsStandardProcessByIds(Long[] ids)
    {
    public int deleteApsStandardProcessByIds(Long[] ids) {
        return apsStandardProcessMapper.deleteApsStandardProcessByIds(ids);
    }

@@ -93,13 +96,13 @@
     * @return 结果
     */
    @Override
    public int deleteApsStandardProcessById(Long id)
    {
    public int deleteApsStandardProcessById(Long id) {
        return apsStandardProcessMapper.deleteApsStandardProcessById(id);
    }

    /**
     * 导入数据
     *
     * @param tempList
     * @return true/false
     */
@@ -107,11 +110,26 @@
    public boolean importData(List<ApsStandardProcess> tempList) {
        try {
            if (!tempList.isEmpty()) {
                DictUtils.CacheValue cacheFactory = DictUtils.getCacheValue("aps_factory");
                DictUtils.CacheValue cacheDomain = DictUtils.getCacheValue("aps_domain");

                List<ApsShop> shops = apsShopMapper.selectApsByName(tempList.stream()
                        .map(ApsStandardProcess::getWorkShop)
                        .filter(StringUtils::isNotEmpty)
                        .collect(Collectors.toSet()));
                tempList.forEach(temp->{
                    temp.setCreateBy(SecurityUtils.getUsername());
                    temp.setCreateTime(DateUtils.getNowDate());
                    apsStandardProcessMapper.insertApsStandardProcess(temp);
                    temp.setMajor(cacheDomain.get(temp.getMajor()));
                    temp.setPlant(cacheFactory.get(temp.getPlant()));
                    temp.setWorkShop(shops.stream()
                            .filter(shop -> Objects.equals(shop.getShopName(), temp.getWorkShop()))
                            .filter(shop -> Objects.equals(shop.getPlantCode(), temp.getPlant()))
                            .map(ApsShop::getShopCode)
                            .findFirst()
                            .orElse(null));
                });
                apsStandardProcessMapper.insert(tempList);
            }
        } catch (Exception e) {
            e.printStackTrace();