From d4c42dade56ff6c2bd5ca83819f8a8f56430e682 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 16 五月 2024 11:18:37 +0800
Subject: [PATCH] 问题反馈
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcFeedbackMapper.xml | 5 +
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcFeedbackService.java | 14 ++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcFeedback.java | 44 ++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcFeedbackMapper.java | 14 ++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java | 8 +
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcFeedbackServiceImpl.java | 19 +++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcHomeController.java | 19 +++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcHomeService.java | 2
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcFeedbackController.java | 154 ++++++++++++++++++++++++++++++
9 files changed, 279 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcFeedbackController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcFeedbackController.java
new file mode 100644
index 0000000..ce2e891
--- /dev/null
+++ b/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);
+ }
+
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcHomeController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcHomeController.java
index 8db6ba5..51baf9f 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcHomeController.java
+++ b/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);
+ }
+
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcFeedback.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcFeedback.java
new file mode 100644
index 0000000..da3771b
--- /dev/null
+++ b/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;
+
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcFeedbackMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcFeedbackMapper.java
new file mode 100644
index 0000000..a907ab7
--- /dev/null
+++ b/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> {
+
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcFeedbackMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcFeedbackMapper.xml
new file mode 100644
index 0000000..56380f2
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcFeedbackService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcFeedbackService.java
new file mode 100644
index 0000000..8238b9e
--- /dev/null
+++ b/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> {
+
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcHomeService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcHomeService.java
index a206d86..cadcb5a 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcHomeService.java
+++ b/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);
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java
index ba1e347..6968763 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java
+++ b/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));
+ }
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcFeedbackServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcFeedbackServiceImpl.java
new file mode 100644
index 0000000..ad6cc65
--- /dev/null
+++ b/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 {
+
+}
--
Gitblit v1.9.3