From 735ae20e44301fb8d3cca67170aa8912138494e9 Mon Sep 17 00:00:00 2001
From: wenwj <‘1106994300@qq.com>
Date: 星期一, 14 四月 2025 16:37:23 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml | 7 +++
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsGasPipingPlanController.java | 6 ++-
aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanController.java | 3 +
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlatePlanMapper.java | 2 +
aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingPlanMapper.xml | 6 +++
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsGasPipingPlanMapper.java | 5 ++
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartRouteStatServiceImpl.java | 11 ++++-
aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingPlanTempMapper.xml | 1
aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanTempController.java | 11 +++--
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingPlanServiceImpl.java | 4 ++
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java | 5 ++
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsGasPipingPlanTempController.java | 2
12 files changed, 50 insertions(+), 13 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanController.java
index e1b9694..1af932f 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanController.java
@@ -164,8 +164,9 @@
* @param planTemp 鍖呭惈閮ㄥ垎璁″垝淇℃伅鐨勪复鏃跺璞★紝鐢ㄤ簬纭璁″垝
* @return 杩斿洖鎿嶄綔缁撴灉鐨凙jaxResult瀵硅薄
*/
+ @RequiresPermissions("apsPlatePlan:confirm")
@PostMapping("/confirmPart")
- public AjaxResult confirmPart(ApsPlatePlanTemp planTemp) {
+ public AjaxResult confirmPart(@RequestBody ApsPlatePlanTemp planTemp) {
return toAjax(apsPlatePlanService.confirmPlan(planTemp));
}
/**
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanTempController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanTempController.java
index 2bae436..7ae97dd 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanTempController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanTempController.java
@@ -38,6 +38,7 @@
/**
* 鏌ヨ閽ｉ噾璁″垝涓存椂琛ㄥ垪琛�
*/
+ @RequiresPermissions("apsPlatePlan:import")
@GetMapping("/list")
public TableDataInfo list(ApsPlatePlanTemp apsPlatePlanTemp)
{
@@ -48,7 +49,7 @@
/**
* 瀵煎嚭閽ｉ噾璁″垝涓存椂琛ㄥ垪琛�
*/
- @RequiresPermissions("ApsPlatePlan:ApsPlatePlanTemp:export")
+ @RequiresPermissions("apsPlatePlanTemp:export")
@Log(title = "閽ｉ噾璁″垝涓存椂琛�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ApsPlatePlanTemp apsPlatePlanTemp)
@@ -61,7 +62,7 @@
/**
* 鑾峰彇閽ｉ噾璁″垝涓存椂琛ㄨ缁嗕俊鎭�
*/
- @RequiresPermissions("ApsPlatePlan:ApsPlatePlanTemp:query")
+ @RequiresPermissions("apsPlatePlanTemp:query")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id)
{
@@ -71,7 +72,7 @@
/**
* 鏂板閽ｉ噾璁″垝涓存椂琛�
*/
- @RequiresPermissions("ApsPlatePlan:ApsPlatePlanTemp:add")
+ @RequiresPermissions("apsPlatePlanTemp:add")
@Log(title = "閽ｉ噾璁″垝涓存椂琛�", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ApsPlatePlanTemp apsPlatePlanTemp)
@@ -82,7 +83,7 @@
/**
* 淇敼閽ｉ噾璁″垝涓存椂琛�
*/
- @RequiresPermissions("ApsPlatePlan:ApsPlatePlanTemp:edit")
+ @RequiresPermissions("apsPlatePlanTemp:edit")
@Log(title = "閽ｉ噾璁″垝涓存椂琛�", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ApsPlatePlanTemp apsPlatePlanTemp)
@@ -93,7 +94,7 @@
/**
* 鍒犻櫎閽ｉ噾璁″垝涓存椂琛�
*/
- @RequiresPermissions("ApsPlatePlan:ApsPlatePlanTemp:remove")
+ @RequiresPermissions("apsPlatePlanTemp:remove")
@Log(title = "閽ｉ噾璁″垝涓存椂琛�", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsGasPipingPlanController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsGasPipingPlanController.java
index aa886be..a255e26 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsGasPipingPlanController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsGasPipingPlanController.java
@@ -144,9 +144,11 @@
{
return toAjax(apsGasPipingPlanService.deleteApsGasPipingPlanByIds(ids));
}
+
/**
* 姘斾綋绠¤矾璁″垝瀵煎叆
*/
+ @RequiresPermissions("gasPiping:import")
@PostMapping("/importData")
public AjaxResult importData(MultipartFile file) throws Exception {
ExcelUtil<ApsGasPipingPlanTemp> util = new ExcelUtil<ApsGasPipingPlanTemp>(ApsGasPipingPlanTemp.class);
@@ -198,8 +200,8 @@
* @Author: wwj
* @Date: 2025/4/9
*/
- @GetMapping("/confirmGasPiping")
- public AjaxResult confirmGasPiping(ApsGasPipingPlanTemp apsGasPipingPlanTemp) {
+ @PostMapping("/confirmGasPiping")
+ public AjaxResult confirmGasPiping(@RequestBody ApsGasPipingPlanTemp apsGasPipingPlanTemp) {
return toAjax(apsGasPipingPlanService.confirmGasPiping(apsGasPipingPlanTemp));
}
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsGasPipingPlanTempController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsGasPipingPlanTempController.java
index 04fd3c7..c75c822 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsGasPipingPlanTempController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsGasPipingPlanTempController.java
@@ -31,7 +31,7 @@
/**
* 鏌ヨ姘斾綋绠¤矾璁″垝绠＄悊-涓存椂鍒楄〃
*/
- @RequiresPermissions("gasPipingTemp:gasPipingTemp:list")
+ @RequiresPermissions("gasPiping:import")
@GetMapping("/list")
public TableDataInfo list(ApsGasPipingPlanTemp apsGasPipingPlanTemp)
{
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsGasPipingPlanMapper.java b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsGasPipingPlanMapper.java
index 396974b..f8abec7 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsGasPipingPlanMapper.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsGasPipingPlanMapper.java
@@ -60,4 +60,9 @@
* @return 缁撴灉
*/
public int deleteApsGasPipingPlanByIds(String[] ids);
+ /**
+ * 鎵归噺鍒犻櫎姘斾綋绠¤矾璁″垝绠＄悊
+ * @return 缁撴灉
+ */
+ int removeAllPlans();
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlatePlanMapper.java b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlatePlanMapper.java
index 501ce3d..a79024b 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlatePlanMapper.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlatePlanMapper.java
@@ -62,4 +62,6 @@
public int deleteApsPlatePlanByIds(String[] ids);
public int insertPlatePlanFromTempByBatchNumber(String batchNumber);
+
+ int removeAllPlatePlans();
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingPlanServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingPlanServiceImpl.java
index 26ed8e3..dcec12f 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingPlanServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingPlanServiceImpl.java
@@ -15,6 +15,7 @@
import com.aps.core.mapper.ApsGasPipingPlanMapper;
import com.aps.core.domain.ApsGasPipingPlan;
import com.aps.core.service.IApsGasPipingPlanService;
+import org.springframework.transaction.annotation.Transactional;
/**
* 姘斾綋绠¤矾璁″垝绠＄悊Service涓氬姟灞傚鐞�
@@ -104,8 +105,11 @@
return apsGasPipingPlanMapper.deleteApsGasPipingPlanById(id);
}
+ @Transactional
@Override
public int confirmGasPiping(ApsGasPipingPlanTemp apsGasPipingPlanTemp) {
+ //鍒犻櫎鎵�鏈夎鍒�
+ apsGasPipingPlanMapper.removeAllPlans();
//鏌ヨ涓存椂琛ㄦ暟鎹�
List<ApsGasPipingPlanTemp> apsGasPipingPlanTemps=apsGasPipingPlanTempMapper.selectApsGasPipingPlanTempList(apsGasPipingPlanTemp);
int count=0;
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartRouteStatServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartRouteStatServiceImpl.java
index e4e515b..010cb9d 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartRouteStatServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartRouteStatServiceImpl.java
@@ -13,6 +13,7 @@
import com.aps.common.core.web.domain.AjaxResult;
import com.aps.core.domain.ApsPartPlan;
import com.aps.core.domain.ApsResourceDateStat;
+import com.aps.core.domain.ApsResourceGroup;
import com.aps.core.mapper.ApsResourceGroupMapper;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
@@ -47,6 +48,8 @@
private ApsPartRouteStatMapper apsPartRouteStatMapper;
@Autowired
private ApsResourceGroupMapper resourceGroupMapper;
+ @Autowired
+ private ApsResourceGroupMapper apsResourceGroupMapper;
/**
* 鏌ヨ闆朵欢缁熻琛�
@@ -172,6 +175,7 @@
/*鏌ュ嚭鎵�鏈夌粺璁＄殑鏁版嵁*/
AjaxResult result = new AjaxResult(200, "鐢熸垚鎴愬姛");
List<ApsResourceDateStat> list = apsPartRouteStatMapper.selectResourceDateStat();
+ List<ApsResourceGroup> resourceGroupList = apsResourceGroupMapper.selectApsResourceGroupList(new ApsResourceGroup());
if (!list.isEmpty()) {
/*姹傚嚭璁″垝鐨勬渶澶ф椂闂达紝娌℃湁 璁剧疆涓哄綋鍓嶆椂闂�+15澶�*/
ApsResourceDateStat apsResourceDateStat = list.stream().max(Comparator.comparing(ApsResourceDateStat::getPlanDay)).orElse(null);
@@ -188,10 +192,11 @@
startDay = startDay.plus(1, ChronoUnit.DAYS);
}
/*缁勭粐鍑哄垪澶存暟鎹�*/
- List<String> resourceNames =list.stream().map(ApsResourceDateStat::getResourceName).distinct().toList();
+
/*鍑嗗璧勬簮缁勪俊鎭�*/
List<Map<String, List<ApsResourceDateStat>>> targetList = new ArrayList<>();
- resourceNames.forEach(resourceName -> {
+ resourceGroupList.forEach(resourceGroup -> {
+ String resourceName=resourceGroup.getResourceGroupName();
/*鏍规嵁鏃ユ湡琛ㄥご鐨勯『搴忥紝缁勭粐鍑烘瘡涓棩鏈熶笅鐨勭粺璁￠」鐩�*/
Map<String, List<ApsResourceDateStat>> maps = new HashMap<>(Map.of());
List<ApsResourceDateStat> currentDaysResouces=new ArrayList<>();
@@ -208,7 +213,7 @@
else {
ApsResourceDateStat empty = new ApsResourceDateStat();
empty.setPlanDay(LocalDate.parse(planDay, formatter));
- empty.setDesignTimes(0);
+ empty.setDesignTimes(resourceGroup.getDevicesQuantity().intValue()*resourceGroup.getTheoryHours().intValue());
empty.setRequireTimes(0);
empty.setResourceName(resourceName);
empty.setResourceGroupName(resourceName);
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java
index 8e3c6ce..defb7ec 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java
@@ -1,7 +1,9 @@
package com.aps.core.service.impl;
+import java.time.LocalDateTime;
import java.util.List;
import java.util.Optional;
+
import com.aps.common.core.utils.DateUtils;
import com.aps.common.core.utils.uuid.IdUtils;
@@ -111,6 +113,8 @@
@Override
public int confirmPlan(ApsPlatePlanTemp tempPlan) {
+ //鍏堝垹闄ゆ墍鏈�
+ apsPlatePlanMapper.removeAllPlatePlans();
//鏌ヨ涓存椂琛ㄦ暟鎹�
List<ApsPlatePlanTemp> apsPartPlanTemps=apsPlatePlanTempMapper.selectApsPlatePlanTempList(tempPlan);
int count=0;
@@ -121,6 +125,7 @@
ApsPlatePlan platePlan=new ApsPlatePlan();
BeanUtils.copyProperties(apsPartPlanTemps.get(i), platePlan);
platePlan.setId(IdUtils.fastUUID());
+ platePlan.setCreateTime(DateUtils.getNowDate());
//鎻掑叆姝ｅ紡琛紝骞惰褰�
apsPlatePlanMapper.insertApsPlatePlan(platePlan);
count++;
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingPlanMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingPlanMapper.xml
index 29da727..537e360 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingPlanMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingPlanMapper.xml
@@ -79,6 +79,8 @@
<if test="isStockComplete != null "> and is_stock_complete = #{isStockComplete}</if>
<if test="hasTurnback != null "> and has_turnback = #{hasTurnback}</if>
<if test="hasRisk != null "> and has_risk = #{hasRisk}</if>
+
+ and del_flag ='0'
</where>
</select>
@@ -216,4 +218,8 @@
#{id}
</foreach>
</delete>
+
+ <update id="removeAllPlans" >
+ update aps_gas_piping_plan set del_flag='1' where del_flag ='0'
+ </update>
</mapper>
\ No newline at end of file
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingPlanTempMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingPlanTempMapper.xml
index 10bc513..a25f221 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingPlanTempMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingPlanTempMapper.xml
@@ -51,6 +51,7 @@
<include refid="selectApsGasPipingPlanTempVo"/>
<where>
<if test="batchNumber != null and batchNumber != ''"> and batch_number = #{batchNumber}</if>
+ and del_flag='0'
</where>
</select>
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml
index 5decb6a..9231a28 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml
@@ -83,6 +83,7 @@
<if test="isStockComplete != null "> and is_stock_complete = #{isStockComplete}</if>
<if test="hasTurnback != null "> and has_turnback = #{hasTurnback}</if>
<if test="hasRisk != null "> and has_risk = #{hasRisk}</if>
+ and del_flag='0'
</where>
</select>
@@ -129,6 +130,7 @@
<if test="isStockComplete != null">is_stock_complete,</if>
<if test="hasTurnback != null">has_turnback,</if>
<if test="hasRisk != null">has_risk,</if>
+ create_time,
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null and id != ''">#{id},</if>
@@ -166,6 +168,7 @@
<if test="isStockComplete != null">#{isStockComplete},</if>
<if test="hasTurnback != null">#{hasTurnback},</if>
<if test="hasRisk != null">#{hasRisk},</if>
+ #{createTime},
</trim>
</insert>
@@ -229,6 +232,8 @@
from aps_plate_plan_temp
where batch_number = #{batch_number}
</insert>
-
+ <update id="removeAllPlatePlans" parameterType="String">
+ update aps_plate_plan set del_flag='1' where del_flag ='0'
+ </update>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3