From 01d08428dd6cd9dc518a9a2ecbcb1f0e82788068 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 09 十一月 2023 13:54:47 +0800
Subject: [PATCH] Changes11
---
mes-technology/src/main/java/com/chinaztt/mes/technology/entity/RoutingOperationParam.java | 4 +
mes-technology/src/main/java/com/chinaztt/mes/technology/service/impl/RoutingServiceImpl.java | 44 +++++++++++++-
mes-basic/src/main/java/com/chinaztt/mes/basic/dto/ParamDTO.java | 4 +
mes-common/src/main/java/com/chinaztt/mes/common/config/JacksonConfig.java | 30 ++++++++++
mes-technology/src/main/java/com/chinaztt/mes/technology/controller/RoutingController.java | 17 +++++
mes-technology/src/main/java/com/chinaztt/mes/technology/service/RoutingService.java | 2
mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Param.java | 4 +
mes-basic/src/main/java/com/chinaztt/mes/basic/controller/ParamController.java | 29 ++++++++-
mes-technology/src/main/java/com/chinaztt/mes/technology/dto/RoutingDTO.java | 4 +
mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/LocationServiceImpl.java | 1
10 files changed, 129 insertions(+), 10 deletions(-)
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/ParamController.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/ParamController.java
index 2a63237..4d6a5dd 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/ParamController.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/ParamController.java
@@ -71,6 +71,21 @@
return R.ok(paramService.page(page, gen));
}
+
+ @ApiOperation(value = "宸ヨ壓缁戝畾鏌ヨ", notes = "鏌ヨ")
+ @PostMapping("/pageInId")
+ @PreAuthorize("@pms.hasPermission('technology_param_view','product_workbench')")
+ public R getParamPageInId(Page page, @RequestParam("idList") List<Long>idList) {
+ System.out.println(idList);
+ QueryWrapper<Param> gen = new QueryWrapper<>();
+ gen.lambda().in(Param::getId,idList);
+ List<SysDictItem> dict = dictUtils.getDict("technology_param");
+ Page page1 = paramService.page(page, gen);
+ List records = page1.getRecords();
+ List<Map<String, Object>> tree = getTree(records, dict);
+ page1.setRecords(tree);
+ return R.ok(page1);
+ }
/**
* 鍒嗛〉鏌ヨ
@@ -83,12 +98,18 @@
@GetMapping("/page")
@PreAuthorize("@pms.hasPermission('technology_param_view','product_workbench')")
public R getParamPage(Page page, ParamDTO param) {
- List<Map<String,Object>> all = new ArrayList<>();
List<SysDictItem> dict = dictUtils.getDict("technology_param");
QueryWrapper<Param> gen = QueryWrapperUtil.gen(param);
gen.lambda().eq(Param::getParentId,0L);
Page page1 = paramService.page(page, gen);
List records = page1.getRecords();
+ List<Map<String, Object>> tree = getTree(records, dict);
+ page1.setRecords(tree);
+ return R.ok(page1);
+ }
+
+ public List<Map<String,Object>> getTree(List records,List<SysDictItem> dict){
+ List<Map<String,Object>> all = new ArrayList<>();
records.forEach(l->{
System.out.println("涓�绾ф暟鎹�--"+l);
Map pojo = JsonUtil.jsonToPojo(JsonUtil.jsonToString(l), Map.class);
@@ -109,6 +130,7 @@
oneMap.put("paramType",StringUtils.defaultString((String) pojo.get("type"),""));
oneMap.put("paramFormat",StringUtils.defaultString((String) pojo.get("parameterFormat"),""));
oneMap.put("unit",StringUtils.defaultString((String) pojo.get("unit"),""));
+ oneMap.put("parentId",pojo.get("parentId"));
all.add(oneMap);
}
secondList.forEach(s->{
@@ -125,6 +147,7 @@
p.setType(s.getType());
p.setParameterFormat(s.getParameterFormat());
p.setUnit(s.getUnit());
+ p.setParentId(s.getParentId());
third.add(p);
}
third.forEach(t->{
@@ -143,12 +166,12 @@
allMap.put("paramType",StringUtils.defaultString(t.getType(),""));
allMap.put("paramFormat",StringUtils.defaultString(t.getParameterFormat(),""));
allMap.put("unit", StringUtils.defaultString(t.getUnit(),""));
+ allMap.put("parentId",t.getParentId());
all.add(allMap);
});
});
});
- page1.setRecords(all);
- return R.ok(page1);
+ return all;
}
/**
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/dto/ParamDTO.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/dto/ParamDTO.java
index e85f5b6..9907501 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/dto/ParamDTO.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/dto/ParamDTO.java
@@ -1,7 +1,9 @@
package com.chinaztt.mes.basic.dto;
+import com.alibaba.fastjson.annotation.JSONField;
import com.chinaztt.mes.basic.entity.Param;
import com.chinaztt.ztt.admin.api.entity.SysDictItem;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import java.util.List;
@@ -18,10 +20,12 @@
/**
* 鎺掑簭
*/
+ @JSONField(serializeUsing= ToStringSerializer.class)
private Long index;
/**
* 宸ヤ綔绔檌d
*/
+ @JSONField(serializeUsing= ToStringSerializer.class)
private Long workstationId;
/**
* 鍊�
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Param.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Param.java
index 0be0b83..6c9351c 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Param.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Param.java
@@ -17,8 +17,10 @@
package com.chinaztt.mes.basic.entity;
+import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -44,6 +46,7 @@
*/
@TableId(type=IdType.ASSIGN_ID)
@ApiModelProperty(value="id")
+ @JSONField(serializeUsing= ToStringSerializer.class)
private Long id;
/**
* 鍙傛暟缂栧彿
@@ -103,6 +106,7 @@
@ApiModelProperty(value="鐖剁骇鍙傛暟")
@TableField("parent_id")
+ @JSONField(serializeUsing= ToStringSerializer.class)
private Long parentId;
}
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/LocationServiceImpl.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/LocationServiceImpl.java
index 7785080..c8d3d8b 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/LocationServiceImpl.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/LocationServiceImpl.java
@@ -92,6 +92,7 @@
if (CollectionUtil.isEmpty(list)) {
return;
}
+ list.forEach(System.out::println);
List<Factory> factories = factoryMapper.selectList(null);
List<Warehouse> warehouses = warehouseMapper.selectList(null);
List<SysDictItem> dict = dictUtils.getDict("warehouse_type");
diff --git a/mes-common/src/main/java/com/chinaztt/mes/common/config/JacksonConfig.java b/mes-common/src/main/java/com/chinaztt/mes/common/config/JacksonConfig.java
new file mode 100644
index 0000000..d91cfdc
--- /dev/null
+++ b/mes-common/src/main/java/com/chinaztt/mes/common/config/JacksonConfig.java
@@ -0,0 +1,30 @@
+package com.chinaztt.mes.common.config;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
+
+/**
+ * @Author 寮犲
+ * @Date 2023/11/9
+ */
+
+@Configuration
+public class JacksonConfig {
+ @Bean
+ @Primary
+ @ConditionalOnMissingBean(ObjectMapper.class)
+ public ObjectMapper jacksonObjectMapper(Jackson2ObjectMapperBuilder builder) {
+ ObjectMapper objectMapper = builder.createXmlMapper(false).build();
+ SimpleModule simpleModule = new SimpleModule();
+ //Long绫诲瀷----String
+ simpleModule.addSerializer(Long.class, ToStringSerializer.instance);
+ objectMapper.registerModule(simpleModule);
+ return objectMapper;
+ }
+}
\ No newline at end of file
diff --git a/mes-technology/src/main/java/com/chinaztt/mes/technology/controller/RoutingController.java b/mes-technology/src/main/java/com/chinaztt/mes/technology/controller/RoutingController.java
index 303eb80..1401e61 100644
--- a/mes-technology/src/main/java/com/chinaztt/mes/technology/controller/RoutingController.java
+++ b/mes-technology/src/main/java/com/chinaztt/mes/technology/controller/RoutingController.java
@@ -17,6 +17,7 @@
package com.chinaztt.mes.technology.controller;
+import cn.hutool.core.lang.Console;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelReader;
import com.alibaba.excel.read.builder.ExcelReaderBuilder;
@@ -27,14 +28,12 @@
import com.chinaztt.mes.technology.dto.RoutingDTO;
import com.chinaztt.mes.technology.dto.RoutingOperationDTO;
import com.chinaztt.mes.technology.entity.RoutingOperationTemplate;
-import com.chinaztt.mes.technology.excel.RoutingData;
import com.chinaztt.mes.technology.excel.RoutingExcelData;
import com.chinaztt.mes.technology.excel.RoutingFormUploadListener;
import com.chinaztt.mes.technology.excel.RoutingUploadListener;
import com.chinaztt.mes.technology.service.RoutingService;
import com.chinaztt.ztt.common.core.util.R;
import com.chinaztt.ztt.common.log.annotation.SysLog;
-import com.chinaztt.ztt.common.security.annotation.Inner;
import com.chinaztt.ztt.common.security.service.ZttUser;
import com.chinaztt.ztt.common.security.util.SecurityUtils;
import io.swagger.annotations.Api;
@@ -307,6 +306,20 @@
}
/**
+ * 鏍规嵁宸ヨ壓宸ュ簭id鍜屽伐搴忔ā鏉縤d鍏宠仈娣诲姞宸ュ簭鍙傛暟娉ㄥ
+ *
+ * @param routingDTO
+ * @return
+ */
+ @ApiOperation(value = "娉ㄥ鏍规嵁宸ヨ壓宸ュ簭id鍜屽伐搴忔ā鏉縤d鍏宠仈娣诲姞宸ュ簭鍙傛暟", notes = "鏍规嵁宸ヨ壓宸ュ簭id鍜屽伐搴忔ā鏉縤d鍏宠仈娣诲姞宸ュ簭鍙傛暟")
+ @PostMapping("/addRoutingTemplateParamZs")
+ public R addOperationTemplateParamZS(@RequestBody RoutingDTO routingDTO) {
+ Console.log(routingDTO);
+ return R.ok();
+ }
+
+
+ /**
* 鏍规嵁澶嶅埗宸ュ簭鍙傛暟鐨刬d鍒犻櫎宸ュ簭鍙傛暟
*
* @param id
diff --git a/mes-technology/src/main/java/com/chinaztt/mes/technology/dto/RoutingDTO.java b/mes-technology/src/main/java/com/chinaztt/mes/technology/dto/RoutingDTO.java
index f796b2b..1e5d7c5 100644
--- a/mes-technology/src/main/java/com/chinaztt/mes/technology/dto/RoutingDTO.java
+++ b/mes-technology/src/main/java/com/chinaztt/mes/technology/dto/RoutingDTO.java
@@ -3,7 +3,6 @@
import com.chinaztt.mes.basic.entity.Template;
import com.chinaztt.mes.technology.entity.Routing;
import com.chinaztt.mes.technology.entity.RoutingOperationParam;
-import com.chinaztt.mes.technology.entity.RoutingOperationTemplate;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -65,4 +64,7 @@
*/
@ApiModelProperty(value = "宸ュ簭椤哄簭")
private String operationOrder;
+
+ @ApiModelProperty(value = "鍙傛暟椤剁骇Id")
+ private List<Long> idList;
}
diff --git a/mes-technology/src/main/java/com/chinaztt/mes/technology/entity/RoutingOperationParam.java b/mes-technology/src/main/java/com/chinaztt/mes/technology/entity/RoutingOperationParam.java
index 70f93f0..1eb026b 100644
--- a/mes-technology/src/main/java/com/chinaztt/mes/technology/entity/RoutingOperationParam.java
+++ b/mes-technology/src/main/java/com/chinaztt/mes/technology/entity/RoutingOperationParam.java
@@ -89,4 +89,8 @@
*/
@ApiModelProperty(value="宸ヨ壓鍙傛暟鍊�")
private String paramValue;
+
+ @ApiModelProperty("鐖剁骇id")
+ private Long parentId;
+
}
diff --git a/mes-technology/src/main/java/com/chinaztt/mes/technology/service/RoutingService.java b/mes-technology/src/main/java/com/chinaztt/mes/technology/service/RoutingService.java
index 809f48d..86e0cff 100644
--- a/mes-technology/src/main/java/com/chinaztt/mes/technology/service/RoutingService.java
+++ b/mes-technology/src/main/java/com/chinaztt/mes/technology/service/RoutingService.java
@@ -192,7 +192,7 @@
* @param routingDTO
* @return
*/
- List<RoutingOperationParam> addOperationTemplateParam(RoutingDTO routingDTO);
+ boolean addOperationTemplateParam(RoutingDTO routingDTO);
/**
* 鏍规嵁澶嶅埗宸ュ簭鍙傛暟鐨刬d鍒犻櫎宸ュ簭鍙傛暟
diff --git a/mes-technology/src/main/java/com/chinaztt/mes/technology/service/impl/RoutingServiceImpl.java b/mes-technology/src/main/java/com/chinaztt/mes/technology/service/impl/RoutingServiceImpl.java
index a83cb8b..e6d3666 100644
--- a/mes-technology/src/main/java/com/chinaztt/mes/technology/service/impl/RoutingServiceImpl.java
+++ b/mes-technology/src/main/java/com/chinaztt/mes/technology/service/impl/RoutingServiceImpl.java
@@ -1070,22 +1070,60 @@
}
@Override
- public List<RoutingOperationParam> addOperationTemplateParam(RoutingDTO routingDTO) {
+ public boolean addOperationTemplateParam(RoutingDTO routingDTO) {
+ System.out.println("DTo++++=======>"+routingDTO);
List<RoutingOperationParam> routingOperationParamList = new ArrayList<>();
for (RoutingOperationParam routingOperationParam : routingDTO.getRoutingOperationParam()) {
+ System.out.println("========================>"+routingOperationParam);
+ long firstId=routingOperationParam.getId();
int count = routingOperationParamMapper.selectCount(Wrappers.<RoutingOperationParam>lambdaQuery().eq(RoutingOperationParam::getRoutingOperationId, routingDTO.getRoutingOperationId())
.eq(RoutingOperationParam::getOperationTemplateId, routingDTO.getOperationTemplateId()).eq(RoutingOperationParam::getCode, routingOperationParam.getCode()));
if (count > 0) {
continue;
}
+ //绗竴绾у埆
routingOperationParam.setRoutingOperationId(routingDTO.getRoutingOperationId());
routingOperationParam.setOperationTemplateId(routingDTO.getOperationTemplateId());
routingOperationParam.setRoutingId(routingDTO.getId());
routingOperationParam.setOperationId(routingDTO.getOperationId());
routingOperationParamMapper.insert(routingOperationParam);
- routingOperationParamList.add(routingOperationParam);
+ QueryWrapper<Param>secondParamQ = new QueryWrapper<Param>();
+ System.out.println("浜岀骇==============銆�");
+ secondParamQ.lambda().eq(Param::getParentId,firstId);
+ List<Param> second=paramMapper.selectList(secondParamQ);
+ //浜岀骇
+ if(second.size()>0){
+ second.forEach(s->{
+ RoutingOperationParam secondParam=new RoutingOperationParam();
+ secondParam.setRoutingOperationId(routingDTO.getRoutingOperationId());
+ secondParam.setOperationTemplateId(routingDTO.getOperationTemplateId());
+ secondParam.setRoutingId(routingDTO.getId());
+ secondParam.setOperationId(routingDTO.getOperationId());
+ secondParam.setCode(s.getCode());
+ secondParam.setParentId(routingOperationParam.getId());
+ routingOperationParamMapper.insert(secondParam);
+ QueryWrapper<Param>thirdParamQ = new QueryWrapper<Param>();
+ thirdParamQ.lambda().eq(Param::getParentId,s.getId());
+ List<Param> thirdList = paramMapper.selectList(thirdParamQ);
+ //涓夌骇
+ if(thirdList.size()>0){
+ thirdList.forEach(t->{
+ RoutingOperationParam third=new RoutingOperationParam();
+ third.setRoutingOperationId(routingDTO.getRoutingOperationId());
+ third.setOperationTemplateId(routingDTO.getOperationTemplateId());
+ third.setRoutingId(routingDTO.getId());
+ third.setCode(t.getCode());
+ third.setOperationId(routingDTO.getOperationId());
+ third.setParentId(secondParam.getId());
+ routingOperationParamMapper.insert(third);
+ });
+ }
+ });
+ }
+ //
+ //routingOperationParamList.add(routingOperationParam);
}
- return routingOperationParamList;
+ return true;
}
@Override
--
Gitblit v1.9.3