修改接口文档注释

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

@@ -36,14 +36,14 @@ public class MachineController {
     private MachineTemplateService machineTemplateService;
 
     @PutMapping("/create-cutting")
-    @Operation(summary = "创建开料机台")
+    @Operation(summary = "创建机台")
     @PreAuthorize("@ss.hasPermission('machine::create')")
     public CommonResult<Long> createCutting(@Valid @RequestBody CuttingSaveReqVO createReqVO) {
         return success(machineService.createCutting(createReqVO));
     }
 
     @PostMapping("/update-cutting")
-    @Operation(summary = "更新开料机台")
+    @Operation(summary = "更新机台")
     @PreAuthorize("@ss.hasPermission('machine::update')")
     public CommonResult<Boolean> update( @RequestBody  @Validated(UpdateGroup.class) CuttingSaveReqVO updateReqVO) {
         machineService.updateCutting(updateReqVO);
@@ -51,7 +51,7 @@ public class MachineController {
     }
 
     @DeleteMapping("/delete-cutting")
-    @Operation(summary = "删除开料机台")
+    @Operation(summary = "删除机台")
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('machine::delete')")
     public CommonResult<Boolean> delete(@RequestParam("id") Long id) {
@@ -60,7 +60,7 @@ public class MachineController {
     }
 
     @DeleteMapping("/batch-delete-cutting")
-    @Operation(summary = "批量删除开料机台")
+    @Operation(summary = "批量删除机台")
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('machine::delete')")
     public CommonResult<Boolean> batchDeleteCutting(@RequestParam("ids") List<Long> ids) {
@@ -69,7 +69,7 @@ public class MachineController {
     }
 
     @GetMapping("/get-cutting")
-    @Operation(summary = "获得开料机台")
+    @Operation(summary = "获得机台")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('machine::query')")
     public CommonResult<CuttingRespVO> get(@RequestParam("id") Long id) {

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

@@ -50,35 +50,35 @@ public class MachineTemplateController {
 
 
     @PutMapping("cutting-machine")
-    @Operation(summary = "新增开料机台模板配置")
+    @Operation(summary = "新增机台模板配置")
     @PreAuthorize("@ss.hasPermission('machine-template::create')")
     public CommonResult<Long> createCuttingTemplate(@RequestBody CuttingTemplateSaveReqVO reqVO) {
         return success(machineTemplateService.createCuttingTemplate(reqVO));
     }
 
     @PostMapping("cutting-machine")
-    @Operation(summary = "修改开料机台模板配置")
+    @Operation(summary = "修改机台模板配置")
     @PreAuthorize("@ss.hasPermission('machine-template::update')")
     public CommonResult<Boolean> updateCuttingTemplate(@RequestBody CuttingTemplateSaveReqVO reqVO) {
         return success(machineTemplateService.updateCuttingTemplate(reqVO));
     }
 
     @GetMapping("cutting-machine")
-    @Operation(summary = "获取开料机台模板配置")
+    @Operation(summary = "获取机台模板配置")
     @PreAuthorize("@ss.hasPermission('machine-template::query')")
     public CommonResult<CuttingTemplateRespVO> getCuttingTemplateById(@RequestParam("id") String id) {
         return success(machineTemplateService.getCuttingTemplateById(id));
     }
 
     @DeleteMapping("cutting-machine")
-    @Operation(summary = "删除开料机台模板配置")
+    @Operation(summary = "删除机台模板配置")
     @PreAuthorize("@ss.hasPermission('machine-template::delete')")
     public CommonResult<Boolean> deleteCutting(@RequestParam("id") Long id) {
         return success(machineTemplateService.deleteCuttingTemplate(id));
     }
 
     @DeleteMapping("batch-delete-cutting")
-    @Operation(summary = "批量删除开料机台模板配置")
+    @Operation(summary = "批量删除机台模板配置")
     @PreAuthorize("@ss.hasPermission('machine-template::delete')")
     public CommonResult<Boolean> batchDeleteCutting(@RequestParam("id") List<Long> ids) {
         return success(machineTemplateService.batchDeleteCuttingTemplate(ids));

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

@@ -62,16 +62,7 @@ public class MachineServiceImpl implements MachineService {
     public Long createCutting(CuttingSaveReqVO createReqVO) {
         // 插入
         MachineDO machineDO = MachineConvert.convert(createReqVO);
-        //MachineDO machineDO = Convert.convert(MachineDO.class, createReqVO);
         machineMapper.insert(machineDO);
-       /* CuttingSettingDO machineSettingDO = createReqVO.getMachineSettingDO();
-        machineSettingDO.setMachineId(machineDO.getId());
-        try {
-            esDocumentService.createByFluentDSL(CUTTING_MACHINE_SETTING, machineSettingDO.getId(), machineSettingDO);
-        } catch (Exception e) {
-            log.error(e.getMessage());
-            throw exception(INTERNAL_SERVER_ERROR);
-        }*/
         // 返回
         return machineDO.getId();
     }
@@ -80,13 +71,6 @@ public class MachineServiceImpl implements MachineService {
     public void updateCutting(CuttingSaveReqVO updateReqVO){
         // 校验存在
         validateExists(updateReqVO.getId());
-       /* updateReqVO.getMachineSettingDO().setMachineId(updateReqVO.getId());
-        try {
-            esDocumentService.createByFluentDSL(CUTTING_MACHINE_SETTING, updateReqVO.getMachineSettingDO().getId(), updateReqVO.getMachineSettingDO());
-        } catch (Exception e) {
-            log.error(e.getMessage());
-            throw exception(INTERNAL_SERVER_ERROR);
-        }*/
         // 更新
         MachineDO updateObj = MachineConvert.convert(updateReqVO);
         //MachineDO updateObj = BeanUtils.toBean(updateReqVO, MachineDO.class);
@@ -100,16 +84,6 @@ public class MachineServiceImpl implements MachineService {
         if (machineMapper.selectById(id) == null) {
             throw exception(MACHINE_NOT_EXISTS);
         }
-       /* // 删除
-        DeleteByQueryRequest.Builder builder = new DeleteByQueryRequest.Builder()
-                .index(CUTTING_MACHINE_SETTING)
-                .query(b->b.term(t->t.field("machineId").value(machineDO.getId())));
-        try {
-            elasticsearchClient.deleteByQuery(builder.build());
-        } catch (IOException e) {
-            log.error(e.getMessage());
-            throw exception(INTERNAL_SERVER_ERROR);
-        }*/
         machineMapper.deleteById(id);
     }
 
@@ -119,16 +93,6 @@ public class MachineServiceImpl implements MachineService {
         if(CollectionUtil.isEmpty(machineDOS)){
             throw exception(MACHINE_NOT_EXISTS);
         }
-       /* List<FieldValue> fieldValues = machineDOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList());
-        DeleteByQueryRequest.Builder builder = new DeleteByQueryRequest.Builder()
-                .index(CUTTING_MACHINE_SETTING)
-                .query(TermsQuery.of(e-> e.field("machineId").terms(b->b.value(fieldValues)))._toQuery());
-        try {
-            elasticsearchClient.deleteByQuery(builder.build());
-        } catch (IOException e) {
-            log.error(e.getMessage());
-            throw exception(INTERNAL_SERVER_ERROR);
-        }*/
         machineMapper.deleteBatchIds(ids);
     }
 
@@ -139,9 +103,6 @@ public class MachineServiceImpl implements MachineService {
             throw exception(MACHINE_NOT_EXISTS);
         }
         CuttingRespVO respVO = MachineConvert.convert(machineDO);
-        //CuttingRespVO respVO = Convert.convert(CuttingRespVO.class, machineDO);
-        /*Object o1 = buildResp(machineDO.getId(), CUTTING_MACHINE_SETTING, CuttingSettingDO.class);
-        respVO.setMachineSettingDO((CuttingSettingDO) o1);*/
         return respVO;
     }
 

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

@@ -165,32 +165,14 @@ public class MachineTemplateServiceImpl implements MachineTemplateService {
     @Transactional(rollbackFor = Exception.class)
     public Long createCuttingTemplate(CuttingTemplateSaveReqVO reqVO) {
         MachineTemplateDO templateDO = MachineTemplateConvert.convert(reqVO);
-        //MachineTemplateDO templateDO = Convert.convert(MachineTemplateDO.class, reqVO);
         machineTemplateMapper.insert(templateDO);
-        /*CuttingTemplateMachineDO setting = reqVO.getSetting();
-        setting.setTemplateId(templateDO.getId());
-        try {
-            esDocumentService.createByFluentDSL(CUTTING_MACHINE_INX, setting.getId(), setting);
-        } catch (Exception e) {
-            log.error(e.getMessage());
-            throw new ServiceException(INTERNAL_SERVER_ERROR);
-        }*/
         return templateDO.getId();
     }
 
     @Override
     public Boolean updateCuttingTemplate(CuttingTemplateSaveReqVO reqVO) {
         MachineTemplateDO templateDO = MachineTemplateConvert.convert(reqVO);
-        //MachineTemplateDO templateDO = Convert.convert(MachineTemplateDO.class, reqVO);
         machineTemplateMapper.updateById(templateDO);
-        /*CuttingTemplateMachineDO setting = reqVO.getSetting();
-        Map<String, Object> map = BeanUtil.beanToMap(setting);
-        try {
-            esDocumentService.updateById(CUTTING_MACHINE_INX, setting.getId(), CuttingTemplateMachineDO.class, map);
-        } catch (IOException e) {
-            log.error(e.getMessage());
-            throw new ServiceException(INTERNAL_SERVER_ERROR);
-        }*/
         return Boolean.TRUE;
     }
 
@@ -201,9 +183,6 @@ public class MachineTemplateServiceImpl implements MachineTemplateService {
             throw exception(MACHINE_TEMPLATE_NOT_EXISTS);
         }
         CuttingTemplateRespVO respVO  = MachineTemplateConvert.convert1(templateDO);
-        /*CuttingTemplateRespVO respVO = Convert.convert(CuttingTemplateRespVO.class, templateDO);
-        Object o = buildResp(templateDO.getId(), CUTTING_MACHINE_INX, CuttingTemplateMachineDO.class);
-        respVO.setCuttingTemplateMachineDO((CuttingTemplateMachineDO) o);*/
         return respVO;
     }
 
@@ -213,17 +192,6 @@ public class MachineTemplateServiceImpl implements MachineTemplateService {
         if (CollectionUtil.isEmpty(machineTemplateDOS)) {
             throw exception(MACHINE_TEMPLATE_NOT_EXISTS);
         }
-
-       /* List<FieldValue> fieldValues = machineTemplateDOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList());
-        DeleteByQueryRequest.Builder builder = new DeleteByQueryRequest.Builder()
-                .index(CUTTING_MACHINE_INX)
-                .query(TermsQuery.of(e -> e.field("templateId").terms(b -> b.value(fieldValues)))._toQuery());
-        try {
-            elasticsearchClient.deleteByQuery(builder.build());
-        } catch (IOException e) {
-            log.error(e.getMessage());
-            throw new ServiceException(INTERNAL_SERVER_ERROR);
-        }*/
         machineTemplateMapper.deleteBatchIds(ids);
         return Boolean.TRUE;
     }
@@ -240,9 +208,6 @@ public class MachineTemplateServiceImpl implements MachineTemplateService {
             }
             MachineTemplateDO templateDO = machineTemplateDOS.get(0);
             return MachineTemplateConvert.convert(templateDO);
-            //CuttingTemplateRespVO respVO = Convert.convert(CuttingTemplateRespVO.class, templateDO);
-           /* Object o = buildResp(templateDO.getId(), CUTTING_MACHINE_INX, CuttingTemplateMachineDO.class);
-            respVO.setCuttingTemplateMachineDO((CuttingTemplateMachineDO) o);*/
         }
         throw exception(DEFAULT_TEMPLATE_NOT_EXISTS);
     }
@@ -299,16 +264,6 @@ public class MachineTemplateServiceImpl implements MachineTemplateService {
         if (Objects.isNull(templateDO)) {
             throw exception(MACHINE_TEMPLATE_NOT_EXISTS);
         }
-        // 删除
-       /* DeleteByQueryRequest.Builder builder = new DeleteByQueryRequest.Builder()
-                .index(CUTTING_MACHINE_INX)
-                .query(b -> b.term(t -> t.field("templateId").value(templateDO.getId())));
-        try {
-            elasticsearchClient.deleteByQuery(builder.build());
-        } catch (IOException e) {
-            log.error(e.getMessage());
-            throw new ServiceException(INTERNAL_SERVER_ERROR);
-        }*/
         machineTemplateMapper.deleteById(id);
         return Boolean.TRUE;
     }