Merge remote-tracking branch 'origin/main'

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/datasource/vo/DataSourceFiledReqVO.java

@@ -3,7 +3,6 @@ package com.cf.imes.module.system.controller.admin.datasource.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
 import java.util.List;
@@ -17,7 +16,7 @@ public class DataSourceFiledReqVO {
     @Schema(description = "主键ID")
     private Long id;
 
-    @Schema(description = "数据源id")
+    @Schema(description = "数据源id-父级ID")
     private String sourceId;
 
     @Schema(description = "字段名称")

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingRespVO.java

@@ -1,12 +1,15 @@
 package com.cf.imes.module.system.controller.admin.machine.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.fastjson.JSONObject;
-import com.cf.imes.module.system.dal.dataobject.machine.CuttingSettingDO;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 机台 Response VO")
 @Data
@@ -16,55 +19,42 @@ import com.alibaba.excel.annotation.*;
 @AllArgsConstructor
 public class CuttingRespVO {
 
+
     @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "14092")
     @ExcelProperty("主键")
     private Long id;
 
+
     @Schema(description = "名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
     @ExcelProperty("名称")
     private String name;
 
+
     @Schema(description = "1机台设备 2CNC设备", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @ExcelProperty("1机台设备 2CNC设备")
     private Integer machineType;
 
+
     @Schema(description = "标签id")
     private Long labelId;
 
+
     @Schema(description = "品牌ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
     @ExcelProperty("品牌ID")
     private Long brandId;
 
 
+    @Schema(description = "品牌", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
+    private String brand;
 
-//    @Schema(description = "品牌", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
-//    @ExcelProperty("品牌")
-//    private String brand;
-
-
-//    @Schema(description = "型号", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
-//    @ExcelProperty("型号")
-//    private String model;
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
-   /* @Schema(description = "机台配置")
-    private CuttingSettingDO machineSettingDO;*/
 
     @Schema(description = "机台配置")
     private JSONObject machineSettingDO;
 
-    /**
-     * 机台权限相关配置
-     */
-    @Schema(description ="加工模式 开料机加工模式 默认true，显示开料机工作模式(是否排钻/造型，sc)配置")
-    private Boolean showPriorFacing;
-    @Schema(description = "双工位")
-    private Boolean showDualWorkstation;
-    @Schema(description = "自动贴标")
-    private Boolean showAutoNotePrinter;
-
 
 }

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java

@@ -385,13 +385,14 @@ public class MachineServiceImpl implements MachineService {
         // 对机台的配置进行解压
         machineDO.setSetting(JsonUtils.unzipString(machineDO.getSetting()));
 
-        LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
-        assert loginUser != null;
-//        MachineLimitDO machineLimitDO = machineLimitMapper.selectOne(new LambdaQueryWrapperX<MachineLimitDO>()
-//                .eq(MachineLimitDO::getMachineId, id)
-//                .eq(MachineLimitDO::getOrganId, loginUser.getOrganId())
-//        );
+        Long brandId = machineDO.getBrandId();
+
+        MachineBrandDO machineBrandDO = machineBrandMapper.selectById(brandId);
+
         CuttingRespVO respVO = MachineConvert.convert(machineDO);
+
+        respVO.setBrand(machineBrandDO.getBrand());
+
         return respVO;
     }
 

cf-module-system/cf-module-system-biz/src/main/resources/application.yaml

@@ -194,6 +194,7 @@ chenfeng:
       - system_notify_message_readinfo
       - system_data_source_field
       - system_machine_brand
+      - system_machine_limit
     use-data-code: imes_prod #动态数据源标识，后期添加的数据源需要修改此值
 
   sms-code: # 短信验证码相关的配置项