influx参数覆盖

ym-baisc/src/main/java/com/cnbm/basic/controller/ProductFeaturesController.java

@@ -2,9 +2,7 @@ package com.cnbm.basic.controller;
 
 import com.cnbm.admin.annotation.LogOperation;
 import com.cnbm.admin.params.IdParam;
-import com.cnbm.basic.dto.FeaturesProcedureDTO;
-import com.cnbm.basic.dto.FeaturesStageProcedureRelationDTO;
-import com.cnbm.basic.dto.WorkingProcedureDTO;
+import com.cnbm.basic.dto.*;
 import com.cnbm.basic.entity.ProductFeatures;
 import com.cnbm.common.constant.Constant;
 import com.cnbm.common.page.PageData;
@@ -15,7 +13,6 @@ import com.cnbm.common.validator.ValidatorUtils;
 import com.cnbm.common.validator.group.AddGroup;
 import com.cnbm.common.validator.group.DefaultGroup;
 import com.cnbm.common.validator.group.UpdateGroup;
-import com.cnbm.basic.dto.ProductFeaturesDTO;
 import com.cnbm.basic.excel.ProductFeaturesExcel;
 import com.cnbm.basic.service.IProductFeaturesService;
 import io.swagger.annotations.Api;
@@ -162,4 +159,11 @@ public class ProductFeaturesController {
         return new Result<List<ProductFeaturesDTO>>().ok(list);
     }
 
+    @PostMapping(value = "list")
+    @ApiOperation(value = "获取特性列表")
+    @LogOperation("获取特性列表")
+    public List<ProductFeaturesDTO> list() {
+        return productFeaturesService.list();
+    }
+
 }

ym-baisc/src/main/java/com/cnbm/basic/dto/ProductFeaturesDTO.java

@@ -112,4 +112,10 @@ public class ProductFeaturesDTO implements Serializable {
 	@ApiModelProperty(value = "版本号")
 	private Integer version;
 
+	@ApiModelProperty(value = "工序id,关联 working_procedure 表")
+	private Long workingProcedureId;
+
+	@ApiModelProperty(value = "工序 名,关联working_procedure表")
+	private String workingProcedureName;
+
 }

ym-baisc/src/main/java/com/cnbm/basic/mapper/ProductFeaturesMapper.java

@@ -25,4 +25,6 @@ public interface ProductFeaturesMapper extends BaseDao<ProductFeatures> {
 	List<ProductFeaturesDTO> getFeaturesList(Map<String, Object> params);
 
 	String getControlGraphNameById(Long id);
+
+	List<ProductFeaturesDTO> list();
 }

ym-baisc/src/main/java/com/cnbm/basic/service/IProductFeaturesService.java

@@ -1,5 +1,6 @@
 package com.cnbm.basic.service;
 
+import com.cnbm.basic.dto.FactoryDTO;
 import com.cnbm.basic.dto.FeaturesProcedureDTO;
 import com.cnbm.basic.dto.FeaturesStageProcedureRelationDTO;
 import com.cnbm.common.page.PageData;
@@ -34,4 +35,6 @@ public interface IProductFeaturesService extends CrudService<ProductFeatures, Pr
     void batchUpdate(ProductFeaturesDTO[] lists);
 
     List<ProductFeaturesDTO> getFeaturesList(Map<String, Object> params);
+
+    List<ProductFeaturesDTO> list();;
 }

ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductFeaturesServiceImpl.java

@@ -64,6 +64,7 @@ public class ProductFeaturesServiceImpl extends CrudServiceImpl<ProductFeaturesM
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(ProductFeaturesDTO dto) {
+
         ProductFeatures entity = ConvertUtils.sourceToTarget(dto, ProductFeatures.class);
         insert(entity);
     }
@@ -154,4 +155,12 @@ public class ProductFeaturesServiceImpl extends CrudServiceImpl<ProductFeaturesM
         List<ProductFeaturesDTO> list = mapper.getFeaturesList(params);
         return list;
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public List<ProductFeaturesDTO> list() {
+        List<ProductFeaturesDTO> list = mapper.list();
+        return list;
+    }
+
 }