合并fix

songhuangfeng123

2022-08-03 81695c67562b55493a2e98263223c5440e28feed

 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/EquipmentInfoController.java

@@ -67,10 +67,10 @@
            return new ResultVO<>(ResultCodes.CLIENT_PARAM_ILLEGAL,"缺少infoType");
        }

      PageUtils.checkCheck(pageQuery);
        PageUtils.checkCheck(pageQuery);
      return this.equipmentInfoService.queryAll(pageQuery);
    }

	

    /**
     * 通过主键查询单条数据
@@ -108,10 +108,12 @@
     * @param ids 主键结合
     * @return 删除结果
     */
    @GetMapping(value = "/delete")
    public ResultVO delete(String ids) {
   List<String> idList = Arrays.stream(ids.split(","))
                .collect(Collectors.toList());
    @RequestMapping(value = "/delete",method = RequestMethod.POST)
    public ResultVO delete(@RequestBody Long[] ids) {
        if(ids == null){
            return new ResultVO<>(ResultCodes.CLIENT_PARAM_ILLEGAL);
        }
        List<Long> idList = Arrays.asList(ids);
        this.equipmentInfoService.removeByIds(idList);
        return new ResultVO<>(ResultCodes.OK);
    }
@@ -401,8 +403,8 @@
        infoDto.setDestoryReason("");
        infoDto.setDestorySubmitDate(new Timestamp(new java.util.Date().getTime()));
        infoDto.setActualDestoryDate(new Timestamp(new java.util.Date().getTime()));

        System.out.println(JSONObject.toJSONString(infoDto));


    }
}
}