问题反馈

Lius

2024-05-16 d4c42dade56ff6c2bd5ca83819f8a8f56430e682

问题反馈

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcFeedbackController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,154 @@
package org.jeecg.modules.mdc.controller;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.mdc.entity.MdcFeedback;
import org.jeecg.modules.mdc.service.IMdcFeedbackService;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;

/**
 * @Description: é—®é¢˜åé¦ˆ
 * @Author: Lius
 * @Date: 2024-05-16
 * @Version: V1.0
 */
@Slf4j
@Api(tags = "问题反馈")
@RestController
@RequestMapping("/mdc/mdcFeedback")
public class MdcFeedbackController extends JeecgController<MdcFeedback, IMdcFeedbackService> {

    @Resource
    private IMdcFeedbackService mdcFeedbackService;

    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param mdcFeedback
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    @AutoLog(value = "问题反馈-分页列表查询")
    @ApiOperation(value = "问题反馈-分页列表查询", notes = "问题反馈-分页列表查询")
    @GetMapping(value = "/list")
    public Result<?> queryPageList(MdcFeedback mdcFeedback,
                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<MdcFeedback> queryWrapper = QueryGenerator.initQueryWrapper(mdcFeedback, req.getParameterMap());
        Page<MdcFeedback> page = new Page<MdcFeedback>(pageNo, pageSize);
        IPage<MdcFeedback> pageList = mdcFeedbackService.page(page, queryWrapper);
        return Result.OK(pageList);
    }

    /**
     * æ·»åŠ 
     *
     * @param mdcFeedback
     * @return
     */
    @AutoLog(value = "问题反馈-添加")
    @ApiOperation(value = "问题反馈-添加", notes = "问题反馈-添加")
    @PostMapping(value = "/add")
    public Result<?> add(@RequestBody MdcFeedback mdcFeedback) {
        mdcFeedbackService.save(mdcFeedback);
        return Result.OK("添加成功！");
    }

    /**
     * ç¼–辑
     *
     * @param mdcFeedback
     * @return
     */
    @AutoLog(value = "问题反馈-编辑")
    @ApiOperation(value = "问题反馈-编辑", notes = "问题反馈-编辑")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
    public Result<?> edit(@RequestBody MdcFeedback mdcFeedback) {
        mdcFeedbackService.updateById(mdcFeedback);
        return Result.OK("编辑成功!");
    }

    /**
     * é€šè¿‡id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "问题反馈-通过id删除")
    @ApiOperation(value = "问题反馈-通过id删除", notes = "问题反馈-通过id删除")
    @DeleteMapping(value = "/delete")
    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
        mdcFeedbackService.removeById(id);
        return Result.OK("删除成功!");
    }

    /**
     * æ‰¹é‡åˆ é™¤
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "问题反馈-批量删除")
    @ApiOperation(value = "问题反馈-批量删除", notes = "问题反馈-批量删除")
    @DeleteMapping(value = "/deleteBatch")
    public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
        this.mdcFeedbackService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功！");
    }

    /**
     * é€šè¿‡id查询
     *
     * @param id
     * @return
     */
    @AutoLog(value = "问题反馈-通过id查询")
    @ApiOperation(value = "问题反馈-通过id查询", notes = "问题反馈-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
        MdcFeedback mdcFeedback = mdcFeedbackService.getById(id);
        return Result.OK(mdcFeedback);
    }

    /**
     * å¯¼å‡ºexcel
     *
     * @param request
     * @param mdcFeedback
     */
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, MdcFeedback mdcFeedback) {
        return super.exportXls(request, mdcFeedback, MdcFeedback.class, "问题反馈");
    }

    /**
     * é€šè¿‡excel导入数据
     *
     * @param request
     * @param response
     * @return
     */
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, MdcFeedback.class);
    }

}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcHomeController.java

