From 2a2edd2c92bbef5765b1bf96bc7a42986a26efc4 Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期三, 23 四月 2025 18:15:30 +0800
Subject: [PATCH] 【UPDATE】1.增加标准工序导入功能 2.修改日历功能字段类型
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessServiceImpl.java | 25 ++++++++++++
aps-modules/aps-core/src/main/java/com/aps/core/service/IApsStandardProcessService.java | 7 +++
aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessMapper.xml | 2 -
aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsStandardProcessController.java | 46 ++++++++++++++++++++---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcess.java | 35 +++++++++++++----
aps-modules/aps-core/src/main/resources/mapper/core/ApsWorkCalendarMapper.xml | 2
6 files changed, 100 insertions(+), 17 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsStandardProcessController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsStandardProcessController.java
index b9fd515..412a4f3 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsStandardProcessController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsStandardProcessController.java
@@ -9,9 +9,12 @@
import com.aps.common.security.annotation.RequiresPermissions;
import com.aps.core.domain.ApsStandardProcess;
import com.aps.core.service.IApsStandardProcessService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -22,6 +25,8 @@
* @date 2025-04-23
*/
+
+@Tag(name = "鏍囧噯宸ュ簭", description = "鏍囧噯宸ュ簭鎺ュ彛")
@RestController
@RequestMapping("/standardProcess")
public class ApsStandardProcessController extends BaseController
@@ -32,7 +37,9 @@
/**
* 鏌ヨ鏍囧噯宸ュ簭鍒楄〃
*/
- @RequiresPermissions("core:standardProcess:list")
+
+ @Operation(summary = "鏌ヨ鏍囧噯宸ュ簭鍒楄〃", description = "鍒嗛〉鏌ヨ")
+ @RequiresPermissions("aps:standardProcess:list")
@GetMapping("/list")
public TableDataInfo list(ApsStandardProcess apsStandardProcess)
{
@@ -44,7 +51,8 @@
/**
* 瀵煎嚭鏍囧噯宸ュ簭鍒楄〃
*/
- @RequiresPermissions("core:standardProcess:export")
+ @Operation(summary = "瀵煎嚭鏍囧噯宸ュ簭鍒楄〃", description = "瀵煎嚭Excel")
+ @RequiresPermissions("aps:standardProcess:export")
@Log(title = "鏍囧噯宸ュ簭", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ApsStandardProcess apsStandardProcess)
@@ -57,7 +65,8 @@
/**
* 鑾峰彇鏍囧噯宸ュ簭璇︾粏淇℃伅
*/
- @RequiresPermissions("core:standardProcess:query")
+ @Operation(summary = "鑾峰彇鏍囧噯宸ュ簭璇︾粏淇℃伅", description = "鏍规嵁id鑾峰彇")
+ @RequiresPermissions("aps:standardProcess:query")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -67,7 +76,8 @@
/**
* 鏂板鏍囧噯宸ュ簭
*/
- @RequiresPermissions("core:standardProcess:add")
+ @Operation(summary = "鏂板鏍囧噯宸ュ簭", description = "鍗曚釜澧炲姞")
+ @RequiresPermissions("aps:standardProcess:add")
@Log(title = "鏍囧噯宸ュ簭", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ApsStandardProcess apsStandardProcess)
@@ -78,7 +88,8 @@
/**
* 淇敼鏍囧噯宸ュ簭
*/
- @RequiresPermissions("core:standardProcess:edit")
+ @Operation(summary = "淇敼鏍囧噯宸ュ簭", description = "鍗曚釜淇敼")
+ @RequiresPermissions("aps:standardProcess:edit")
@Log(title = "鏍囧噯宸ュ簭", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ApsStandardProcess apsStandardProcess)
@@ -89,11 +100,34 @@
/**
* 鍒犻櫎鏍囧噯宸ュ簭
*/
- @RequiresPermissions("core:standardProcess:remove")
+ @Operation(summary = "鍒犻櫎鏍囧噯宸ュ簭", description = "鎵归噺鍒犻櫎")
+ @RequiresPermissions("aps:standardProcess:remove")
@Log(title = "鏍囧噯宸ュ簭", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(apsStandardProcessService.deleteApsStandardProcessByIds(ids));
}
+
+ /**
+ * 瀵煎叆鏍囧噯宸ュ簭鏁版嵁
+ */
+ @Operation(summary = "瀵煎叆鏍囧噯宸ュ簭鏁版嵁", description = "澧為噺瀵煎叆")
+ @RequiresPermissions("aps:standardProcess:importData")
+ @PostMapping("/importData")
+ public AjaxResult importData(MultipartFile file) throws Exception {
+ ExcelUtil<ApsStandardProcess> util = new ExcelUtil<>(ApsStandardProcess.class);
+ List<ApsStandardProcess> tempList = util.importExcel(file.getInputStream());
+ //鍒ゆ柇瀵煎叆鏁版嵁鏄惁涓虹┖
+ if (!tempList.isEmpty()) {
+ Boolean res = apsStandardProcessService.importData(tempList);
+ if(res){
+ return AjaxResult.success("瀵煎叆鎴愬姛锛�");
+ }else{
+ return AjaxResult.error("瀵煎叆澶辫触锛�");
+ }
+ } else {
+ return AjaxResult.error("妯℃澘鍐呭涓虹┖");
+ }
+ }
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcess.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcess.java
index 0481ec4..5f86243 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcess.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcess.java
@@ -2,8 +2,11 @@
import com.aps.common.core.annotation.Excel;
import com.aps.common.core.web.domain.BaseEntity;
+import io.swagger.v3.oas.annotations.media.Schema;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.math.BigDecimal;
/**
* 鏍囧噯宸ュ簭瀵硅薄 aps_standard_process
@@ -11,61 +14,77 @@
* @author hjy
* @date 2025-04-23
*/
+
+@Schema(description = "鏍囧噯宸ュ簭瀹炰綋")
public class ApsStandardProcess extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 涓婚敭id */
+ @Schema(description = "涓婚敭id", type = "Long")
private Long id;
/** 宸ュ簭缂栫爜 */
+ @Schema(description = "宸ュ簭缂栫爜", type = "String")
@Excel(name = "宸ュ簭缂栫爜")
private String processNumber;
/** 宸ュ簭鍚嶇О */
+ @Schema(description = "宸ュ簭鍚嶇О", type = "String")
@Excel(name = "宸ュ簭鍚嶇О")
private String processName;
/** 璧勬簮缁� */
+ @Schema(description = "璧勬簮缁�", type = "String")
@Excel(name = "璧勬簮缁�")
private String resourceGroupName;
/** 浜ц兘妯″瀷: 鐙崰/鍚堟壒 */
- @Excel(name = "浜ц兘妯″瀷: 鐙崰/鍚堟壒")
+ @Schema(description = "浜ц兘妯″瀷", type = "String")
+ @Excel(name = "浜ц兘妯″瀷")
private String model;
/** 璁捐浜ц兘 */
+ @Schema(description = "璁捐浜ц兘", type = "String")
@Excel(name = "璁捐浜ц兘")
- private String designCapacity;
+ private BigDecimal designCapacity;
/** 宸ュ巶Id */
- @Excel(name = "宸ュ巶Id")
+ @Schema(description = "宸ュ巶Id", type = "String")
+// @Excel(name = "宸ュ巶Id")
private String plantId;
/** 宸ュ巶 */
+ @Schema(description = "宸ュ巶", type = "String")
@Excel(name = "宸ュ巶")
private String plant;
/** 杞﹂棿Id */
- @Excel(name = "杞﹂棿Id")
+ @Schema(description = "杞﹂棿Id", type = "String")
+// @Excel(name = "杞﹂棿Id")
private String workShopId;
/** 杞﹂棿 */
+ @Schema(description = "杞﹂棿", type = "String")
@Excel(name = "杞﹂棿")
private String workShop;
/** 鏃ュ巻Id */
- @Excel(name = "鏃ュ巻Id")
+ @Schema(description = "鏃ュ巻Id", type = "Long")
+// @Excel(name = "鏃ュ巻Id")
private Long workCalenderId;
/** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
+ @Schema(description = "鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�", type = "String")
private String delFlag;
/** 浜ц兘妯″瀷Id */
- @Excel(name = "浜ц兘妯″瀷Id")
+ @Schema(description = "浜ц兘妯″瀷Id", type = "Long")
+// @Excel(name = "浜ц兘妯″瀷Id")
private Long modelId;
/** 鏃ュ巻鎻忚堪 */
+ @Schema(description = "鏃ュ巻鎻忚堪", type = "String")
@Excel(name = "鏃ュ巻鎻忚堪")
private String workCalender;
@@ -119,12 +138,12 @@
return model;
}
- public void setDesignCapacity(String designCapacity)
+ public void setDesignCapacity(BigDecimal designCapacity)
{
this.designCapacity = designCapacity;
}
- public String getDesignCapacity()
+ public BigDecimal getDesignCapacity()
{
return designCapacity;
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsStandardProcessService.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsStandardProcessService.java
index 1584f7a..dbe73b0 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsStandardProcessService.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsStandardProcessService.java
@@ -59,4 +59,11 @@
* @return 缁撴灉
*/
public int deleteApsStandardProcessById(Long id);
+
+ /**
+ * 瀵煎叆鏁版嵁
+ * @param tempList
+ * @return
+ */
+ public boolean importData(List<ApsStandardProcess> tempList);
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessServiceImpl.java
index fcd5916..59b5ce6 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessServiceImpl.java
@@ -1,6 +1,7 @@
package com.aps.core.service.impl;
import com.aps.common.core.utils.DateUtils;
+import com.aps.common.security.utils.SecurityUtils;
import com.aps.core.domain.ApsStandardProcess;
import com.aps.core.mapper.ApsStandardProcessMapper;
import com.aps.core.service.IApsStandardProcessService;
@@ -55,6 +56,7 @@
public int insertApsStandardProcess(ApsStandardProcess apsStandardProcess)
{
apsStandardProcess.setCreateTime(DateUtils.getNowDate());
+ apsStandardProcess.setCreateBy(SecurityUtils.getUsername());
return apsStandardProcessMapper.insertApsStandardProcess(apsStandardProcess);
}
@@ -68,6 +70,7 @@
public int updateApsStandardProcess(ApsStandardProcess apsStandardProcess)
{
apsStandardProcess.setUpdateTime(DateUtils.getNowDate());
+ apsStandardProcess.setUpdateBy(SecurityUtils.getUsername());
return apsStandardProcessMapper.updateApsStandardProcess(apsStandardProcess);
}
@@ -94,4 +97,26 @@
{
return apsStandardProcessMapper.deleteApsStandardProcessById(id);
}
+
+ /**
+ * 瀵煎叆鏁版嵁
+ * @param tempList
+ * @return true/false
+ */
+ @Override
+ public boolean importData(List<ApsStandardProcess> tempList) {
+ try {
+ if (!tempList.isEmpty()) {
+ tempList.forEach(temp->{
+ temp.setCreateBy(SecurityUtils.getUsername());
+ temp.setCreateTime(DateUtils.getNowDate());
+ apsStandardProcessMapper.insertApsStandardProcess(temp);
+ });
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ return false;
+ }
+ return true;
+ }
}
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessMapper.xml
index 144bfb7..fdd4cd1 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessMapper.xml
@@ -55,7 +55,6 @@
<insert id="insertApsStandardProcess" parameterType="ApsStandardProcess">
insert into aps_standard_process
<trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">id,</if>
<if test="processNumber != null">process_number,</if>
<if test="processName != null">process_name,</if>
<if test="resourceGroupName != null">resource_group_name,</if>
@@ -75,7 +74,6 @@
<if test="workCalender != null">work_calender,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="id != null">#{id},</if>
<if test="processNumber != null">#{processNumber},</if>
<if test="processName != null">#{processName},</if>
<if test="resourceGroupName != null">#{resourceGroupName},</if>
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsWorkCalendarMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsWorkCalendarMapper.xml
index d6cd2e3..dc81ab9 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsWorkCalendarMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsWorkCalendarMapper.xml
@@ -84,7 +84,7 @@
<if test="type != null">type = #{type},</if>
<if test="effectiveDate != null">effective_date = #{effectiveDate},</if>
<if test="expiringDate != null">expiring_date = #{expiringDate},</if>
- <if test="content != null">content = #{content},</if>
+ <if test="content != null">content = #{content , typeHandler=com.aps.core.typeHandler.JsonTypeHandler, jdbcType=OTHER},</if>
<if test="applicableFactory != null">applicable_factory = #{applicableFactory},</if>
<if test="applicableWorkshop != null">applicable_workshop = #{applicableWorkshop},</if>
<if test="applicableProcess != null">applicable_process = #{applicableProcess},</if>
--
Gitblit v1.9.3