From 833035bc5026f12acb8f7e1428280d0a9f204b08 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 15 一月 2025 14:37:03 +0800
Subject: [PATCH] 设备特殊字符管理 工步新增字段
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java | 2
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DeviceCharactersServiceImpl.java | 6 ++-
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/WorkStep.java | 20 ++++++++-
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DeviceCharactersController.java | 17 +++++---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceCharacters.java | 2 +
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IDeviceCharactersService.java | 4 +-
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/support/ProductTreeWrapper.java | 6 +-
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/WorkStepMapper.xml | 12 ++++--
8 files changed, 47 insertions(+), 22 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DeviceCharactersController.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DeviceCharactersController.java
index 26fc326..cb9ec31 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DeviceCharactersController.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DeviceCharactersController.java
@@ -3,6 +3,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.modules.dnc.entity.DeviceCharacters;
import org.jeecg.common.system.base.controller.JeecgController;
@@ -32,16 +33,18 @@
/**
* 璁惧鐗规畩瀛楃鍒嗛〉鏌ヨ
- * @param page
- * @param size
+ * @param pageNo
+ * @param pageSize
* @param deviceCharactersRequest
* @return
*/
@AutoLog(value = "璁惧鐗规畩瀛楃-鍒嗛〉鍒楄〃鏌ヨ")
@ApiOperation(value = "璁惧鐗规畩瀛楃-鍒嗛〉鍒楄〃鏌ヨ", notes = "璁惧鐗规畩瀛楃-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping("/find/page/{page}/{size}")
- public QueryPageResponseResult<DeviceCharacters> findPageList(@PathVariable("page") int page, @PathVariable("size") int size, DeviceCharactersRequest deviceCharactersRequest) {
- return iDeviceCharactersService.findByPageList(page, size, deviceCharactersRequest);
+ @GetMapping("/find/page")
+ public Result<?> findPageList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ DeviceCharactersRequest deviceCharactersRequest) {
+ return iDeviceCharactersService.findByPageList(pageNo, pageSize, deviceCharactersRequest);
}
/**
@@ -65,8 +68,8 @@
*/
@AutoLog(value = "璁惧鐗规畩瀛楃-缂栬緫璁惧鐗规畩瀛楃")
@ApiOperation(value = "璁惧鐗规畩瀛楃-缂栬緫璁惧鐗规畩瀛楃", notes = "璁惧鐗规畩瀛楃-缂栬緫璁惧鐗规畩瀛楃")
- @PutMapping("/edit/{id}")
- public ResponseResult editDefinition(@PathVariable("id") String id,@RequestBody DeviceCharacters deviceCharacters) {
+ @PutMapping("/edit")
+ public ResponseResult editDefinition(@RequestBody DeviceCharacters deviceCharacters) {
boolean b = iDeviceCharactersService.updateById(deviceCharacters);
if(b) {
return new ResponseResult(CommonCode.SUCCESS);
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceCharacters.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceCharacters.java
index b050344..b6d6925 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceCharacters.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceCharacters.java
@@ -6,6 +6,7 @@
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.NoArgsConstructor;
+import org.jeecg.common.aspect.annotation.Dict;
import java.util.Date;
@@ -23,6 +24,7 @@
@TableField(value = "device_no")
private String deviceNo;
@TableField(value = "depart_id")
+ @Dict(dictTable = "sys_department",dicCode = "depart_id",dicText = "depart_name")
private String departId;
@TableField(value = "control_system")
private String controlSystem;
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/WorkStep.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/WorkStep.java
index 6bb633f..a42e52e 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/WorkStep.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/WorkStep.java
@@ -9,16 +9,18 @@
import lombok.Data;
import lombok.NoArgsConstructor;
+import java.io.Serializable;
import java.util.Date;
@Data
@NoArgsConstructor
@TableName(value = "nc_work_step")
@Api(value = "宸ユ")
-public class WorkStep {
+public class WorkStep implements Serializable {
+ private static final long serialVersionUID = 1529244980533421687L;
//宸ユid
- @TableField(value = "step_id")
- private String stepId;
+ @TableField(value = "id")
+ private String id;
//浜у搧id
@TableField(value = "product_id")
private String productId;
@@ -46,6 +48,18 @@
//宸ユ绫诲瀷
@TableField(value = "step_type")
private Integer stepType;
+ //宸ュ簭鎻忚堪
+ @TableField(value = "description")
+ private String description;
+ //鍔犲伐璁惧缂栧彿
+ @TableField(value = "device_no")
+ private String deviceNo;
+ //宸ヨ缂栧彿
+ @TableField(value = "assemble_no")
+ private String assembleNo;
+ //宸ヨ鍚嶇О
+ @TableField(value = "assemble_name")
+ private String assembleName;
@JsonIgnore
@TableField(value = "create_time", select = false, fill = FieldFill.INSERT)
private Date createTime;
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/WorkStepMapper.xml b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/WorkStepMapper.xml
index 0b19b27..52a9d4c 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/WorkStepMapper.xml
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/WorkStepMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="org.jeecg.modules.dnc.mapper.WorkStepMapper">
<select id="getByUserPerms" resultType="org.jeecg.modules.dnc.entity.WorkStep">
select
- p.step_id
+ p.id
, p.product_id
, p.component_id
, p.parts_id
@@ -14,13 +14,17 @@
, p.craft_version
, p.step_type
, p.CREATE_TIME
- , p.create_by
+ , p.create_user
, p.UPDATE_TIME
- , p.update_by
+ , p.update_user
+ , p.description
+ , p.device_no
+ , p.assemble_no
+ , p.assemble_name
from nc_work_step p
inner join
(select distinct step_id from nc_permission_stream where delete_flag = 0 and user_id=#{userId}) s
- on p.step_id = s.step_id
+ on p.id = s.step_id
where p.delete_flag = 0
</select>
</mapper>
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IDeviceCharactersService.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IDeviceCharactersService.java
index 7d4a3f8..01775c2 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IDeviceCharactersService.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IDeviceCharactersService.java
@@ -1,8 +1,8 @@
package org.jeecg.modules.dnc.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.dnc.entity.DeviceCharacters;
-import org.jeecg.modules.dnc.response.QueryPageResponseResult;
import org.jeecg.modules.dnc.request.DeviceCharactersRequest;
public interface IDeviceCharactersService extends IService<DeviceCharacters> {
@@ -14,6 +14,6 @@
* @param deviceCharactersRequest
* @return
*/
- QueryPageResponseResult<DeviceCharacters> findByPageList(int page, int size, DeviceCharactersRequest deviceCharactersRequest);
+ Result<?> findByPageList(int page, int size, DeviceCharactersRequest deviceCharactersRequest);
}
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DeviceCharactersServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DeviceCharactersServiceImpl.java
index d967588..8825c3b 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DeviceCharactersServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DeviceCharactersServiceImpl.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.dnc.entity.DeviceCharacters;
import org.jeecg.modules.dnc.exception.ExceptionCast;
import org.jeecg.modules.dnc.mapper.DeviceCharactersMapper;
@@ -17,7 +18,7 @@
@Service
public class DeviceCharactersServiceImpl extends ServiceImpl<DeviceCharactersMapper, DeviceCharacters> implements IDeviceCharactersService {
@Override
- public QueryPageResponseResult<DeviceCharacters> findByPageList(int page, int size, DeviceCharactersRequest deviceCharactersRequest) {
+ public Result<?> findByPageList(int page, int size, DeviceCharactersRequest deviceCharactersRequest) {
if(page < 1 || size < 1) {
ExceptionCast.cast(CommonCode.INVALID_PAGE);
@@ -32,7 +33,8 @@
lambdaQuery.ge(StrUtil.isNotEmpty(deviceCharactersRequest.getStartTime()),DeviceCharacters::getCreateTime,deviceCharactersRequest.getStartTime());
lambdaQuery.le(StrUtil.isNotEmpty(deviceCharactersRequest.getEndTime()),DeviceCharacters::getCreateTime,deviceCharactersRequest.getEndTime());
}
+ lambdaQuery.orderByDesc(DeviceCharacters::getCreateTime);
IPage<DeviceCharacters> userIPage = lambdaQuery.page(pageData);
- return new QueryPageResponseResult<>(CommonCode.SUCCESS, userIPage);
+ return Result.ok(userIPage);
}
}
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java
index ddbf531..77c0492 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java
@@ -105,7 +105,7 @@
permissionStream.setPartsId(workStep.getPartsId());
}
permissionStream.setProcessId(workStep.getProcessId());
- permissionStream.setStepId(workStep.getStepId());
+ permissionStream.setStepId(workStep.getId());
return permissionStreamService.save(permissionStream);
}
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/support/ProductTreeWrapper.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/support/ProductTreeWrapper.java
index c07d48b..cfbbd53 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/support/ProductTreeWrapper.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/support/ProductTreeWrapper.java
@@ -71,7 +71,7 @@
processNode.setLabel("[" + processStream.getProcessCode()+ "]" + processStream.getProcessName());
processNode.setParentId(null);
processNode.setIconClass("");
- processNode.setType(4);
+ processNode.setType(5);
if (StrUtil.isEmpty(processStream.getPartsId())) {
//娌℃湁partsId锛岄儴浠朵笅鐨勫伐搴�
processNode.setRField(processStream.getComponentId());
@@ -97,11 +97,11 @@
//宸ユ瀛樺湪宸ュ簭涓�
for (WorkStep workStep : workStepList) {
workStepNode = new CommonGenericTree();
- workStepNode.setId(workStep.getStepId());
+ workStepNode.setId(workStep.getId());
workStepNode.setLabel("[" + workStep.getStepCode() + "]" + workStep.getStepName());
workStepNode.setParentId(null);
workStepNode.setIconClass("");
- workStepNode.setType(5);
+ workStepNode.setType(6);
workStepNode.setRField(workStep.getProcessId());
workStepNode.setEntity(workStep);
if (processMap.containsKey(workStepNode.getRField())) {
--
Gitblit v1.9.3