From 5cf0ce7ec567994a545178065b2511a86ddd2ce0 Mon Sep 17 00:00:00 2001 From: jiang Date: Tue, 25 Nov 2025 19:08:55 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DevChangeController.java | 3 +- .../devchange/mapper/DevChangeMapper.java | 5 +- .../devchange/service/DevChangeService.java | 3 +- .../service/DevChangeServiceImpl.java | 2 +- .../material/device/mapper/DevInfoMapper.java | 3 +- .../impl/ProvinceScreenServiceImpl.java | 107 ++---------------- .../material/ma/mapper/MaTypeMapper.java | 2 +- .../material/devchange/DevChangeMapper.xml | 11 +- .../mapper/material/device/DevInfoMapper.xml | 50 ++++++-- .../material/lease/MaLeaseInfoMapper.xml | 31 +++-- .../material/ma/MaMachineTypeMapper.xml | 76 ++++++------- 11 files changed, 124 insertions(+), 169 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/controller/DevChangeController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/controller/DevChangeController.java index 9a235c5..0ae2b98 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/controller/DevChangeController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/controller/DevChangeController.java @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; +import java.util.Map; @RestController @RequestMapping("/decChange") @@ -60,7 +61,7 @@ public class DevChangeController extends BaseController { @ApiOperation(value = "查询工程下拉选集合") @PostMapping("/getVoltageLevel") public AjaxResult getVoltageLevel(@RequestBody JjProjectVo vo) { - List list = service.getVoltageLevel(vo); + List> list = service.getVoltageLevel(vo); return AjaxResult.success(list); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/mapper/DevChangeMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/mapper/DevChangeMapper.java index 2f61401..a4dc415 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/mapper/DevChangeMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/mapper/DevChangeMapper.java @@ -5,10 +5,12 @@ import com.bonus.material.devchange.domain.*; import com.bonus.material.device.domain.vo.DevInfoPropertyVo; import com.bonus.material.device.domain.vo.DevInfoVo; import com.bonus.material.toolLedger.domain.ToolLedgerEntity; +import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; @Mapper public interface DevChangeMapper { @@ -115,7 +117,8 @@ public interface DevChangeMapper { * @param vo * @return */ - List getVoltageLevel(JjProjectVo vo); + @MapKey("value") + List> getVoltageLevel(JjProjectVo vo); /** * 修改详情 diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/DevChangeService.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/DevChangeService.java index f1866df..3d4836b 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/DevChangeService.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/DevChangeService.java @@ -5,6 +5,7 @@ import com.bonus.material.devchange.domain.*; import com.bonus.material.toolLedger.domain.ToolLedgerEntity; import java.util.List; +import java.util.Map; public interface DevChangeService { /** @@ -60,7 +61,7 @@ public interface DevChangeService { * @param vo * @return */ - List getVoltageLevel(JjProjectVo vo); + List> getVoltageLevel(JjProjectVo vo); AjaxResult updateDevChangeInfo(CsDeviceChangeVo vo); diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/DevChangeServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/DevChangeServiceImpl.java index da73fcb..6f4ab4c 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/DevChangeServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/DevChangeServiceImpl.java @@ -829,7 +829,7 @@ public class DevChangeServiceImpl implements DevChangeService { } @Override - public List getVoltageLevel(JjProjectVo vo) { + public List> getVoltageLevel(JjProjectVo vo) { try { return mapper.getVoltageLevel(vo); } catch (Exception e) { diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java index 1455e17..6f3f394 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java @@ -19,6 +19,7 @@ import org.apache.ibatis.annotations.Param; import java.math.BigDecimal; import java.util.Date; import java.util.List; +import java.util.Map; /** * 设备信息Mapper接口 @@ -288,7 +289,7 @@ public interface DevInfoMapper { List getLineProductionDateList(DevInfoReq devInfoReq); - List getUnitEquipmentConfiguration(); + List> getUnitEquipmentConfiguration(); BigDecimal getPrice(Long deptId); diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/service/impl/ProvinceScreenServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/service/impl/ProvinceScreenServiceImpl.java index ba59d0e..f002d24 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/service/impl/ProvinceScreenServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/service/impl/ProvinceScreenServiceImpl.java @@ -13,6 +13,7 @@ import com.bonus.material.ma.mapper.MaTypeMapper; import com.bonus.material.ma.vo.MaType; import com.bonus.system.api.domain.SysDept; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.ObjectUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -150,102 +151,8 @@ public class ProvinceScreenServiceImpl implements ProvinceScreenService { */ @Override public List> getUnitEquipmentConfiguration() { - devInfoMapper.getUnitEquipmentConfiguration(); - - if (sysDeptMapper == null) { - log.error("sysDeptMapper is null"); - return new ArrayList<>(); - } - - SysDept sysDept = new SysDept(); - DevInfoReq devInfoReq = new DevInfoReq(); - List sysDeptList = sysDeptMapper.selectDeptVOList(sysDept); - - - if (sysDeptList == null) { - log.error("未找到部门数据"); - return new ArrayList<>(); - } - sysDeptList.removeIf(item -> item.getDeptType() == null || !Objects.equals(item.getDeptType(), "地市公司")); - - - List> res = new ArrayList<>(); - for (SysDeptVO sysDeptNew : sysDeptList) { - if (sysDeptNew == null || sysDeptNew.getDeptId() == null) { - log.warn("跳过无效的部门数据"); - continue; - } - - Map dept = new HashMap<>(); - dept.put("deptName", sysDeptNew.getDeptName() != null ? sysDeptNew.getDeptName() : "未知部门"); - dept.put("deptAbbreviation", sysDeptNew.getDeptAbbreviation() != null ? sysDeptNew.getDeptAbbreviation() : "未知部门"); - devInfoReq.setOwnCo(Math.toIntExact(sysDeptNew.getDeptId())); - - // 部门定位 - dept.put("location", Optional.ofNullable(sysDeptNew.getLocation()).orElse("")); - - // 装备价值 - BigDecimal totalValue = devInfoMapper.getTotalValue(devInfoReq); - dept.put("totalValue", totalValue != null ? totalValue : BigDecimal.ZERO); - - // 装备总数 - Integer totalEquipmentQuantity = devInfoMapper.getTotalEquipment(devInfoReq); - dept.put("totalEquipmentQuantity", totalEquipmentQuantity != null ? totalEquipmentQuantity : 0); - - // 线路 - devInfoReq.setTypeId(1); - int lineNum = devInfoMapper.getLineNum(devInfoReq); - dept.put("lineNum", lineNum); - // 变电 - devInfoReq.setTypeId(2); - int substationNum = devInfoMapper.getLineNum(devInfoReq); - dept.put("substationNum", substationNum); - - // 电缆 - devInfoReq.setTypeId(3); - int cableNum = devInfoMapper.getLineNum(devInfoReq); - dept.put("cableNum", cableNum); - - // 所在城市 - String cityName = sysDeptMapper.getCityName(sysDeptNew.getCity()); - dept.put("cityName", cityName != null ? cityName : "未知城市"); - - // 获取装备转换率 - try { - DeptConfigRateSummary user = new DeptConfigRateSummary(); - List list = sysDeptService.selectDeptConfigRatePivot(user); - - if (list != null) { - for (DeptConfigRateSummary deptConfigRateSummary : list) { - if (deptConfigRateSummary != null) { - // 总数 - dept.put("configRate", deptConfigRateSummary.getConfigRate() != null ? - deptConfigRateSummary.getConfigRate() : 0.0); - // 线路 - dept.put("valueA", deptConfigRateSummary.getValueA() != null ? - deptConfigRateSummary.getValueA() : 0.0); - // 变电 - dept.put("valueB", deptConfigRateSummary.getValueB() != null ? - deptConfigRateSummary.getValueB() : 0.0); - // 电缆 - dept.put("valueC", deptConfigRateSummary.getValueC() != null ? - deptConfigRateSummary.getValueC() : 0.0); - break; - } - } - } - } catch (Exception e) { - log.error("获取装备转换率异常: " + e.getMessage(), e); - // 设置默认值 - dept.put("configRate", 0.0); - dept.put("valueA", 0.0); - dept.put("valueB", 0.0); - dept.put("valueC", 0.0); - } - - res.add(dept); - } - return res; + List> list = devInfoMapper.getUnitEquipmentConfiguration(); + return list; } /** @@ -338,12 +245,18 @@ public class ProvinceScreenServiceImpl implements ProvinceScreenService { */ @Override public AjaxResult getEquipmentUse(String proCode, String proType) { + String[] proCodeArray = new String[]{}; + List proCodeList = new ArrayList<>(); + if (ObjectUtils.isNotEmpty(proCode)) { + proCodeArray = proCode.split(","); + proCodeList = Arrays.asList(proCodeArray); + } Map res = new HashMap<>(); Integer proNum = maTypeMapper.getProNum(proType); Integer equipmentNum = maTypeMapper.getEquipmentNum(proType); res.put("proNum", proNum); res.put("equipmentNum", equipmentNum); - res.put("equipmentUse", maTypeMapper.getEquipmentUse(proCode, proType)); + res.put("equipmentUse", maTypeMapper.getEquipmentUse(proCodeList, proType)); return AjaxResult.success(res); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/ma/mapper/MaTypeMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/ma/mapper/MaTypeMapper.java index d81edee..b4d04d6 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/ma/mapper/MaTypeMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/ma/mapper/MaTypeMapper.java @@ -107,7 +107,7 @@ public interface MaTypeMapper { List> getUsageStatisticsDetails(); - List> getEquipmentUse(@Param("proCode") String proCode, @Param("proType") String proType); + List> getEquipmentUse(@Param("proCode") List proCode, @Param("proType") String proType); List> getEquipmentDetails(String proName); diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/DevChangeMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/DevChangeMapper.xml index 23dfb62..68866bb 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/DevChangeMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/DevChangeMapper.xml @@ -254,11 +254,7 @@ is_active = 1 AND dcd.change_id = #{id} - + diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml index 67063b5..42dadcf 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml @@ -1451,13 +1451,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and mdi.is_active = '1' and on_company = #{ownCo} - + @@ -1635,4 +1629,46 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE tl.up_down_status = '1' and tl.id = #{maId} + diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml index 76b26a1..be3e7d8 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml @@ -707,6 +707,7 @@ LEFT JOIN sys_dept sd ON sd.dept_id = mdi.on_company WHERE mdi.is_active = '1' AND mdi.ma_status IN (1, 2, 3) + AND mdi.entry_status = '1' AND mdi.on_company = #{ownCo}