Merge remote-tracking branch 'origin/master'

zhangherong

3 天以前 43f0e69715099cfc8c8b8ea5284b874bfad14400

 src/main/java/org/jeecg/modules/andon/controller/AndonResponseConfigController.java

@@ -11,6 +11,7 @@
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.andon.dto.AndonButtonDTO;
import org.jeecg.modules.andon.dto.AndonOrdeDto;
import org.jeecg.modules.andon.entity.AndonResponseConfig;
import org.jeecg.modules.andon.service.IAndonResponseConfigService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -68,9 +69,8 @@
    @AutoLog(value = "安灯工单-发送飞书消息")
    @ApiOperation(value = "安灯工单-发送飞书消息", notes = "安灯工单-发送飞书消息")
    @PostMapping(value = "/sendMessage")
    public Result<String> sendMessage(@RequestBody AndonButtonDTO andonButtonDTO) {
    public Result<String> sendMessage(@RequestBody AndonOrdeDto andonButtonDTO) {
        try {
            andonButtonDTO.setBlinkingFlag(1);
            // 调用服务层处理业务逻辑
            andonResponseConfigService.sendAndonNotification(andonButtonDTO);
            return Result.OK("添加成功！");
@@ -179,20 +179,6 @@
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, AndonResponseConfig.class);
    }


    /**
     * APP安灯按钮列表查询
     *
     * @param factoryId
     * @return
     */
    @ApiOperation(value = "安灯按钮配置-列表查询", notes = "安灯按钮配置-列表查询")
    @GetMapping(value = "/queryAndonButtonList")
    public Result<List<AndonButtonDTO>> queryAndonButtonList(@RequestParam("factoryId") String factoryId) {
        List<AndonButtonDTO> list = andonResponseConfigService.queryAndonButtonList(factoryId);
        return Result.OK(list);
    }

}