修改nacos配置

yangys

2025-06-04 78cc285f739d97d117dd2199649715529c40a199

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineController.java

copy from blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineGroupController.java
copy to blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineController.java
Îļþ´Ó blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineGroupController.java ¸´ÖÆ
@@ -10,30 +10,31 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.basesetting.machine.MachineGroupService;
import org.springblade.mdm.basesetting.machine.entity.MachineGroup;
import org.springblade.mdm.basesetting.machine.MachineService;
import org.springblade.mdm.basesetting.machine.vo.MachineQueryVO;
import org.springblade.mdm.basesetting.machine.vo.MachineSaveVO;
import org.springblade.mdm.basesetting.machine.vo.MachineVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.Map;

@Slf4j
@RestController
@RequestMapping("/machinegroup")
@Tag(name = "机床组", description = "机床组")
public class MachineGroupController {
@RequestMapping("/machine")
@Tag(name = "机床", description = "机床")
public class MachineController {

   @Autowired
   private MachineGroupService grpService;
   private MachineService service;

   /**
    * æ–°å¢ž
    */
   @PostMapping("/save")
   @Operation(summary = "新增", description = "机床组信息")
   public R<Boolean> save(@RequestBody MachineGroup grp) {
   public R<Boolean> save(@RequestBody MachineSaveVO vo) {

      return R.<Boolean>status(grpService.save(grp));
      service.saveMachine(vo);
      return R.<Boolean>status(true);
   }

   /**
@@ -41,9 +42,9 @@
    */
   @Operation(summary = "修改", description = "机床组信息")
   @PostMapping("/update")
   public R<Boolean> update(@RequestBody MachineGroup grp) {
   public R<Boolean> update(@RequestBody MachineSaveVO vo) {

      return R.<Boolean>status(grpService.updateById(grp));
      return R.<Boolean>status(service.updateMachine(vo));
   }

   /**
@@ -53,7 +54,7 @@
   @PostMapping("/remove")
   public R<Void> remove(@RequestParam String ids) {
      try {
         grpService.removeGroups(Func.toLongList(ids));
         service.removeMachines(Func.toLongList(ids));
      } catch (Exception e) {
         log.error("删除异常",e);
         return R.fail(e.getMessage());
@@ -66,8 +67,8 @@
    */
   @Operation(summary = "分页查询", description = "名称或编码")
   @GetMapping("/page")
   public R<IPage<MachineGroup>> page(String keyword, Query query) {

   public R<IPage<MachineVO>> page(MachineQueryVO query) {
      /*
      LambdaQueryWrapper<MachineGroup> wrapper = new LambdaQueryWrapper<>();
      //wrapper.like(StringUtils.isNotBlank(keyword),MachineGroup::getName, "%"+keyword+"%");
      wrapper.and(StringUtils.isNotBlank(keyword),(w1)->{
@@ -75,7 +76,9 @@
            .or().like(MachineGroup::getCode,"%"+keyword+"%");
      });

      IPage<MachineGroup> pages = grpService.page(Condition.getPage(query), wrapper);
       */

      IPage<MachineVO> pages = service.pageQuery(query);
      return R.data(pages);
   }
}