@@ -12,6 +12,7 @@
import org.jeecg.modules.mdc.constant.MdcConstant;
import org.jeecg.modules.mdc.dto.MdcEquipmentDto;
import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.entity.MdcFeedback;
import org.jeecg.modules.mdc.entity.MdcOverallEquipmentEfficiency;
import org.jeecg.modules.mdc.service.IMdcEquipmentService;
import org.jeecg.modules.mdc.service.IMdcHomeService;
@@ -252,4 +253,22 @@
        return Result.OK(result);
    }

    @ApiOperation(value = "MDC首页接口-问题列表", notes = "MDC首页接口-问题列表")
    @GetMapping("/feedbackList")
    public Result<?> feedbackList(String productionCode) {
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        String userId = user.getId();
        String key = "";
        if (StringUtils.isNotBlank(productionCode)) {
            //厂区
            MdcProduction mdcProduction = mdcProductionService.getOne(new LambdaQueryWrapper<MdcProduction>().eq(MdcProduction::getProductionCode, productionCode).eq(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_0.toString()));
            key = mdcProduction.getId();
        } else {
            //工段 æŸ¥è¯¢ç”¨æˆ·æ‹¥æœ‰çš„工段权限
            key = mdcProductionService.findThreeProductionId(userId);
        }
        List<MdcFeedback> result = mdcHomeService.getFeedbackList(key);
        return Result.OK(result);
    }

}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcFeedback.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,44 @@
package org.jeecg.modules.mdc.entity;

import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecgframework.poi.excel.annotation.Excel;

import java.io.Serializable;

/**
 * @Description: é—®é¢˜åé¦ˆ
 * @Author: Lius
 * @Date: 2024-05-16
 * @Version: V1.0
 */
@Data
@TableName("mdc_feedback")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value = "mdc_feedback对象", description = "问题反馈")
public class MdcFeedback extends JeecgEntity implements Serializable {

    private static final long serialVersionUID = -3363504953566755540L;

    /**
     * å†…容
     */
    @Excel(name = "内容", width = 15)
    @ApiModelProperty(value = "内容")
    private String content;
    /**
     * è½¦é—´id
     */
    @Excel(name = "车间id", width = 15)
    @ApiModelProperty(value = "车间id")
    @Dict(dictTable = "mdc_production", dicCode = "id", dicText = "production_name")
    private String productionId;

}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcFeedbackMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
package org.jeecg.modules.mdc.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.mdc.entity.MdcFeedback;

/**
 * @Description: é—®é¢˜åé¦ˆ
 * @Author: Lius
 * @Date:   2024-05-16
 * @Version: V1.0
 */
public interface MdcFeedbackMapper extends BaseMapper<MdcFeedback> {

}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcFeedbackMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.mdc.mapper.MdcFeedbackMapper">

</mapper>

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcFeedbackService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
package org.jeecg.modules.mdc.service;

import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.mdc.entity.MdcFeedback;

/**
 * @Description: é—®é¢˜åé¦ˆ
 * @Author: Lius
 * @Date: 2024-05-16
 * @Version: V1.0
 */
public interface IMdcFeedbackService extends IService<MdcFeedback> {

}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcHomeService.java

@@ -2,6 +2,7 @@

import org.jeecg.modules.mdc.dto.MdcEquipmentDto;
import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.entity.MdcFeedback;
import org.jeecg.modules.mdc.entity.MdcOverallEquipmentEfficiency;
import org.jeecg.modules.mdc.vo.MdcCommonVo;
import org.jeecg.modules.mdc.vo.MdcHomeEfficiencyVo;
@@ -70,4 +71,5 @@
     */
    MdcEquipmentDto getEquipmentDetails(String equipmentId);

    List<MdcFeedback> getFeedbackList(String key);
}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java

@@ -49,6 +49,9 @@
    @Resource
    private IEquipmentLogService equipmentLogService;

    @Resource
    private IMdcFeedbackService mdcFeedbackService;

    /**
     * è®¾å¤‡è¿è¡ŒçŠ¶æ€ç»Ÿè®¡
     */
@@ -497,4 +500,9 @@
        }
        return dto;
    }

    @Override
    public List<MdcFeedback> getFeedbackList(String key) {
        return mdcFeedbackService.list(new LambdaQueryWrapper<MdcFeedback>().eq(MdcFeedback::getProductionId, key).orderByDesc(MdcFeedback::getCreateTime));
    }
}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcFeedbackServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
package org.jeecg.modules.mdc.service.impl;


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.mdc.entity.MdcFeedback;
import org.jeecg.modules.mdc.mapper.MdcFeedbackMapper;
import org.jeecg.modules.mdc.service.IMdcFeedbackService;
import org.springframework.stereotype.Service;

/**
 * @Description: é—®é¢˜åé¦ˆ
 * @Author: Lius
 * @Date:   2024-05-16
 * @Version: V1.0
 */
@Service
public class MdcFeedbackServiceImpl extends ServiceImpl<MdcFeedbackMapper, MdcFeedback> implements IMdcFeedbackService {

}