"; + }else{ + html +="
"; } } return html; From 25801c7483e4ac81fcb8cff5f09706f08234ecea Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 3 Aug 2022 11:56:10 +0800 Subject: [PATCH 05/54] =?UTF-8?q?=E5=B8=83=E5=B1=80=E7=9F=A5=E8=AF=86?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 4 + jero-web/src/common/lang/zh-cn.js | 4 + .../classificationMaintenanceAdd.vue | 172 ++++++++++++ .../classificationMaintenanceModel.vue | 206 ++++++++++++++ .../components/problemKnowledgeBaseList.vue | 19 +- .../components/problemKnowledgeBaseView.vue | 263 +++++++++++++++++- .../components/documentDataComparison.vue | 2 +- .../components/initiateComparison.vue | 1 + .../documentComparison/index.vue | 17 +- 9 files changed, 662 insertions(+), 26 deletions(-) create mode 100644 jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceAdd.vue create mode 100644 jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 8b51e9e80..deb708f55 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1221,4 +1221,8 @@ module.exports = { dre:'dre', applicableInstructionsMarketList:'Applicable instructions of market list', pleaseSelectTheDataCompared:'Please select the data to be compared', + problemLabel:'Problem label', + personCharge:'Person in charge', + addLabel:'Add Label', + editLabel:'Edit Label', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 472fcb015..e3ce4ee27 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1324,4 +1324,8 @@ module.exports = { dre:'填写人', applicableInstructionsMarketList:'市场清单适用说明', pleaseSelectTheDataCompared:'请选择需要对比的数据', + problemLabel:'问题标签', + personCharge:'负责人', + addLabel:'新增标签', + editLabel:'编辑标签', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceAdd.vue new file mode 100644 index 000000000..e86ce4846 --- /dev/null +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceAdd.vue @@ -0,0 +1,172 @@ + +
+
+
+
+
+ *
+ {{$t('problemLabel')}}
+
+
+
+
+
+
+ *
+ {{$t('personCharge')}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
index 73fe2200f..6036c6576 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
@@ -76,14 +76,19 @@
@showSizeChange="SizeChange"
/>
+
- {
+ @Autowired
+ private IProblemKnowledgeBaseBrowsingHistoryEOService problemKnowledgeBaseBrowsingHistoryEOService;
+
+ /**
+ * 分页列表查询
+ *
+ * @param problemKnowledgeBaseBrowsingHistoryEO
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "问题知识库浏览历史表-分页列表查询")
+ @ApiOperation(value="问题知识库浏览历史表-分页列表查询", notes="问题知识库浏览历史表-分页列表查询")
+ @GetMapping(value = "/page")
+ public Result queryPageList(ProblemKnowledgeBaseBrowsingHistoryEO problemKnowledgeBaseBrowsingHistoryEO,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(problemKnowledgeBaseBrowsingHistoryEO, req.getParameterMap());
+ Page page = new Page(pageNo, pageSize);
+ IPage pageList = problemKnowledgeBaseBrowsingHistoryEOService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 列表查询
+ *
+ * @return
+ */
+ @AutoLog(value = "问题知识库浏览历史表-列表查询")
+ @ApiOperation(value="问题知识库浏览历史表-列表查询", notes="问题知识库浏览历史表-列表查询")
+ @GetMapping(value = "/list")
+ public Result> queryList() {
+ List list = problemKnowledgeBaseBrowsingHistoryEOService.queryList();
+ return Result.OK(list);
+ }
+
+ /**
+ * 添加
+ *
+ * @param problemKnowledgeBaseBrowsingHistoryEO
+ * @return
+ */
+ @AutoLog(value = "问题知识库浏览历史表-添加")
+ @ApiOperation(value="问题知识库浏览历史表-添加", notes="问题知识库浏览历史表-添加")
+ @PostMapping(value = "/add")
+ public Result add(@Validated @RequestBody ProblemKnowledgeBaseBrowsingHistoryEO problemKnowledgeBaseBrowsingHistoryEO) {
+ problemKnowledgeBaseBrowsingHistoryEOService.add(problemKnowledgeBaseBrowsingHistoryEO);
+ return Result.OK("添加成功！");
+ }
+
+ /**
+ * 编辑
+ *
+ * @param problemKnowledgeBaseBrowsingHistoryEO
+ * @return
+ */
+ @AutoLog(value = "问题知识库浏览历史表-编辑")
+ @ApiOperation(value="问题知识库浏览历史表-编辑", notes="问题知识库浏览历史表-编辑")
+ @PutMapping(value = "/edit")
+ public Result edit(@Validated @RequestBody ProblemKnowledgeBaseBrowsingHistoryEO problemKnowledgeBaseBrowsingHistoryEO) {
+ problemKnowledgeBaseBrowsingHistoryEOService.editById(problemKnowledgeBaseBrowsingHistoryEO);
+ 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) {
+ problemKnowledgeBaseBrowsingHistoryEOService.deleteById(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.problemKnowledgeBaseBrowsingHistoryEOService.deleteByIds(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) {
+ ProblemKnowledgeBaseBrowsingHistoryEO problemKnowledgeBaseBrowsingHistoryEO = problemKnowledgeBaseBrowsingHistoryEOService.queryById(id);
+ if(problemKnowledgeBaseBrowsingHistoryEO==null) {
+ return Result.error("未找到对应数据");
+ }
+ return Result.OK(problemKnowledgeBaseBrowsingHistoryEO);
+ }
+
+ /**
+ * 导出excel
+ *
+ * @param request
+ * @param problemKnowledgeBaseBrowsingHistoryEO
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, ProblemKnowledgeBaseBrowsingHistoryEO problemKnowledgeBaseBrowsingHistoryEO) {
+ return super.exportXls(request, problemKnowledgeBaseBrowsingHistoryEO, ProblemKnowledgeBaseBrowsingHistoryEO.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, ProblemKnowledgeBaseBrowsingHistoryEO.class);
+ }
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseClassifyEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseClassifyEOController.java
new file mode 100644
index 000000000..3e9f5c700
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseClassifyEOController.java
@@ -0,0 +1,170 @@
+package com.jero.modules.problemKnowledgeBase.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.jero.common.api.vo.Result;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseClassifyEO;
+import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseClassifyEOService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import com.jero.common.system.base.controller.JeroController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.jero.common.aspect.annotation.AutoLog;
+
+
+ /**
+ * @Description: 问题知识库-分类表
+ * @Author: jero-boot
+ * @Date: 2022-08-03
+ * @Version: V1.0
+ */
+@Api(tags="问题知识库-分类表")
+@RestController
+@RequestMapping("/problemKnowledgeBase/problemKnowledgeBaseClassifyEO")
+@Slf4j
+public class ProblemKnowledgeBaseClassifyEOController extends JeroController {
+ @Autowired
+ private IProblemKnowledgeBaseClassifyEOService problemKnowledgeBaseClassifyEOService;
+
+ /**
+ * 分页列表查询
+ *
+ * @param problemKnowledgeBaseClassifyEO
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "问题知识库-分类表-分页列表查询")
+ @ApiOperation(value="问题知识库-分类表-分页列表查询", notes="问题知识库-分类表-分页列表查询")
+ @GetMapping(value = "/page")
+ public Result queryPageList(ProblemKnowledgeBaseClassifyEO problemKnowledgeBaseClassifyEO,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(problemKnowledgeBaseClassifyEO, req.getParameterMap());
+ Page page = new Page(pageNo, pageSize);
+ IPage pageList = problemKnowledgeBaseClassifyEOService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 列表查询
+ *
+ * @return
+ */
+ @AutoLog(value = "问题知识库-分类表-列表查询")
+ @ApiOperation(value="问题知识库-分类表-列表查询", notes="问题知识库-分类表-列表查询")
+ @GetMapping(value = "/list")
+ public Result> queryList() {
+ List list = problemKnowledgeBaseClassifyEOService.queryList();
+ return Result.OK(list);
+ }
+
+ /**
+ * 添加
+ *
+ * @param problemKnowledgeBaseClassifyEO
+ * @return
+ */
+ @AutoLog(value = "问题知识库-分类表-添加")
+ @ApiOperation(value="问题知识库-分类表-添加", notes="问题知识库-分类表-添加")
+ @PostMapping(value = "/add")
+ public Result add(@Validated @RequestBody ProblemKnowledgeBaseClassifyEO problemKnowledgeBaseClassifyEO) {
+ problemKnowledgeBaseClassifyEOService.add(problemKnowledgeBaseClassifyEO);
+ return Result.OK("添加成功！");
+ }
+
+ /**
+ * 编辑
+ *
+ * @param problemKnowledgeBaseClassifyEO
+ * @return
+ */
+ @AutoLog(value = "问题知识库-分类表-编辑")
+ @ApiOperation(value="问题知识库-分类表-编辑", notes="问题知识库-分类表-编辑")
+ @PutMapping(value = "/edit")
+ public Result edit(@Validated @RequestBody ProblemKnowledgeBaseClassifyEO problemKnowledgeBaseClassifyEO) {
+ problemKnowledgeBaseClassifyEOService.editById(problemKnowledgeBaseClassifyEO);
+ 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) {
+ problemKnowledgeBaseClassifyEOService.deleteById(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.problemKnowledgeBaseClassifyEOService.deleteByIds(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) {
+ ProblemKnowledgeBaseClassifyEO problemKnowledgeBaseClassifyEO = problemKnowledgeBaseClassifyEOService.queryById(id);
+ if(problemKnowledgeBaseClassifyEO==null) {
+ return Result.error("未找到对应数据");
+ }
+ return Result.OK(problemKnowledgeBaseClassifyEO);
+ }
+
+ /**
+ * 导出excel
+ *
+ * @param request
+ * @param problemKnowledgeBaseClassifyEO
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, ProblemKnowledgeBaseClassifyEO problemKnowledgeBaseClassifyEO) {
+ return super.exportXls(request, problemKnowledgeBaseClassifyEO, ProblemKnowledgeBaseClassifyEO.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, ProblemKnowledgeBaseClassifyEO.class);
+ }
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseCollectEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseCollectEOController.java
new file mode 100644
index 000000000..f58424eb6
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseCollectEOController.java
@@ -0,0 +1,170 @@
+package com.jero.modules.problemKnowledgeBase.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.jero.common.api.vo.Result;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseCollectEO;
+import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseCollectEOService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import com.jero.common.system.base.controller.JeroController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.jero.common.aspect.annotation.AutoLog;
+
+
+ /**
+ * @Description: 问题知识库收藏表
+ * @Author: jero-boot
+ * @Date: 2022-08-03
+ * @Version: V1.0
+ */
+@Api(tags="问题知识库收藏表")
+@RestController
+@RequestMapping("/problemKnowledgeBase/problemKnowledgeBaseCollectEO")
+@Slf4j
+public class ProblemKnowledgeBaseCollectEOController extends JeroController {
+ @Autowired
+ private IProblemKnowledgeBaseCollectEOService problemKnowledgeBaseCollectEOService;
+
+ /**
+ * 分页列表查询
+ *
+ * @param problemKnowledgeBaseCollectEO
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "问题知识库收藏表-分页列表查询")
+ @ApiOperation(value="问题知识库收藏表-分页列表查询", notes="问题知识库收藏表-分页列表查询")
+ @GetMapping(value = "/page")
+ public Result queryPageList(ProblemKnowledgeBaseCollectEO problemKnowledgeBaseCollectEO,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(problemKnowledgeBaseCollectEO, req.getParameterMap());
+ Page page = new Page(pageNo, pageSize);
+ IPage pageList = problemKnowledgeBaseCollectEOService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 列表查询
+ *
+ * @return
+ */
+ @AutoLog(value = "问题知识库收藏表-列表查询")
+ @ApiOperation(value="问题知识库收藏表-列表查询", notes="问题知识库收藏表-列表查询")
+ @GetMapping(value = "/list")
+ public Result> queryList() {
+ List list = problemKnowledgeBaseCollectEOService.queryList();
+ return Result.OK(list);
+ }
+
+ /**
+ * 添加
+ *
+ * @param problemKnowledgeBaseCollectEO
+ * @return
+ */
+ @AutoLog(value = "问题知识库收藏表-添加")
+ @ApiOperation(value="问题知识库收藏表-添加", notes="问题知识库收藏表-添加")
+ @PostMapping(value = "/add")
+ public Result add(@Validated @RequestBody ProblemKnowledgeBaseCollectEO problemKnowledgeBaseCollectEO) {
+ problemKnowledgeBaseCollectEOService.add(problemKnowledgeBaseCollectEO);
+ return Result.OK("添加成功！");
+ }
+
+ /**
+ * 编辑
+ *
+ * @param problemKnowledgeBaseCollectEO
+ * @return
+ */
+ @AutoLog(value = "问题知识库收藏表-编辑")
+ @ApiOperation(value="问题知识库收藏表-编辑", notes="问题知识库收藏表-编辑")
+ @PutMapping(value = "/edit")
+ public Result edit(@Validated @RequestBody ProblemKnowledgeBaseCollectEO problemKnowledgeBaseCollectEO) {
+ problemKnowledgeBaseCollectEOService.editById(problemKnowledgeBaseCollectEO);
+ 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) {
+ problemKnowledgeBaseCollectEOService.deleteById(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.problemKnowledgeBaseCollectEOService.deleteByIds(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) {
+ ProblemKnowledgeBaseCollectEO problemKnowledgeBaseCollectEO = problemKnowledgeBaseCollectEOService.queryById(id);
+ if(problemKnowledgeBaseCollectEO==null) {
+ return Result.error("未找到对应数据");
+ }
+ return Result.OK(problemKnowledgeBaseCollectEO);
+ }
+
+ /**
+ * 导出excel
+ *
+ * @param request
+ * @param problemKnowledgeBaseCollectEO
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, ProblemKnowledgeBaseCollectEO problemKnowledgeBaseCollectEO) {
+ return super.exportXls(request, problemKnowledgeBaseCollectEO, ProblemKnowledgeBaseCollectEO.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, ProblemKnowledgeBaseCollectEO.class);
+ }
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseCommentEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseCommentEOController.java
new file mode 100644
index 000000000..f3b4b1d01
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseCommentEOController.java
@@ -0,0 +1,170 @@
+package com.jero.modules.problemKnowledgeBase.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.jero.common.api.vo.Result;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseCommentEO;
+import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseCommentEOService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import com.jero.common.system.base.controller.JeroController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.jero.common.aspect.annotation.AutoLog;
+
+
+ /**
+ * @Description: 问题知识库评论表
+ * @Author: jero-boot
+ * @Date: 2022-08-03
+ * @Version: V1.0
+ */
+@Api(tags="问题知识库评论表")
+@RestController
+@RequestMapping("/problemKnowledgeBase/problemKnowledgeBaseCommentEO")
+@Slf4j
+public class ProblemKnowledgeBaseCommentEOController extends JeroController {
+ @Autowired
+ private IProblemKnowledgeBaseCommentEOService problemKnowledgeBaseCommentEOService;
+
+ /**
+ * 分页列表查询
+ *
+ * @param problemKnowledgeBaseCommentEO
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "问题知识库评论表-分页列表查询")
+ @ApiOperation(value="问题知识库评论表-分页列表查询", notes="问题知识库评论表-分页列表查询")
+ @GetMapping(value = "/page")
+ public Result queryPageList(ProblemKnowledgeBaseCommentEO problemKnowledgeBaseCommentEO,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(problemKnowledgeBaseCommentEO, req.getParameterMap());
+ Page page = new Page(pageNo, pageSize);
+ IPage pageList = problemKnowledgeBaseCommentEOService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 列表查询
+ *
+ * @return
+ */
+ @AutoLog(value = "问题知识库评论表-列表查询")
+ @ApiOperation(value="问题知识库评论表-列表查询", notes="问题知识库评论表-列表查询")
+ @GetMapping(value = "/list")
+ public Result> queryList() {
+ List list = problemKnowledgeBaseCommentEOService.queryList();
+ return Result.OK(list);
+ }
+
+ /**
+ * 添加
+ *
+ * @param problemKnowledgeBaseCommentEO
+ * @return
+ */
+ @AutoLog(value = "问题知识库评论表-添加")
+ @ApiOperation(value="问题知识库评论表-添加", notes="问题知识库评论表-添加")
+ @PostMapping(value = "/add")
+ public Result add(@Validated @RequestBody ProblemKnowledgeBaseCommentEO problemKnowledgeBaseCommentEO) {
+ problemKnowledgeBaseCommentEOService.add(problemKnowledgeBaseCommentEO);
+ return Result.OK("添加成功！");
+ }
+
+ /**
+ * 编辑
+ *
+ * @param problemKnowledgeBaseCommentEO
+ * @return
+ */
+ @AutoLog(value = "问题知识库评论表-编辑")
+ @ApiOperation(value="问题知识库评论表-编辑", notes="问题知识库评论表-编辑")
+ @PutMapping(value = "/edit")
+ public Result edit(@Validated @RequestBody ProblemKnowledgeBaseCommentEO problemKnowledgeBaseCommentEO) {
+ problemKnowledgeBaseCommentEOService.editById(problemKnowledgeBaseCommentEO);
+ 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) {
+ problemKnowledgeBaseCommentEOService.deleteById(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.problemKnowledgeBaseCommentEOService.deleteByIds(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) {
+ ProblemKnowledgeBaseCommentEO problemKnowledgeBaseCommentEO = problemKnowledgeBaseCommentEOService.queryById(id);
+ if(problemKnowledgeBaseCommentEO==null) {
+ return Result.error("未找到对应数据");
+ }
+ return Result.OK(problemKnowledgeBaseCommentEO);
+ }
+
+ /**
+ * 导出excel
+ *
+ * @param request
+ * @param problemKnowledgeBaseCommentEO
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, ProblemKnowledgeBaseCommentEO problemKnowledgeBaseCommentEO) {
+ return super.exportXls(request, problemKnowledgeBaseCommentEO, ProblemKnowledgeBaseCommentEO.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, ProblemKnowledgeBaseCommentEO.class);
+ }
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseEOController.java
new file mode 100644
index 000000000..09bbe185d
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseEOController.java
@@ -0,0 +1,170 @@
+package com.jero.modules.problemKnowledgeBase.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.jero.common.api.vo.Result;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseEO;
+import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseEOService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import com.jero.common.system.base.controller.JeroController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.jero.common.aspect.annotation.AutoLog;
+
+
+ /**
+ * @Description: 问题知识库表
+ * @Author: jero-boot
+ * @Date: 2022-08-03
+ * @Version: V1.0
+ */
+@Api(tags="问题知识库表")
+@RestController
+@RequestMapping("/problemKnowledgeBase/problemKnowledgeBaseEO")
+@Slf4j
+public class ProblemKnowledgeBaseEOController extends JeroController {
+ @Autowired
+ private IProblemKnowledgeBaseEOService problemKnowledgeBaseEOService;
+
+ /**
+ * 分页列表查询
+ *
+ * @param problemKnowledgeBaseEO
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "问题知识库表-分页列表查询")
+ @ApiOperation(value="问题知识库表-分页列表查询", notes="问题知识库表-分页列表查询")
+ @GetMapping(value = "/page")
+ public Result queryPageList(ProblemKnowledgeBaseEO problemKnowledgeBaseEO,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(problemKnowledgeBaseEO, req.getParameterMap());
+ Page page = new Page(pageNo, pageSize);
+ IPage pageList = problemKnowledgeBaseEOService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 列表查询
+ *
+ * @return
+ */
+ @AutoLog(value = "问题知识库表-列表查询")
+ @ApiOperation(value="问题知识库表-列表查询", notes="问题知识库表-列表查询")
+ @GetMapping(value = "/list")
+ public Result> queryList() {
+ List list = problemKnowledgeBaseEOService.queryList();
+ return Result.OK(list);
+ }
+
+ /**
+ * 添加
+ *
+ * @param problemKnowledgeBaseEO
+ * @return
+ */
+ @AutoLog(value = "问题知识库表-添加")
+ @ApiOperation(value="问题知识库表-添加", notes="问题知识库表-添加")
+ @PostMapping(value = "/add")
+ public Result add(@Validated @RequestBody ProblemKnowledgeBaseEO problemKnowledgeBaseEO) {
+ problemKnowledgeBaseEOService.add(problemKnowledgeBaseEO);
+ return Result.OK("添加成功！");
+ }
+
+ /**
+ * 编辑
+ *
+ * @param problemKnowledgeBaseEO
+ * @return
+ */
+ @AutoLog(value = "问题知识库表-编辑")
+ @ApiOperation(value="问题知识库表-编辑", notes="问题知识库表-编辑")
+ @PutMapping(value = "/edit")
+ public Result edit(@Validated @RequestBody ProblemKnowledgeBaseEO problemKnowledgeBaseEO) {
+ problemKnowledgeBaseEOService.editById(problemKnowledgeBaseEO);
+ 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) {
+ problemKnowledgeBaseEOService.deleteById(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.problemKnowledgeBaseEOService.deleteByIds(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) {
+ ProblemKnowledgeBaseEO problemKnowledgeBaseEO = problemKnowledgeBaseEOService.queryById(id);
+ if(problemKnowledgeBaseEO==null) {
+ return Result.error("未找到对应数据");
+ }
+ return Result.OK(problemKnowledgeBaseEO);
+ }
+
+ /**
+ * 导出excel
+ *
+ * @param request
+ * @param problemKnowledgeBaseEO
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, ProblemKnowledgeBaseEO problemKnowledgeBaseEO) {
+ return super.exportXls(request, problemKnowledgeBaseEO, ProblemKnowledgeBaseEO.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, ProblemKnowledgeBaseEO.class);
+ }
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBasePraiseEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBasePraiseEOController.java
new file mode 100644
index 000000000..93a08e54e
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBasePraiseEOController.java
@@ -0,0 +1,170 @@
+package com.jero.modules.problemKnowledgeBase.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.jero.common.api.vo.Result;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBasePraiseEO;
+import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBasePraiseEOService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import com.jero.common.system.base.controller.JeroController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.jero.common.aspect.annotation.AutoLog;
+
+
+ /**
+ * @Description: 问题知识库点赞表
+ * @Author: jero-boot
+ * @Date: 2022-08-03
+ * @Version: V1.0
+ */
+@Api(tags="问题知识库点赞表")
+@RestController
+@RequestMapping("/problemKnowledgeBase/problemKnowledgeBasePraiseEO")
+@Slf4j
+public class ProblemKnowledgeBasePraiseEOController extends JeroController {
+ @Autowired
+ private IProblemKnowledgeBasePraiseEOService problemKnowledgeBasePraiseEOService;
+
+ /**
+ * 分页列表查询
+ *
+ * @param problemKnowledgeBasePraiseEO
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "问题知识库点赞表-分页列表查询")
+ @ApiOperation(value="问题知识库点赞表-分页列表查询", notes="问题知识库点赞表-分页列表查询")
+ @GetMapping(value = "/page")
+ public Result queryPageList(ProblemKnowledgeBasePraiseEO problemKnowledgeBasePraiseEO,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(problemKnowledgeBasePraiseEO, req.getParameterMap());
+ Page page = new Page(pageNo, pageSize);
+ IPage pageList = problemKnowledgeBasePraiseEOService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 列表查询
+ *
+ * @return
+ */
+ @AutoLog(value = "问题知识库点赞表-列表查询")
+ @ApiOperation(value="问题知识库点赞表-列表查询", notes="问题知识库点赞表-列表查询")
+ @GetMapping(value = "/list")
+ public Result> queryList() {
+ List list = problemKnowledgeBasePraiseEOService.queryList();
+ return Result.OK(list);
+ }
+
+ /**
+ * 添加
+ *
+ * @param problemKnowledgeBasePraiseEO
+ * @return
+ */
+ @AutoLog(value = "问题知识库点赞表-添加")
+ @ApiOperation(value="问题知识库点赞表-添加", notes="问题知识库点赞表-添加")
+ @PostMapping(value = "/add")
+ public Result add(@Validated @RequestBody ProblemKnowledgeBasePraiseEO problemKnowledgeBasePraiseEO) {
+ problemKnowledgeBasePraiseEOService.add(problemKnowledgeBasePraiseEO);
+ return Result.OK("添加成功！");
+ }
+
+ /**
+ * 编辑
+ *
+ * @param problemKnowledgeBasePraiseEO
+ * @return
+ */
+ @AutoLog(value = "问题知识库点赞表-编辑")
+ @ApiOperation(value="问题知识库点赞表-编辑", notes="问题知识库点赞表-编辑")
+ @PutMapping(value = "/edit")
+ public Result edit(@Validated @RequestBody ProblemKnowledgeBasePraiseEO problemKnowledgeBasePraiseEO) {
+ problemKnowledgeBasePraiseEOService.editById(problemKnowledgeBasePraiseEO);
+ 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) {
+ problemKnowledgeBasePraiseEOService.deleteById(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.problemKnowledgeBasePraiseEOService.deleteByIds(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) {
+ ProblemKnowledgeBasePraiseEO problemKnowledgeBasePraiseEO = problemKnowledgeBasePraiseEOService.queryById(id);
+ if(problemKnowledgeBasePraiseEO==null) {
+ return Result.error("未找到对应数据");
+ }
+ return Result.OK(problemKnowledgeBasePraiseEO);
+ }
+
+ /**
+ * 导出excel
+ *
+ * @param request
+ * @param problemKnowledgeBasePraiseEO
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, ProblemKnowledgeBasePraiseEO problemKnowledgeBasePraiseEO) {
+ return super.exportXls(request, problemKnowledgeBasePraiseEO, ProblemKnowledgeBasePraiseEO.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, ProblemKnowledgeBasePraiseEO.class);
+ }
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseUserEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseUserEOController.java
new file mode 100644
index 000000000..cff1a4c79
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseUserEOController.java
@@ -0,0 +1,170 @@
+package com.jero.modules.problemKnowledgeBase.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.jero.common.api.vo.Result;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseUserEO;
+import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseUserEOService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import com.jero.common.system.base.controller.JeroController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.jero.common.aspect.annotation.AutoLog;
+
+
+ /**
+ * @Description: 问题知识库展示权限表
+ * @Author: jero-boot
+ * @Date: 2022-08-03
+ * @Version: V1.0
+ */
+@Api(tags="问题知识库展示权限表")
+@RestController
+@RequestMapping("/problemKnowledgeBase/problemKnowledgeBaseUserEO")
+@Slf4j
+public class ProblemKnowledgeBaseUserEOController extends JeroController {
+ @Autowired
+ private IProblemKnowledgeBaseUserEOService problemKnowledgeBaseUserEOService;
+
+ /**
+ * 分页列表查询
+ *
+ * @param problemKnowledgeBaseUserEO
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "问题知识库展示权限表-分页列表查询")
+ @ApiOperation(value="问题知识库展示权限表-分页列表查询", notes="问题知识库展示权限表-分页列表查询")
+ @GetMapping(value = "/page")
+ public Result queryPageList(ProblemKnowledgeBaseUserEO problemKnowledgeBaseUserEO,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(problemKnowledgeBaseUserEO, req.getParameterMap());
+ Page page = new Page(pageNo, pageSize);
+ IPage pageList = problemKnowledgeBaseUserEOService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 列表查询
+ *
+ * @return
+ */
+ @AutoLog(value = "问题知识库展示权限表-列表查询")
+ @ApiOperation(value="问题知识库展示权限表-列表查询", notes="问题知识库展示权限表-列表查询")
+ @GetMapping(value = "/list")
+ public Result> queryList() {
+ List list = problemKnowledgeBaseUserEOService.queryList();
+ return Result.OK(list);
+ }
+
+ /**
+ * 添加
+ *
+ * @param problemKnowledgeBaseUserEO
+ * @return
+ */
+ @AutoLog(value = "问题知识库展示权限表-添加")
+ @ApiOperation(value="问题知识库展示权限表-添加", notes="问题知识库展示权限表-添加")
+ @PostMapping(value = "/add")
+ public Result add(@Validated @RequestBody ProblemKnowledgeBaseUserEO problemKnowledgeBaseUserEO) {
+ problemKnowledgeBaseUserEOService.add(problemKnowledgeBaseUserEO);
+ return Result.OK("添加成功！");
+ }
+
+ /**
+ * 编辑
+ *
+ * @param problemKnowledgeBaseUserEO
+ * @return
+ */
+ @AutoLog(value = "问题知识库展示权限表-编辑")
+ @ApiOperation(value="问题知识库展示权限表-编辑", notes="问题知识库展示权限表-编辑")
+ @PutMapping(value = "/edit")
+ public Result edit(@Validated @RequestBody ProblemKnowledgeBaseUserEO problemKnowledgeBaseUserEO) {
+ problemKnowledgeBaseUserEOService.editById(problemKnowledgeBaseUserEO);
+ 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) {
+ problemKnowledgeBaseUserEOService.deleteById(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.problemKnowledgeBaseUserEOService.deleteByIds(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) {
+ ProblemKnowledgeBaseUserEO problemKnowledgeBaseUserEO = problemKnowledgeBaseUserEOService.queryById(id);
+ if(problemKnowledgeBaseUserEO==null) {
+ return Result.error("未找到对应数据");
+ }
+ return Result.OK(problemKnowledgeBaseUserEO);
+ }
+
+ /**
+ * 导出excel
+ *
+ * @param request
+ * @param problemKnowledgeBaseUserEO
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, ProblemKnowledgeBaseUserEO problemKnowledgeBaseUserEO) {
+ return super.exportXls(request, problemKnowledgeBaseUserEO, ProblemKnowledgeBaseUserEO.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, ProblemKnowledgeBaseUserEO.class);
+ }
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseBrowsingHistoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseBrowsingHistoryEO.java
new file mode 100644
index 000000000..c96d6da99
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseBrowsingHistoryEO.java
@@ -0,0 +1,74 @@
+package com.jero.modules.problemKnowledgeBase.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+
+/**
+ * @Description: 问题知识库浏览历史表
+ * @Author: jero-boot
+ * @Date: 2022-08-03
+ * @Version: V1.0
+ */
+@Data
+@TableName("problem_knowledge_base_browsing_history")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="problem_knowledge_base_browsing_history对象", description="问题知识库浏览历史表")
+public class ProblemKnowledgeBaseBrowsingHistoryEO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**主键*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "主键")
+ private java.lang.String id;
+
+ /**创建人*/
+ @ApiModelProperty(value = "创建人")
+ private java.lang.String createBy;
+
+ /**创建日期*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "创建日期")
+ private java.util.Date createTime;
+
+ /**更新人*/
+ @ApiModelProperty(value = "更新人")
+ private java.lang.String updateBy;
+
+ /**更新日期*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "更新日期")
+ private java.util.Date updateTime;
+
+ /**所属部门*/
+ @ApiModelProperty(value = "所属部门")
+ private java.lang.String sysOrgCode;
+
+ /**问题知识库id*/
+ @Excel(name = "问题知识库id", width = 15)
+ @ApiModelProperty(value = "问题知识库id")
+ private java.lang.String problemKnowledgeBaseId;
+
+ /**浏览人员id*/
+ @Excel(name = "浏览人员id", width = 15)
+ @ApiModelProperty(value = "浏览人员id")
+ private java.lang.String browsingUserId;
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseClassifyEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseClassifyEO.java
new file mode 100644
index 000000000..2ce96532e
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseClassifyEO.java
@@ -0,0 +1,74 @@
+package com.jero.modules.problemKnowledgeBase.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+
+/**
+ * @Description: 问题知识库-分类表
+ * @Author: jero-boot
+ * @Date: 2022-08-03
+ * @Version: V1.0
+ */
+@Data
+@TableName("problem_knowledge_base_classify")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="problem_knowledge_base_classify对象", description="问题知识库-分类表")
+public class ProblemKnowledgeBaseClassifyEO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**主键*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "主键")
+ private java.lang.String id;
+
+ /**创建人*/
+ @ApiModelProperty(value = "创建人")
+ private java.lang.String createBy;
+
+ /**创建日期*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "创建日期")
+ private java.util.Date createTime;
+
+ /**更新人*/
+ @ApiModelProperty(value = "更新人")
+ private java.lang.String updateBy;
+
+ /**更新日期*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "更新日期")
+ private java.util.Date updateTime;
+
+ /**所属部门*/
+ @ApiModelProperty(value = "所属部门")
+ private java.lang.String sysOrgCode;
+
+ /**问题标签*/
+ @Excel(name = "问题标签", width = 15)
+ @ApiModelProperty(value = "问题标签")
+ private java.lang.String problemLabel;
+
+ /**负责人id*/
+ @Excel(name = "负责人id", width = 15)
+ @ApiModelProperty(value = "负责人id")
+ private java.lang.String chargePersonId;
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseCollectEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseCollectEO.java
new file mode 100644
index 000000000..e20eaf190
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseCollectEO.java
@@ -0,0 +1,79 @@
+package com.jero.modules.problemKnowledgeBase.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+
+/**
+ * @Description: 问题知识库收藏表
+ * @Author: jero-boot
+ * @Date: 2022-08-03
+ * @Version: V1.0
+ */
+@Data
+@TableName("problem_knowledge_base_collect")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="problem_knowledge_base_collect对象", description="问题知识库收藏表")
+public class ProblemKnowledgeBaseCollectEO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**主键*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "主键")
+ private java.lang.String id;
+
+ /**创建人*/
+ @ApiModelProperty(value = "创建人")
+ private java.lang.String createBy;
+
+ /**创建日期*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "创建日期")
+ private java.util.Date createTime;
+
+ /**更新人*/
+ @ApiModelProperty(value = "更新人")
+ private java.lang.String updateBy;
+
+ /**更新日期*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "更新日期")
+ private java.util.Date updateTime;
+
+ /**所属部门*/
+ @ApiModelProperty(value = "所属部门")
+ private java.lang.String sysOrgCode;
+
+ /**问题知识库id*/
+ @Excel(name = "问题知识库id", width = 15)
+ @ApiModelProperty(value = "问题知识库id")
+ private java.lang.String problemKnowledgeBaseId;
+
+ /**收藏用户id*/
+ @Excel(name = "收藏用户id", width = 15)
+ @ApiModelProperty(value = "收藏用户id")
+ private java.lang.String collectUserId;
+
+ /**收藏状态*/
+ @Excel(name = "收藏状态", width = 15)
+ @ApiModelProperty(value = "收藏状态")
+ private java.lang.String collectStatus;
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseCommentEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseCommentEO.java
new file mode 100644
index 000000000..a7d8fee97
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseCommentEO.java
@@ -0,0 +1,79 @@
+package com.jero.modules.problemKnowledgeBase.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+
+/**
+ * @Description: 问题知识库评论表
+ * @Author: jero-boot
+ * @Date: 2022-08-03
+ * @Version: V1.0
+ */
+@Data
+@TableName("problem_knowledge_base_comment")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="problem_knowledge_base_comment对象", description="问题知识库评论表")
+public class ProblemKnowledgeBaseCommentEO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**主键*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "主键")
+ private java.lang.String id;
+
+ /**创建人*/
+ @ApiModelProperty(value = "创建人")
+ private java.lang.String createBy;
+
+ /**创建日期*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "创建日期")
+ private java.util.Date createTime;
+
+ /**更新人*/
+ @ApiModelProperty(value = "更新人")
+ private java.lang.String updateBy;
+
+ /**更新日期*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "更新日期")
+ private java.util.Date updateTime;
+
+ /**所属部门*/
+ @ApiModelProperty(value = "所属部门")
+ private java.lang.String sysOrgCode;
+
+ /**问题知识库id*/
+ @Excel(name = "问题知识库id", width = 15)
+ @ApiModelProperty(value = "问题知识库id")
+ private java.lang.String problemKnowledgeBaseId;
+
+ /**评论内容*/
+ @Excel(name = "评论内容", width = 15)
+ @ApiModelProperty(value = "评论内容")
+ private java.lang.String commentContent;
+
+ /**评论用户id*/
+ @Excel(name = "评论用户id", width = 15)
+ @ApiModelProperty(value = "评论用户id")
+ private java.lang.String commentUserId;
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java
new file mode 100644
index 000000000..ac34b78ff
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java
@@ -0,0 +1,143 @@
+package com.jero.modules.problemKnowledgeBase.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+
+/**
+ * @Description: 问题知识库表
+ * @Author: jero-boot
+ * @Date: 2022-08-03
+ * @Version: V1.0
+ */
+@Data
+@TableName("problem_knowledge_base")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="problem_knowledge_base对象", description="问题知识库表")
+public class ProblemKnowledgeBaseEO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**主键*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "主键")
+ private java.lang.String id;
+
+ /**创建人*/
+ @ApiModelProperty(value = "创建人")
+ private java.lang.String createBy;
+
+ /**创建日期*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "创建日期")
+ private java.util.Date createTime;
+
+ /**更新人*/
+ @ApiModelProperty(value = "更新人")
+ private java.lang.String updateBy;
+
+ /**更新日期*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "更新日期")
+ private java.util.Date updateTime;
+
+ /**所属部门*/
+ @ApiModelProperty(value = "所属部门")
+ private java.lang.String sysOrgCode;
+
+ /**标题*/
+ @Excel(name = "标题", width = 15)
+ @ApiModelProperty(value = "标题")
+ private java.lang.String title;
+
+ /**问题分类*/
+ @Excel(name = "问题分类", width = 15)
+ @ApiModelProperty(value = "问题分类")
+ private java.lang.String problemType;
+
+ /**市场*/
+ @Excel(name = "市场", width = 15)
+ @ApiModelProperty(value = "市场")
+ private java.lang.String targetMarket;
+
+ /**文档库id*/
+ @Excel(name = "文档库id", width = 15)
+ @ApiModelProperty(value = "文档库id")
+ private java.lang.String bussDocumentLibraryId;
+
+ /**标准编号*/
+ @Excel(name = "标准编号", width = 15)
+ @ApiModelProperty(value = "标准编号")
+ private java.lang.String standNumber;
+
+ /**标准标题*/
+ @Excel(name = "标准标题", width = 15)
+ @ApiModelProperty(value = "标准标题")
+ private java.lang.String standTitle;
+
+ /**内容（正文）*/
+ @Excel(name = "内容（正文）", width = 15)
+ private transient java.lang.String contentString;
+
+ private byte[] content;
+
+ public byte[] getContent(){
+ if(contentString==null){
+ return null;
+ }
+ try {
+ return contentString.getBytes("UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ public String getContentString(){
+ if(content==null || content.length==0){
+ return "";
+ }
+ try {
+ return new String(content,"UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+ return "";
+ }
+ /**附件*/
+ @Excel(name = "附件", width = 15)
+ @ApiModelProperty(value = "附件")
+ private java.lang.String accessoryFile;
+
+ /**展示权限*/
+ @Excel(name = "展示权限", width = 15)
+ @ApiModelProperty(value = "展示权限")
+ private java.lang.String showPermissions;
+
+ /**发布人id*/
+ @Excel(name = "展示权限", width = 15)
+ @ApiModelProperty(value = "发布人id")
+ private java.lang.String releaseUserId;
+
+ /**发布日期*/
+ @Excel(name = "发布日期", width = 15)
+ @ApiModelProperty(value = "发布日期")
+ private java.lang.String releaseTime;
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBasePraiseEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBasePraiseEO.java
new file mode 100644
index 000000000..b12cb40cb
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBasePraiseEO.java
@@ -0,0 +1,79 @@
+package com.jero.modules.problemKnowledgeBase.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+
+/**
+ * @Description: 问题知识库点赞表
+ * @Author: jero-boot
+ * @Date: 2022-08-03
+ * @Version: V1.0
+ */
+@Data
+@TableName("problem_knowledge_base_praise")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="problem_knowledge_base_praise对象", description="问题知识库点赞表")
+public class ProblemKnowledgeBasePraiseEO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**主键*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "主键")
+ private java.lang.String id;
+
+ /**创建人*/
+ @ApiModelProperty(value = "创建人")
+ private java.lang.String createBy;
+
+ /**创建日期*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "创建日期")
+ private java.util.Date createTime;
+
+ /**更新人*/
+ @ApiModelProperty(value = "更新人")
+ private java.lang.String updateBy;
+
+ /**更新日期*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "更新日期")
+ private java.util.Date updateTime;
+
+ /**所属部门*/
+ @ApiModelProperty(value = "所属部门")
+ private java.lang.String sysOrgCode;
+
+ /**问题知识库id*/
+ @Excel(name = "问题知识库id", width = 15)
+ @ApiModelProperty(value = "问题知识库id")
+ private java.lang.String problemKnowledgeBaseId;
+
+ /**点赞人员id*/
+ @Excel(name = "点赞人员id", width = 15)
+ @ApiModelProperty(value = "点赞人员id")
+ private java.lang.String praiseUserId;
+
+ /**点赞状态*/
+ @Excel(name = "点赞状态", width = 15)
+ @ApiModelProperty(value = "点赞状态")
+ private java.lang.String praiseStatus;
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseUserEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseUserEO.java
new file mode 100644
index 000000000..4865c5bdd
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseUserEO.java
@@ -0,0 +1,74 @@
+package com.jero.modules.problemKnowledgeBase.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+
+/**
+ * @Description: 问题知识库展示权限表
+ * @Author: jero-boot
+ * @Date: 2022-08-03
+ * @Version: V1.0
+ */
+@Data
+@TableName("problem_knowledge_base_user")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="problem_knowledge_base_user对象", description="问题知识库展示权限表")
+public class ProblemKnowledgeBaseUserEO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**主键*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "主键")
+ private java.lang.String id;
+
+ /**创建人*/
+ @ApiModelProperty(value = "创建人")
+ private java.lang.String createBy;
+
+ /**创建日期*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "创建日期")
+ private java.util.Date createTime;
+
+ /**更新人*/
+ @ApiModelProperty(value = "更新人")
+ private java.lang.String updateBy;
+
+ /**更新日期*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "更新日期")
+ private java.util.Date updateTime;
+
+ /**所属部门*/
+ @ApiModelProperty(value = "所属部门")
+ private java.lang.String sysOrgCode;
+
+ /**问题知识库id*/
+ @Excel(name = "问题知识库id", width = 15)
+ @ApiModelProperty(value = "问题知识库id")
+ private java.lang.String problemKnowledgeBaseId;
+
+ /**用户id*/
+ @Excel(name = "用户id", width = 15)
+ @ApiModelProperty(value = "用户id")
+ private java.lang.String userId;
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseBrowsingHistoryEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseBrowsingHistoryEOMapper.java
new file mode 100644
index 000000000..cc4c4dca5
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseBrowsingHistoryEOMapper.java
@@ -0,0 +1,17 @@
+package com.jero.modules.problemKnowledgeBase.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseBrowsingHistoryEO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 问题知识库浏览历史表
+ * @Author: jero-boot
+ * @Date: 2022-08-03
+ * @Version: V1.0
+ */
+public interface ProblemKnowledgeBaseBrowsingHistoryEOMapper extends BaseMapper {
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseClassifyEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseClassifyEOMapper.java
new file mode 100644
index 000000000..ae0853022
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseClassifyEOMapper.java
@@ -0,0 +1,17 @@
+package com.jero.modules.problemKnowledgeBase.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseClassifyEO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 问题知识库-分类表
+ * @Author: jero-boot
+ * @Date: 2022-08-03
+ * @Version: V1.0
+ */
+public interface ProblemKnowledgeBaseClassifyEOMapper extends BaseMapper {
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseCollectEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseCollectEOMapper.java
new file mode 100644
index 000000000..2a5a58b75
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseCollectEOMapper.java
@@ -0,0 +1,17 @@
+package com.jero.modules.problemKnowledgeBase.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseCollectEO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 问题知识库收藏表
+ * @Author: jero-boot
+ * @Date: 2022-08-03
+ * @Version: V1.0
+ */
+public interface ProblemKnowledgeBaseCollectEOMapper extends BaseMapper {
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseCommentEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseCommentEOMapper.java
new file mode 100644
index 000000000..c62e67df3
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseCommentEOMapper.java
@@ -0,0 +1,17 @@
+package com.jero.modules.problemKnowledgeBase.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseCommentEO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 问题知识库评论表
+ * @Author: jero-boot
+ * @Date: 2022-08-03
+ * @Version: V1.0
+ */
+public interface ProblemKnowledgeBaseCommentEOMapper extends BaseMapper {
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseEOMapper.java
new file mode 100644
index 000000000..be6e0e9f1
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseEOMapper.java
@@ -0,0 +1,17 @@
+package com.jero.modules.problemKnowledgeBase.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseEO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 问题知识库表
+ * @Author: jero-boot
+ * @Date: 2022-08-03
+ * @Version: V1.0
+ */
+public interface ProblemKnowledgeBaseEOMapper extends BaseMapper {
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBasePraiseEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBasePraiseEOMapper.java
new file mode 100644
index 000000000..6387837a4
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBasePraiseEOMapper.java
@@ -0,0 +1,17 @@
+package com.jero.modules.problemKnowledgeBase.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBasePraiseEO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 问题知识库点赞表
+ * @Author: jero-boot
+ * @Date: 2022-08-03
+ * @Version: V1.0
+ */
+public interface ProblemKnowledgeBasePraiseEOMapper extends BaseMapper {
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseUserEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseUserEOMapper.java
new file mode 100644
index 000000000..833e8b7ca
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseUserEOMapper.java
@@ -0,0 +1,17 @@
+package com.jero.modules.problemKnowledgeBase.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseUserEO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 问题知识库展示权限表
+ * @Author: jero-boot
+ * @Date: 2022-08-03
+ * @Version: V1.0
+ */
+public interface ProblemKnowledgeBaseUserEOMapper extends BaseMapper {
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseBrowsingHistoryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseBrowsingHistoryEOMapper.xml
new file mode 100644
index 000000000..d7d8e2386
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseBrowsingHistoryEOMapper.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseClassifyEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseClassifyEOMapper.xml
new file mode 100644
index 000000000..21927cc7b
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseClassifyEOMapper.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseCollectEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseCollectEOMapper.xml
new file mode 100644
index 000000000..3b4f91413
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseCollectEOMapper.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseCommentEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseCommentEOMapper.xml
new file mode 100644
index 000000000..23e191dfe
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseCommentEOMapper.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseEOMapper.xml
new file mode 100644
index 000000000..d1061e37f
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseEOMapper.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBasePraiseEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBasePraiseEOMapper.xml
new file mode 100644
index 000000000..044434263
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBasePraiseEOMapper.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseUserEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseUserEOMapper.xml
new file mode 100644
index 000000000..e23f914c1
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseUserEOMapper.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseBrowsingHistoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseBrowsingHistoryEOService.java
new file mode 100644
index 000000000..b1a377731
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseBrowsingHistoryEOService.java
@@ -0,0 +1,61 @@
+package com.jero.modules.problemKnowledgeBase.service;
+
+import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseBrowsingHistoryEO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 问题知识库浏览历史表
+ * @Author: jero-boot
+ * @Date: 2022-08-03
+ * @Version: V1.0
+ */
+public interface IProblemKnowledgeBaseBrowsingHistoryEOService extends IService {
+
+ /**
+ * 保存
+ *
+ * @param problemKnowledgeBaseBrowsingHistoryEO
+ * @return
+ */
+ void add(ProblemKnowledgeBaseBrowsingHistoryEO problemKnowledgeBaseBrowsingHistoryEO);
+
+ /**
+ * 更新
+ *
+ * @param problemKnowledgeBaseBrowsingHistoryEO
+ * @return
+ */
+ void editById(ProblemKnowledgeBaseBrowsingHistoryEO problemKnowledgeBaseBrowsingHistoryEO);
+
+ /**
+ * 通过id删除
+ *
+ * @param id
+ * @return
+ */
+ void deleteById(String id);
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return
+ */
+ void deleteByIds(List ids);
+
+ /**
+ * 通过id查询
+ *
+ * @param id
+ * @return
+ */
+ ProblemKnowledgeBaseBrowsingHistoryEO queryById(String id);
+
+ /**
+ * 列表查询
+ *
+ * @return
+ */
+ List queryList();
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseClassifyEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseClassifyEOService.java
new file mode 100644
index 000000000..486f3ea5e
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseClassifyEOService.java
@@ -0,0 +1,61 @@
+package com.jero.modules.problemKnowledgeBase.service;
+
+import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseClassifyEO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 问题知识库-分类表
+ * @Author: jero-boot
+ * @Date: 2022-08-03
+ * @Version: V1.0
+ */
+public interface IProblemKnowledgeBaseClassifyEOService extends IService {
+
+ /**
+ * 保存
+ *
+ * @param problemKnowledgeBaseClassifyEO
+ * @return
+ */
+ void add(ProblemKnowledgeBaseClassifyEO problemKnowledgeBaseClassifyEO);
+
+ /**
+ * 更新
+ *
+ * @param problemKnowledgeBaseClassifyEO
+ * @return
+ */
+ void editById(ProblemKnowledgeBaseClassifyEO problemKnowledgeBaseClassifyEO);
+
+ /**
+ * 通过id删除
+ *
+ * @param id
+ * @return
+ */
+ void deleteById(String id);
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return
+ */
+ void deleteByIds(List ids);
+
+ /**
+ * 通过id查询
+ *
+ * @param id
+ * @return
+ */
+ ProblemKnowledgeBaseClassifyEO queryById(String id);
+
+ /**
+ * 列表查询
+ *
+ * @return
+ */
+ List queryList();
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseCollectEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseCollectEOService.java
new file mode 100644
index 000000000..63c116f63
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseCollectEOService.java
@@ -0,0 +1,61 @@
+package com.jero.modules.problemKnowledgeBase.service;
+
+import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseCollectEO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 问题知识库收藏表
+ * @Author: jero-boot
+ * @Date: 2022-08-03
+ * @Version: V1.0
+ */
+public interface IProblemKnowledgeBaseCollectEOService extends IService {
+
+ /**
+ * 保存
+ *
+ * @param problemKnowledgeBaseCollectEO
+ * @return
+ */
+ void add(ProblemKnowledgeBaseCollectEO problemKnowledgeBaseCollectEO);
+
+ /**
+ * 更新
+ *
+ * @param problemKnowledgeBaseCollectEO
+ * @return
+ */
+ void editById(ProblemKnowledgeBaseCollectEO problemKnowledgeBaseCollectEO);
+
+ /**
+ * 通过id删除
+ *
+ * @param id
+ * @return
+ */
+ void deleteById(String id);
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return
+ */
+ void deleteByIds(List ids);
+
+ /**
+ * 通过id查询
+ *
+ * @param id
+ * @return
+ */
+ ProblemKnowledgeBaseCollectEO queryById(String id);
+
+ /**
+ * 列表查询
+ *
+ * @return
+ */
+ List queryList();
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseCommentEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseCommentEOService.java
new file mode 100644
index 000000000..a3b779b5f
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseCommentEOService.java
@@ -0,0 +1,61 @@
+package com.jero.modules.problemKnowledgeBase.service;
+
+import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseCommentEO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 问题知识库评论表
+ * @Author: jero-boot
+ * @Date: 2022-08-03
+ * @Version: V1.0
+ */
+public interface IProblemKnowledgeBaseCommentEOService extends IService {
+
+ /**
+ * 保存
+ *
+ * @param problemKnowledgeBaseCommentEO
+ * @return
+ */
+ void add(ProblemKnowledgeBaseCommentEO problemKnowledgeBaseCommentEO);
+
+ /**
+ * 更新
+ *
+ * @param problemKnowledgeBaseCommentEO
+ * @return
+ */
+ void editById(ProblemKnowledgeBaseCommentEO problemKnowledgeBaseCommentEO);
+
+ /**
+ * 通过id删除
+ *
+ * @param id
+ * @return
+ */
+ void deleteById(String id);
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return
+ */
+ void deleteByIds(List ids);
+
+ /**
+ * 通过id查询
+ *
+ * @param id
+ * @return
+ */
+ ProblemKnowledgeBaseCommentEO queryById(String id);
+
+ /**
+ * 列表查询
+ *
+ * @return
+ */
+ List queryList();
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseEOService.java
new file mode 100644
index 000000000..426a968f0
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseEOService.java
@@ -0,0 +1,61 @@
+package com.jero.modules.problemKnowledgeBase.service;
+
+import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseEO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 问题知识库表
+ * @Author: jero-boot
+ * @Date: 2022-08-03
+ * @Version: V1.0
+ */
+public interface IProblemKnowledgeBaseEOService extends IService {
+
+ /**
+ * 保存
+ *
+ * @param problemKnowledgeBaseEO
+ * @return
+ */
+ void add(ProblemKnowledgeBaseEO problemKnowledgeBaseEO);
+
+ /**
+ * 更新
+ *
+ * @param problemKnowledgeBaseEO
+ * @return
+ */
+ void editById(ProblemKnowledgeBaseEO problemKnowledgeBaseEO);
+
+ /**
+ * 通过id删除
+ *
+ * @param id
+ * @return
+ */
+ void deleteById(String id);
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return
+ */
+ void deleteByIds(List ids);
+
+ /**
+ * 通过id查询
+ *
+ * @param id
+ * @return
+ */
+ ProblemKnowledgeBaseEO queryById(String id);
+
+ /**
+ * 列表查询
+ *
+ * @return
+ */
+ List queryList();
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBasePraiseEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBasePraiseEOService.java
new file mode 100644
index 000000000..1a396fd62
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBasePraiseEOService.java
@@ -0,0 +1,61 @@
+package com.jero.modules.problemKnowledgeBase.service;
+
+import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBasePraiseEO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 问题知识库点赞表
+ * @Author: jero-boot
+ * @Date: 2022-08-03
+ * @Version: V1.0
+ */
+public interface IProblemKnowledgeBasePraiseEOService extends IService {
+
+ /**
+ * 保存
+ *
+ * @param problemKnowledgeBasePraiseEO
+ * @return
+ */
+ void add(ProblemKnowledgeBasePraiseEO problemKnowledgeBasePraiseEO);
+
+ /**
+ * 更新
+ *
+ * @param problemKnowledgeBasePraiseEO
+ * @return
+ */
+ void editById(ProblemKnowledgeBasePraiseEO problemKnowledgeBasePraiseEO);
+
+ /**
+ * 通过id删除
+ *
+ * @param id
+ * @return
+ */
+ void deleteById(String id);
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return
+ */
+ void deleteByIds(List ids);
+
+ /**
+ * 通过id查询
+ *
+ * @param id
+ * @return
+ */
+ ProblemKnowledgeBasePraiseEO queryById(String id);
+
+ /**
+ * 列表查询
+ *
+ * @return
+ */
+ List queryList();
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseUserEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseUserEOService.java
new file mode 100644
index 000000000..6a1521524
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseUserEOService.java
@@ -0,0 +1,61 @@
+package com.jero.modules.problemKnowledgeBase.service;
+
+import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseUserEO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 问题知识库展示权限表
+ * @Author: jero-boot
+ * @Date: 2022-08-03
+ * @Version: V1.0
+ */
+public interface IProblemKnowledgeBaseUserEOService extends IService {
+
+ /**
+ * 保存
+ *
+ * @param problemKnowledgeBaseUserEO
+ * @return
+ */
+ void add(ProblemKnowledgeBaseUserEO problemKnowledgeBaseUserEO);
+
+ /**
+ * 更新
+ *
+ * @param problemKnowledgeBaseUserEO
+ * @return
+ */
+ void editById(ProblemKnowledgeBaseUserEO problemKnowledgeBaseUserEO);
+
+ /**
+ * 通过id删除
+ *
+ * @param id
+ * @return
+ */
+ void deleteById(String id);
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return
+ */
+ void deleteByIds(List ids);
+
+ /**
+ * 通过id查询
+ *
+ * @param id
+ * @return
+ */
+ ProblemKnowledgeBaseUserEO queryById(String id);
+
+ /**
+ * 列表查询
+ *
+ * @return
+ */
+ List queryList();
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseBrowsingHistoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseBrowsingHistoryEOServiceImpl.java
new file mode 100644
index 000000000..6d55d0538
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseBrowsingHistoryEOServiceImpl.java
@@ -0,0 +1,89 @@
+package com.jero.modules.problemKnowledgeBase.service.impl;
+
+import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseBrowsingHistoryEO;
+import com.jero.modules.problemKnowledgeBase.mapper.ProblemKnowledgeBaseBrowsingHistoryEOMapper;
+import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseBrowsingHistoryEOService;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Date;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 问题知识库浏览历史表
+ * @Author: jero-boot
+ * @Date: 2022-08-03
+ * @Version: V1.0
+ */
+@Service
+public class ProblemKnowledgeBaseBrowsingHistoryEOServiceImpl extends ServiceImpl implements IProblemKnowledgeBaseBrowsingHistoryEOService {
+
+ /**
+ * 保存
+ *
+ * @param problemKnowledgeBaseBrowsingHistoryEO
+ * @return
+ */
+ @Override
+ public void add(ProblemKnowledgeBaseBrowsingHistoryEO problemKnowledgeBaseBrowsingHistoryEO) {
+ Date now = new Date();
+ problemKnowledgeBaseBrowsingHistoryEO.setCreateTime(now);
+ problemKnowledgeBaseBrowsingHistoryEO.setUpdateTime(now);
+ save(problemKnowledgeBaseBrowsingHistoryEO);
+ }
+
+ /**
+ * 更新
+ *
+ * @param problemKnowledgeBaseBrowsingHistoryEO
+ * @return
+ */
+ @Override
+ public void editById(ProblemKnowledgeBaseBrowsingHistoryEO problemKnowledgeBaseBrowsingHistoryEO) {
+ Date now = new Date();
+ problemKnowledgeBaseBrowsingHistoryEO.setUpdateTime(now);
+ saveOrUpdate(problemKnowledgeBaseBrowsingHistoryEO);
+ }
+
+ /**
+ * 通过id删除
+ *
+ * @param id
+ * @return
+ */
+ @Override
+ public void deleteById(String id) {
+ removeById(id);
+ }
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return
+ */
+ @Override
+ public void deleteByIds(List ids) {
+ removeByIds(ids);
+ }
+
+ /**
+ * 通过id查询
+ *
+ * @param id
+ * @return
+ */
+ @Override
+ public ProblemKnowledgeBaseBrowsingHistoryEO queryById(String id) {
+ return getById(id);
+ }
+
+ /**
+ * 列表查询
+ *
+ * @return
+ */
+ @Override
+ public List queryList() {
+ return list();
+ }
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseClassifyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseClassifyEOServiceImpl.java
new file mode 100644
index 000000000..c1cf2e368
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseClassifyEOServiceImpl.java
@@ -0,0 +1,89 @@
+package com.jero.modules.problemKnowledgeBase.service.impl;
+
+import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseClassifyEO;
+import com.jero.modules.problemKnowledgeBase.mapper.ProblemKnowledgeBaseClassifyEOMapper;
+import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseClassifyEOService;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Date;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 问题知识库-分类表
+ * @Author: jero-boot
+ * @Date: 2022-08-03
+ * @Version: V1.0
+ */
+@Service
+public class ProblemKnowledgeBaseClassifyEOServiceImpl extends ServiceImpl implements IProblemKnowledgeBaseClassifyEOService {
+
+ /**
+ * 保存
+ *
+ * @param problemKnowledgeBaseClassifyEO
+ * @return
+ */
+ @Override
+ public void add(ProblemKnowledgeBaseClassifyEO problemKnowledgeBaseClassifyEO) {
+ Date now = new Date();
+ problemKnowledgeBaseClassifyEO.setCreateTime(now);
+ problemKnowledgeBaseClassifyEO.setUpdateTime(now);
+ save(problemKnowledgeBaseClassifyEO);
+ }
+
+ /**
+ * 更新
+ *
+ * @param problemKnowledgeBaseClassifyEO
+ * @return
+ */
+ @Override
+ public void editById(ProblemKnowledgeBaseClassifyEO problemKnowledgeBaseClassifyEO) {
+ Date now = new Date();
+ problemKnowledgeBaseClassifyEO.setUpdateTime(now);
+ saveOrUpdate(problemKnowledgeBaseClassifyEO);
+ }
+
+ /**
+ * 通过id删除
+ *
+ * @param id
+ * @return
+ */
+ @Override
+ public void deleteById(String id) {
+ removeById(id);
+ }
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return
+ */
+ @Override
+ public void deleteByIds(List ids) {
+ removeByIds(ids);
+ }
+
+ /**
+ * 通过id查询
+ *
+ * @param id
+ * @return
+ */
+ @Override
+ public ProblemKnowledgeBaseClassifyEO queryById(String id) {
+ return getById(id);
+ }
+
+ /**
+ * 列表查询
+ *
+ * @return
+ */
+ @Override
+ public List queryList() {
+ return list();
+ }
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseCollectEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseCollectEOServiceImpl.java
new file mode 100644
index 000000000..bd7d2d498
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseCollectEOServiceImpl.java
@@ -0,0 +1,89 @@
+package com.jero.modules.problemKnowledgeBase.service.impl;
+
+import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseCollectEO;
+import com.jero.modules.problemKnowledgeBase.mapper.ProblemKnowledgeBaseCollectEOMapper;
+import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseCollectEOService;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Date;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 问题知识库收藏表
+ * @Author: jero-boot
+ * @Date: 2022-08-03
+ * @Version: V1.0
+ */
+@Service
+public class ProblemKnowledgeBaseCollectEOServiceImpl extends ServiceImpl implements IProblemKnowledgeBaseCollectEOService {
+
+ /**
+ * 保存
+ *
+ * @param problemKnowledgeBaseCollectEO
+ * @return
+ */
+ @Override
+ public void add(ProblemKnowledgeBaseCollectEO problemKnowledgeBaseCollectEO) {
+ Date now = new Date();
+ problemKnowledgeBaseCollectEO.setCreateTime(now);
+ problemKnowledgeBaseCollectEO.setUpdateTime(now);
+ save(problemKnowledgeBaseCollectEO);
+ }
+
+ /**
+ * 更新
+ *
+ * @param problemKnowledgeBaseCollectEO
+ * @return
+ */
+ @Override
+ public void editById(ProblemKnowledgeBaseCollectEO problemKnowledgeBaseCollectEO) {
+ Date now = new Date();
+ problemKnowledgeBaseCollectEO.setUpdateTime(now);
+ saveOrUpdate(problemKnowledgeBaseCollectEO);
+ }
+
+ /**
+ * 通过id删除
+ *
+ * @param id
+ * @return
+ */
+ @Override
+ public void deleteById(String id) {
+ removeById(id);
+ }
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return
+ */
+ @Override
+ public void deleteByIds(List ids) {
+ removeByIds(ids);
+ }
+
+ /**
+ * 通过id查询
+ *
+ * @param id
+ * @return
+ */
+ @Override
+ public ProblemKnowledgeBaseCollectEO queryById(String id) {
+ return getById(id);
+ }
+
+ /**
+ * 列表查询
+ *
+ * @return
+ */
+ @Override
+ public List queryList() {
+ return list();
+ }
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseCommentEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseCommentEOServiceImpl.java
new file mode 100644
index 000000000..d2c6bb916
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseCommentEOServiceImpl.java
@@ -0,0 +1,89 @@
+package com.jero.modules.problemKnowledgeBase.service.impl;
+
+import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseCommentEO;
+import com.jero.modules.problemKnowledgeBase.mapper.ProblemKnowledgeBaseCommentEOMapper;
+import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseCommentEOService;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Date;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 问题知识库评论表
+ * @Author: jero-boot
+ * @Date: 2022-08-03
+ * @Version: V1.0
+ */
+@Service
+public class ProblemKnowledgeBaseCommentEOServiceImpl extends ServiceImpl implements IProblemKnowledgeBaseCommentEOService {
+
+ /**
+ * 保存
+ *
+ * @param problemKnowledgeBaseCommentEO
+ * @return
+ */
+ @Override
+ public void add(ProblemKnowledgeBaseCommentEO problemKnowledgeBaseCommentEO) {
+ Date now = new Date();
+ problemKnowledgeBaseCommentEO.setCreateTime(now);
+ problemKnowledgeBaseCommentEO.setUpdateTime(now);
+ save(problemKnowledgeBaseCommentEO);
+ }
+
+ /**
+ * 更新
+ *
+ * @param problemKnowledgeBaseCommentEO
+ * @return
+ */
+ @Override
+ public void editById(ProblemKnowledgeBaseCommentEO problemKnowledgeBaseCommentEO) {
+ Date now = new Date();
+ problemKnowledgeBaseCommentEO.setUpdateTime(now);
+ saveOrUpdate(problemKnowledgeBaseCommentEO);
+ }
+
+ /**
+ * 通过id删除
+ *
+ * @param id
+ * @return
+ */
+ @Override
+ public void deleteById(String id) {
+ removeById(id);
+ }
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return
+ */
+ @Override
+ public void deleteByIds(List ids) {
+ removeByIds(ids);
+ }
+
+ /**
+ * 通过id查询
+ *
+ * @param id
+ * @return
+ */
+ @Override
+ public ProblemKnowledgeBaseCommentEO queryById(String id) {
+ return getById(id);
+ }
+
+ /**
+ * 列表查询
+ *
+ * @return
+ */
+ @Override
+ public List queryList() {
+ return list();
+ }
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
new file mode 100644
index 000000000..d403edede
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
@@ -0,0 +1,89 @@
+package com.jero.modules.problemKnowledgeBase.service.impl;
+
+import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseEO;
+import com.jero.modules.problemKnowledgeBase.mapper.ProblemKnowledgeBaseEOMapper;
+import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseEOService;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Date;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 问题知识库表
+ * @Author: jero-boot
+ * @Date: 2022-08-03
+ * @Version: V1.0
+ */
+@Service
+public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl implements IProblemKnowledgeBaseEOService {
+
+ /**
+ * 保存
+ *
+ * @param problemKnowledgeBaseEO
+ * @return
+ */
+ @Override
+ public void add(ProblemKnowledgeBaseEO problemKnowledgeBaseEO) {
+ Date now = new Date();
+ problemKnowledgeBaseEO.setCreateTime(now);
+ problemKnowledgeBaseEO.setUpdateTime(now);
+ save(problemKnowledgeBaseEO);
+ }
+
+ /**
+ * 更新
+ *
+ * @param problemKnowledgeBaseEO
+ * @return
+ */
+ @Override
+ public void editById(ProblemKnowledgeBaseEO problemKnowledgeBaseEO) {
+ Date now = new Date();
+ problemKnowledgeBaseEO.setUpdateTime(now);
+ saveOrUpdate(problemKnowledgeBaseEO);
+ }
+
+ /**
+ * 通过id删除
+ *
+ * @param id
+ * @return
+ */
+ @Override
+ public void deleteById(String id) {
+ removeById(id);
+ }
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return
+ */
+ @Override
+ public void deleteByIds(List ids) {
+ removeByIds(ids);
+ }
+
+ /**
+ * 通过id查询
+ *
+ * @param id
+ * @return
+ */
+ @Override
+ public ProblemKnowledgeBaseEO queryById(String id) {
+ return getById(id);
+ }
+
+ /**
+ * 列表查询
+ *
+ * @return
+ */
+ @Override
+ public List queryList() {
+ return list();
+ }
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBasePraiseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBasePraiseEOServiceImpl.java
new file mode 100644
index 000000000..eebb73dd2
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBasePraiseEOServiceImpl.java
@@ -0,0 +1,89 @@
+package com.jero.modules.problemKnowledgeBase.service.impl;
+
+import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBasePraiseEO;
+import com.jero.modules.problemKnowledgeBase.mapper.ProblemKnowledgeBasePraiseEOMapper;
+import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBasePraiseEOService;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Date;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 问题知识库点赞表
+ * @Author: jero-boot
+ * @Date: 2022-08-03
+ * @Version: V1.0
+ */
+@Service
+public class ProblemKnowledgeBasePraiseEOServiceImpl extends ServiceImpl implements IProblemKnowledgeBasePraiseEOService {
+
+ /**
+ * 保存
+ *
+ * @param problemKnowledgeBasePraiseEO
+ * @return
+ */
+ @Override
+ public void add(ProblemKnowledgeBasePraiseEO problemKnowledgeBasePraiseEO) {
+ Date now = new Date();
+ problemKnowledgeBasePraiseEO.setCreateTime(now);
+ problemKnowledgeBasePraiseEO.setUpdateTime(now);
+ save(problemKnowledgeBasePraiseEO);
+ }
+
+ /**
+ * 更新
+ *
+ * @param problemKnowledgeBasePraiseEO
+ * @return
+ */
+ @Override
+ public void editById(ProblemKnowledgeBasePraiseEO problemKnowledgeBasePraiseEO) {
+ Date now = new Date();
+ problemKnowledgeBasePraiseEO.setUpdateTime(now);
+ saveOrUpdate(problemKnowledgeBasePraiseEO);
+ }
+
+ /**
+ * 通过id删除
+ *
+ * @param id
+ * @return
+ */
+ @Override
+ public void deleteById(String id) {
+ removeById(id);
+ }
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return
+ */
+ @Override
+ public void deleteByIds(List ids) {
+ removeByIds(ids);
+ }
+
+ /**
+ * 通过id查询
+ *
+ * @param id
+ * @return
+ */
+ @Override
+ public ProblemKnowledgeBasePraiseEO queryById(String id) {
+ return getById(id);
+ }
+
+ /**
+ * 列表查询
+ *
+ * @return
+ */
+ @Override
+ public List queryList() {
+ return list();
+ }
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseUserEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseUserEOServiceImpl.java
new file mode 100644
index 000000000..6d34b12f7
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseUserEOServiceImpl.java
@@ -0,0 +1,89 @@
+package com.jero.modules.problemKnowledgeBase.service.impl;
+
+import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseUserEO;
+import com.jero.modules.problemKnowledgeBase.mapper.ProblemKnowledgeBaseUserEOMapper;
+import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseUserEOService;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Date;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 问题知识库展示权限表
+ * @Author: jero-boot
+ * @Date: 2022-08-03
+ * @Version: V1.0
+ */
+@Service
+public class ProblemKnowledgeBaseUserEOServiceImpl extends ServiceImpl implements IProblemKnowledgeBaseUserEOService {
+
+ /**
+ * 保存
+ *
+ * @param problemKnowledgeBaseUserEO
+ * @return
+ */
+ @Override
+ public void add(ProblemKnowledgeBaseUserEO problemKnowledgeBaseUserEO) {
+ Date now = new Date();
+ problemKnowledgeBaseUserEO.setCreateTime(now);
+ problemKnowledgeBaseUserEO.setUpdateTime(now);
+ save(problemKnowledgeBaseUserEO);
+ }
+
+ /**
+ * 更新
+ *
+ * @param problemKnowledgeBaseUserEO
+ * @return
+ */
+ @Override
+ public void editById(ProblemKnowledgeBaseUserEO problemKnowledgeBaseUserEO) {
+ Date now = new Date();
+ problemKnowledgeBaseUserEO.setUpdateTime(now);
+ saveOrUpdate(problemKnowledgeBaseUserEO);
+ }
+
+ /**
+ * 通过id删除
+ *
+ * @param id
+ * @return
+ */
+ @Override
+ public void deleteById(String id) {
+ removeById(id);
+ }
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return
+ */
+ @Override
+ public void deleteByIds(List ids) {
+ removeByIds(ids);
+ }
+
+ /**
+ * 通过id查询
+ *
+ * @param id
+ * @return
+ */
+ @Override
+ public ProblemKnowledgeBaseUserEO queryById(String id) {
+ return getById(id);
+ }
+
+ /**
+ * 列表查询
+ *
+ * @return
+ */
+ @Override
+ public List queryList() {
+ return list();
+ }
+}
From 21ce2d47905ed8649c892c86b2fd436bca123b92 Mon Sep 17 00:00:00 2001
From: "zyx.net"
Date: Thu, 4 Aug 2022 09:26:56 +0800
Subject: [PATCH 20/54] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=B9=E6=94=B6?=
=?UTF-8?q?=E9=9B=86=E6=B8=85=E5=8D=95=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../managementdetails/commponts/conventionalmodle.vue | 5 +++++
.../components/ParameterItemCollectionList.vue | 3 ++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue
index f255960da..046a35993 100644
--- a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue
+++ b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue
@@ -166,6 +166,11 @@ export default {
},
mounted() {
this.getNameList()
+ if(this.formInline.combineFlag == '1'){
+ this.required = false
+ }else{
+ this.required = true
+ }
},
methods: {
uploadSuccess(data) {
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index fc24c69e0..0ff67a9de 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -1546,7 +1546,8 @@
},
handleDel() {
let param = {
- ids: this.selectedRowKeysArray
+ ids: this.selectedRowKeysArray,
+ paramsManifestId:this.$route.query.id
}
if (this.selectedRowKeys.length > 0) {
let _this = this
From c81bea2dea0700b6210af0264bc116b19941697a Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 4 Aug 2022 09:33:46 +0800
Subject: [PATCH 21/54] =?UTF-8?q?=E5=B8=83=E5=B1=80=E7=9F=A5=E8=AF=86?=
=?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/countryCardReleaseModelAdd.vue | 213 +++++++++--------
.../components/optionMaintenance.vue | 203 +++++++++++++++++
.../components/optionMaintenanceAdd.vue | 215 ++++++++++++++++++
3 files changed, 530 insertions(+), 101 deletions(-)
create mode 100644 jero-web/src/views/businessSupport/problemKnowledgeBase/components/optionMaintenance.vue
create mode 100644 jero-web/src/views/businessSupport/problemKnowledgeBase/components/optionMaintenanceAdd.vue
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModelAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModelAdd.vue
index a4e39ccb8..3edf87f98 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModelAdd.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModelAdd.vue
@@ -1,122 +1,130 @@
-
-
-
-
-
+
+
@@ -66,11 +140,6 @@
}
}
- .content-box {
- padding: 0 32px;
- box-sizing: border-box;
- }
-
.header-text {
font-size: 16px;
font-weight: 400;
@@ -85,4 +154,110 @@
}
}
}
+
+ .box-content-right {
+ width: 100%;
+ text-align: right;
+ margin-bottom: 20px;
+ }
+
+ .operator-text {
+ cursor: pointer;
+ margin-right: 53px;
+ font-size: 14px;
+ font-weight: 400;
+ color: #040B29;
+ display: inline-block;
+ }
+
+ .operator-text:last-child {
+ margin-right: 13px;
+ }
+
+ .content-box {
+ overflow: auto;
+ white-space: nowrap;
+ position: relative;
+ }
+
+ .content-box-left {
+ width: 200px;
+ background: #fff;
+ z-index: 111;
+ display: inline-block;
+ position: sticky;
+ left: 0;
+ border-top: 1px #d9d9d9 solid;
+ border-left: 1px #d9d9d9 solid;
+ border-bottom: 1px #d9d9d9 solid;
+ border-right: 1px #d9d9d9 solid;
+ }
+
+ .content-box-left-text {
+ font-size: 16px;
+ color: #040B29;
+ font-weight: 400;
+ text-align: center;
+ border-bottom: 1px #d9d9d9 solid;
+ height: 80px;
+ line-height: 80px;
+ }
+
+ .content-box-left-text:last-child {
+ border-bottom: none;
+ }
+
+ .content-box-box-top {
+ width: 340px;
+ height: 160px;
+ display: inline-block;
+ cursor: pointer;
+ border-left: 1px #d9d9d9 solid;
+ border-top: 1px #d9d9d9 solid;
+ border-right: 1px #d9d9d9 solid;
+ border-bottom: 1px #d9d9d9 solid;
+ position: sticky;
+ top: 0;
+ z-index: 111;
+ background: #fff;
+ }
+
+ .content-box-right {
+ width: 339px;
+ position: relative;
+ display: inline-block;
+ border-top: 1px #d9d9d9 solid;
+ border-right: 1px #d9d9d9 solid;
+ border-bottom: 1px #d9d9d9 solid;
+ }
+
+ .content-box-right:last-child {
+ border-right: 1px #d9d9d9 solid;
+ }
+
+ .content-box-box-img {
+ width: 70%;
+ height: 100%;
+ }
+
+ .content-box-box-text {
+ display: inline-block;
+ width: 30%;
+ text-align: center;
+ font-size: 18px;
+ font-weight: 500;
+ color: #040B29;
+ }
+
+ .content-box-box {
+ width: 100%;
+ height: 80px;
+ border-bottom: 1px #d9d9d9 solid;
+ cursor: pointer;
+ }
+
+ .content-box-box:last-child {
+ border-bottom: none;
+ }
+
\ No newline at end of file
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue
new file mode 100644
index 000000000..baae325aa
--- /dev/null
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue
@@ -0,0 +1,156 @@
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+ hadhasdasdhadashdjk
+
+
+ hadhasdasdhadashdjk
+
+
+ hadhasdasdhadashdjk
+
+
+ hadhasdasdhadashdjk
+
+
+ hadhasdasdhadashdjk
+
+
+ hadhasdasdhadashdjk
+
+
+ hadhasdasdhadashdjk
+
+
+ hadhasdasdhadashdjk
+
+
+ hadhasdasdhadashdjk
+
+
+
+
+ 
+
+ 中国
+
+
+
+
+ 中国
+
+
+
+
+ 中国
+
+
+
+
+ 中国
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
From 6e9e8a9ae4299a8097c6b23573592d4bfd2a7c3f Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Wed, 3 Aug 2022 18:15:09 +0800
Subject: [PATCH 19/54] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=9F=A5=E8=AF=86?=
=?UTF-8?q?=E5=BA=93=E6=A8=A1=E5=9D=97=E5=BC=80=E5=8F=91=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jero-boot/db/蔚来标准sql/dev_third_record.sql | 156 +++++++++++++---
...wledgeBaseBrowsingHistoryEOController.java | 170 ++++++++++++++++++
...blemKnowledgeBaseClassifyEOController.java | 170 ++++++++++++++++++
...oblemKnowledgeBaseCollectEOController.java | 170 ++++++++++++++++++
...oblemKnowledgeBaseCommentEOController.java | 170 ++++++++++++++++++
.../ProblemKnowledgeBaseEOController.java | 170 ++++++++++++++++++
...roblemKnowledgeBasePraiseEOController.java | 170 ++++++++++++++++++
.../ProblemKnowledgeBaseUserEOController.java | 170 ++++++++++++++++++
...ProblemKnowledgeBaseBrowsingHistoryEO.java | 74 ++++++++
.../ProblemKnowledgeBaseClassifyEO.java | 74 ++++++++
.../entity/ProblemKnowledgeBaseCollectEO.java | 79 ++++++++
.../entity/ProblemKnowledgeBaseCommentEO.java | 79 ++++++++
.../entity/ProblemKnowledgeBaseEO.java | 143 +++++++++++++++
.../entity/ProblemKnowledgeBasePraiseEO.java | 79 ++++++++
.../entity/ProblemKnowledgeBaseUserEO.java | 74 ++++++++
...mKnowledgeBaseBrowsingHistoryEOMapper.java | 17 ++
.../ProblemKnowledgeBaseClassifyEOMapper.java | 17 ++
.../ProblemKnowledgeBaseCollectEOMapper.java | 17 ++
.../ProblemKnowledgeBaseCommentEOMapper.java | 17 ++
.../mapper/ProblemKnowledgeBaseEOMapper.java | 17 ++
.../ProblemKnowledgeBasePraiseEOMapper.java | 17 ++
.../ProblemKnowledgeBaseUserEOMapper.java | 17 ++
...emKnowledgeBaseBrowsingHistoryEOMapper.xml | 14 ++
.../ProblemKnowledgeBaseClassifyEOMapper.xml | 14 ++
.../ProblemKnowledgeBaseCollectEOMapper.xml | 15 ++
.../ProblemKnowledgeBaseCommentEOMapper.xml | 15 ++
.../xml/ProblemKnowledgeBaseEOMapper.xml | 23 +++
.../ProblemKnowledgeBasePraiseEOMapper.xml | 15 ++
.../xml/ProblemKnowledgeBaseUserEOMapper.xml | 14 ++
...KnowledgeBaseBrowsingHistoryEOService.java | 61 +++++++
...ProblemKnowledgeBaseClassifyEOService.java | 61 +++++++
...IProblemKnowledgeBaseCollectEOService.java | 61 +++++++
...IProblemKnowledgeBaseCommentEOService.java | 61 +++++++
.../IProblemKnowledgeBaseEOService.java | 61 +++++++
.../IProblemKnowledgeBasePraiseEOService.java | 61 +++++++
.../IProblemKnowledgeBaseUserEOService.java | 61 +++++++
...ledgeBaseBrowsingHistoryEOServiceImpl.java | 89 +++++++++
...lemKnowledgeBaseClassifyEOServiceImpl.java | 89 +++++++++
...blemKnowledgeBaseCollectEOServiceImpl.java | 89 +++++++++
...blemKnowledgeBaseCommentEOServiceImpl.java | 89 +++++++++
.../ProblemKnowledgeBaseEOServiceImpl.java | 89 +++++++++
...oblemKnowledgeBasePraiseEOServiceImpl.java | 89 +++++++++
...ProblemKnowledgeBaseUserEOServiceImpl.java | 89 +++++++++
43 files changed, 3201 insertions(+), 26 deletions(-)
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseBrowsingHistoryEOController.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseClassifyEOController.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseCollectEOController.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseCommentEOController.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseEOController.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBasePraiseEOController.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseUserEOController.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseBrowsingHistoryEO.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseClassifyEO.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseCollectEO.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseCommentEO.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBasePraiseEO.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseUserEO.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseBrowsingHistoryEOMapper.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseClassifyEOMapper.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseCollectEOMapper.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseCommentEOMapper.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseEOMapper.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBasePraiseEOMapper.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/ProblemKnowledgeBaseUserEOMapper.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseBrowsingHistoryEOMapper.xml
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseClassifyEOMapper.xml
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseCollectEOMapper.xml
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseCommentEOMapper.xml
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseEOMapper.xml
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBasePraiseEOMapper.xml
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/ProblemKnowledgeBaseUserEOMapper.xml
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseBrowsingHistoryEOService.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseClassifyEOService.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseCollectEOService.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseCommentEOService.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseEOService.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBasePraiseEOService.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseUserEOService.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseBrowsingHistoryEOServiceImpl.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseClassifyEOServiceImpl.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseCollectEOServiceImpl.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseCommentEOServiceImpl.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBasePraiseEOServiceImpl.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseUserEOServiceImpl.java
diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index d6ea92209..f20a9f262 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -558,33 +558,137 @@ WHERE `id` = '7b8ef9f8da124ed93e5c10a14b903390';
-- 问题知识库开发。
-- Country Card模板维护表 2022-08-02
CREATE TABLE `laws_weilai`.`country_card_temp` (
- `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
- `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
- `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期',
- `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
- `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期',
- `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门',
- `lable_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称',
- `lable_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签类型',
- `order_num` int(11) NULL DEFAULT NULL COMMENT '展示顺序',
- `relevant_url` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '关联网址',
- `description` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述',
- PRIMARY KEY (`id`) USING BTREE
+ `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+ `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
+ `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期',
+ `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
+ `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期',
+ `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门',
+ `lable_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称',
+ `lable_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签类型',
+ `order_num` int(11) NULL DEFAULT NULL COMMENT '展示顺序',
+ `relevant_url` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '关联网址',
+ `description` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述',
+ PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = 'Country Card模板维护表' ROW_FORMAT = Dynamic;
+
-- Country Card模板维护-字典项表 2022-08-02
CREATE TABLE `laws_weilai`.`country_card_temp_item` (
- `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
- `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
- `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期',
- `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
- `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期',
- `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门',
- `country_card_temp_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '模板维护表id',
- `item_value` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '字典项值',
- `item_text` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '字典项中文名称',
- `en_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '字典项英文名称',
- `del_flag` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '逻辑删除标识',
- `status` varchar(2) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '状态（1启用 0不启用）',
- `description` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述',
- PRIMARY KEY (`id`) USING BTREE
+ `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+ `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
+ `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期',
+ `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
+ `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期',
+ `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门',
+ `country_card_temp_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '模板维护表id',
+ `item_value` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '字典项值',
+ `item_text` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '字典项中文名称',
+ `en_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '字典项英文名称',
+ `del_flag` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '逻辑删除标识',
+ `status` varchar(2) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '状态（1启用 0不启用）',
+ `description` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述',
+ PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = 'Country Card模板维护-字典项表' ROW_FORMAT = Dynamic;
+
+-- 问题知识库-分类表 2022-08-03
+CREATE TABLE `laws_weilai`.`problem_knowledge_base_classify` (
+ `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+ `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
+ `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期',
+ `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
+ `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期',
+ `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门',
+ `problem_label` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '问题标签',
+ `charge_person_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '负责人id',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '问题知识库-分类表' ROW_FORMAT = Dynamic;
+
+-- 问题知识库表 2022-08-03
+CREATE TABLE `laws_weilai`.`problem_knowledge_base` (
+ `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键',
+ `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
+ `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期',
+ `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
+ `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期',
+ `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门',
+ `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标题',
+ `problem_type` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '问题分类',
+ `target_market` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '市场',
+ `buss_document_library_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文档库id',
+ `stand_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标准编号',
+ `stand_title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标准标题',
+ `content` blob NULL COMMENT '内容（正文）',
+ `accessory_file` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '附件',
+ `show_permissions` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '展示权限',
+ `release_user_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发布人id',
+ `release_time` datetime NULL DEFAULT NULL COMMENT '发布日期',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '问题知识库表' ROW_FORMAT = Dynamic;
+
+-- 问题知识库展示权限表 2022-08-03
+CREATE TABLE `laws_weilai`.`problem_knowledge_base_user` (
+ `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+ `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
+ `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期',
+ `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
+ `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期',
+ `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门',
+ `problem_knowledge_base_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '问题知识库id',
+ `user_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '用户id',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '问题知识库展示权限表' ROW_FORMAT = Dynamic;
+
+-- 问题知识库评论表 2022-08-03
+CREATE TABLE `laws_weilai`.`problem_knowledge_base_comment` (
+ `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+ `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
+ `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期',
+ `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
+ `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期',
+ `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门',
+ `problem_knowledge_base_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '问题知识库id',
+ `comment_content` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '评论内容',
+ `comment_user_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '评论用户id',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '问题知识库评论表' ROW_FORMAT = Dynamic;
+
+-- 问题知识库浏览历史表 2022-08-03
+CREATE TABLE `laws_weilai`.`problem_knowledge_base_browsing_history` (
+ `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+ `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
+ `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期',
+ `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
+ `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期',
+ `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门',
+ `problem_knowledge_base_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '问题知识库id',
+ `browsing_user_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '浏览人员id',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '问题知识库浏览历史表' ROW_FORMAT = Dynamic;
+
+-- 问题知识库点赞表 2022-08-03
+CREATE TABLE `laws_weilai`.`problem_knowledge_base_praise` (
+ `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+ `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
+ `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期',
+ `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
+ `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期',
+ `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门',
+ `problem_knowledge_base_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '问题知识库id',
+ `praise_user_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '点赞人员id',
+ `praise_status` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '点赞状态',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '问题知识库点赞表' ROW_FORMAT = Dynamic;
+
+-- 问题知识库收藏表 2022-08-03
+CREATE TABLE `laws_weilai`.`problem_knowledge_base_collect` (
+ `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+ `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
+ `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期',
+ `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
+ `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期',
+ `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门',
+ `problem_knowledge_base_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '问题知识库id',
+ `collect_user_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收藏用户id',
+ `collect_status` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收藏状态',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '问题知识库收藏表' ROW_FORMAT = Dynamic;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseBrowsingHistoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseBrowsingHistoryEOController.java
new file mode 100644
index 000000000..f23c69ac0
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseBrowsingHistoryEOController.java
@@ -0,0 +1,170 @@
+package com.jero.modules.problemKnowledgeBase.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.jero.common.api.vo.Result;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseBrowsingHistoryEO;
+import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseBrowsingHistoryEOService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import com.jero.common.system.base.controller.JeroController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.jero.common.aspect.annotation.AutoLog;
+
+
+ /**
+ * @Description: 问题知识库浏览历史表
+ * @Author: jero-boot
+ * @Date: 2022-08-03
+ * @Version: V1.0
+ */
+@Api(tags="问题知识库浏览历史表")
+@RestController
+@RequestMapping("/problemKnowledgeBase/problemKnowledgeBaseBrowsingHistoryEO")
+@Slf4j
+public class ProblemKnowledgeBaseBrowsingHistoryEOController extends JeroController
+
+
+
+
+
+
+
+
-
+
@@ -1555,40 +1564,21 @@
if (this.selectedRowKeys.length > 0) {
let _this = this
this.$confirm({
- content: _this.$t('ConfirmBatchDeletion'),
+ content: this.$t('ConfirmBatchDeletion'),
onOk() {
_this.textLoading = true
- axios({
- url: '/jero-boot/params/collectManifest/deleteBatch',
- method: 'post',
- data: param,
- transformRequest: [function(data) {
- let ret = ''
- for (let it in data) {
- ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
- }
- return ret
- }],
- headers: {
- 'Content-Type': 'application/x-www-form-urlencoded',
- 'X-Access-Token': _this.token
+ postAction('/params/collectManifest/deleteBatch', param).then((res) => {
+ if (res.success) {
+ _this.$message.success(_this.$t('OperationSuccessful'))
+ _this.selectedRowKeys = []
+ console.log(111)
+ _this.$refs.CollectionTabel.getTableList(_this.queryParamQuery)
+ _this.textLoading = false
+ } else {
+ _this.textLoading = false
+ _this.$message.warning(this.$t('operationFailed'))
}
})
- .then((res) => {
- if (res.data.success) {
- _this.$message.success(_this.$t('OperationSuccessful'))
- _this.selectedRowKeys = []
- // _this.$refs.CollectionTabel.getData()
- _this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
- _this.textLoading = false
- } else {
- _this.textLoading = false
- _this.$message.warning(_this.$t('operationFailed'))
- }
- })
- .catch((error) => {
- _this.textLoading = false
- })
}
})
} else {
From af38e769be4084c51e5bf5c30337d1b314a9a23e Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 4 Aug 2022 15:59:28 +0800
Subject: [PATCH 36/54] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=A1=AB=E5=86=99--?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../LawsMonthlyReportWriteEOServiceImpl.java | 7 +-
.../jero/modules/report/util/WordUtil.java | 94 +++++++++++++++++++
2 files changed, 100 insertions(+), 1 deletion(-)
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java
index 8a2229740..6a484cceb 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java
@@ -261,6 +261,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl queryWrapper = QueryGenerator.initQueryWrapper(lawsMonthlyReportWriteEOTemp, req.getParameterMap());
+ queryWrapper.orderByDesc("create_time");
Page page = new Page(pageNo, pageSize);
Page pageInfo = this.page(page, queryWrapper);
//法规月报id
@@ -522,6 +523,8 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl
Date: Thu, 4 Aug 2022 16:00:08 +0800
Subject: [PATCH 37/54] =?UTF-8?q?=E4=B8=8B=E5=8F=91=E6=94=B6=E9=9B=86?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0loding?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jero-web/src/components/TaskCutOffTime/index.vue | 4 ++++
jero-web/src/components/TaskCutOffTime/indexonekey.vue | 3 +++
2 files changed, 7 insertions(+)
diff --git a/jero-web/src/components/TaskCutOffTime/index.vue b/jero-web/src/components/TaskCutOffTime/index.vue
index c8f892d6d..30a85b887 100644
--- a/jero-web/src/components/TaskCutOffTime/index.vue
+++ b/jero-web/src/components/TaskCutOffTime/index.vue
@@ -68,6 +68,7 @@
- *
- {{$t('LabelName')}}
+
-
-
Date: Thu, 4 Aug 2022 10:48:33 +0800
Subject: [PATCH 26/54] =?UTF-8?q?sql=E6=96=87=E4=BB=B6=E5=90=8C=E6=AD=A5?=
=?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jero-boot/db/蔚来标准sql/dev_third_record.sql | 22 +++++++++----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index f20a9f262..a9796bcde 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -495,7 +495,7 @@ ALTER TABLE `laws_weilai`.`doc_translation`
ADD COLUMN `serial_number` varchar(255) NULL COMMENT '编号' AFTER `buss_document_library_id`,
ADD COLUMN `title` varchar(255) NULL COMMENT '标题' AFTER `serial_number`;
--- 菜单管理 添加上报库按钮 2022-07-28
+-- 菜单管理 添加上报库按钮 2022-07-28 已同步生产环境
INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1552487817415819266', '1552487412749369345', '自定义导出', NULL, NULL, NULL, NULL, 2, 'report:detail:export:custom', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-07-28 10:55:14', NULL, NULL, 0, 0, '1', 0, 'Custom Export');
INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1552487616038895618', '1552487412749369345', '常规导出', NULL, NULL, NULL, NULL, 2, 'report:detail:export:normal', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-07-28 10:54:26', NULL, NULL, 0, 0, '1', 0, 'Normal Export');
INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1552487412749369345', '1539429224550457346', '查看', NULL, NULL, NULL, NULL, 2, 'report:detail:list', '1', 1.00, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2022-07-28 10:53:38', NULL, NULL, 0, 0, '1', 0, 'Detail');
@@ -550,13 +550,13 @@ CREATE TABLE `ext_repo_data` (
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
--- 参数项收集清单 认证类别取消列表显示 2022-08-02
+-- 参数项收集清单 认证类别取消列表显示 2022-08-02 已同步生产环境
UPDATE `laws_weilai`.`onl_cgform_field`
SET `is_show_list` = 0, `update_by` = 'admin', `update_time` = '2022-08-02 09:36:09'
WHERE `id` = '7b8ef9f8da124ed93e5c10a14b903390';
-- 问题知识库开发。
--- Country Card模板维护表 2022-08-02
+-- Country Card模板维护表 2022-08-02 已同步生产环境
CREATE TABLE `laws_weilai`.`country_card_temp` (
`id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
@@ -572,7 +572,7 @@ CREATE TABLE `laws_weilai`.`country_card_temp` (
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = 'Country Card模板维护表' ROW_FORMAT = Dynamic;
--- Country Card模板维护-字典项表 2022-08-02
+-- Country Card模板维护-字典项表 2022-08-02 已同步生产环境
CREATE TABLE `laws_weilai`.`country_card_temp_item` (
`id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
@@ -590,7 +590,7 @@ CREATE TABLE `laws_weilai`.`country_card_temp_item` (
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = 'Country Card模板维护-字典项表' ROW_FORMAT = Dynamic;
--- 问题知识库-分类表 2022-08-03
+-- 问题知识库-分类表 2022-08-03 已同步生产环境
CREATE TABLE `laws_weilai`.`problem_knowledge_base_classify` (
`id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
@@ -603,7 +603,7 @@ CREATE TABLE `laws_weilai`.`problem_knowledge_base_classify` (
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '问题知识库-分类表' ROW_FORMAT = Dynamic;
--- 问题知识库表 2022-08-03
+-- 问题知识库表 2022-08-03 已同步生产环境
CREATE TABLE `laws_weilai`.`problem_knowledge_base` (
`id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键',
`create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
@@ -625,7 +625,7 @@ CREATE TABLE `laws_weilai`.`problem_knowledge_base` (
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '问题知识库表' ROW_FORMAT = Dynamic;
--- 问题知识库展示权限表 2022-08-03
+-- 问题知识库展示权限表 2022-08-03 已同步生产环境
CREATE TABLE `laws_weilai`.`problem_knowledge_base_user` (
`id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
@@ -638,7 +638,7 @@ CREATE TABLE `laws_weilai`.`problem_knowledge_base_user` (
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '问题知识库展示权限表' ROW_FORMAT = Dynamic;
--- 问题知识库评论表 2022-08-03
+-- 问题知识库评论表 2022-08-03 已同步生产环境
CREATE TABLE `laws_weilai`.`problem_knowledge_base_comment` (
`id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
@@ -652,7 +652,7 @@ CREATE TABLE `laws_weilai`.`problem_knowledge_base_comment` (
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '问题知识库评论表' ROW_FORMAT = Dynamic;
--- 问题知识库浏览历史表 2022-08-03
+-- 问题知识库浏览历史表 2022-08-03 已同步生产环境
CREATE TABLE `laws_weilai`.`problem_knowledge_base_browsing_history` (
`id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
@@ -665,7 +665,7 @@ CREATE TABLE `laws_weilai`.`problem_knowledge_base_browsing_history` (
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '问题知识库浏览历史表' ROW_FORMAT = Dynamic;
--- 问题知识库点赞表 2022-08-03
+-- 问题知识库点赞表 2022-08-03 已同步生产环境
CREATE TABLE `laws_weilai`.`problem_knowledge_base_praise` (
`id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
@@ -679,7 +679,7 @@ CREATE TABLE `laws_weilai`.`problem_knowledge_base_praise` (
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '问题知识库点赞表' ROW_FORMAT = Dynamic;
--- 问题知识库收藏表 2022-08-03
+-- 问题知识库收藏表 2022-08-03 已同步生产环境
CREATE TABLE `laws_weilai`.`problem_knowledge_base_collect` (
`id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
From b6e70054b80d2033ce825441cfdd122e88a96f55 Mon Sep 17 00:00:00 2001
From: liyawei
Date: Thu, 4 Aug 2022 11:56:03 +0800
Subject: [PATCH 27/54] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?=
=?UTF-8?q?=E6=B8=85=E5=8D=95-=E5=8F=82=E6=95=B0=E6=A8=A1=E6=9D=BF?=
=?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5-=E4=BF=AE=E6=94=B9bug?=
=?UTF-8?q?=EF=BC=9A=E5=88=A0=E9=99=A4=E6=A8=A1=E6=9D=BF=E5=90=8E=E5=AD=97?=
=?UTF-8?q?=E6=AE=B5=E4=B8=8D=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jero-boot/db/蔚来标准sql/dev_third_record.sql | 7 ++++
.../cert/collect/entity/ParamsManifestEO.java | 2 +-
.../mapper/xml/ParamsManifestEOMapper.xml | 2 +-
.../service/IParamsManifestEOService.java | 3 ++
.../impl/ParamsManifestEOServiceImpl.java | 34 +++++++++++++++++++
.../impl/ParamsReportEOServiceImpl.java | 33 +++++++++++++-----
.../impl/ParamsTemplateEOServiceImpl.java | 17 +++++++---
7 files changed, 83 insertions(+), 15 deletions(-)
diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index f20a9f262..e1434cab5 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -506,6 +506,7 @@ INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `co
INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1552484136976973825', '1539426795780005889', '新增', NULL, NULL, NULL, NULL, 2, 'report:exportTemplate:add', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-07-28 10:40:37', NULL, NULL, 0, 0, '1', 0, 'Add');
UPDATE `laws_weilai`.`sys_permission` SET `parent_id` = '1516964175944798210', `name` = '上报库管理', `url` = '/escalationlibrary', `component` = 'parameter/escalationlibrary/index', `component_name` = NULL, `redirect` = NULL, `menu_type` = 1, `perms` = 'params:report:page', `perms_type` = '1', `sort_no` = 3.00, `always_show` = 0, `icon` = NULL, `is_route` = 1, `is_leaf` = 0, `keep_alive` = 0, `hidden` = 0, `description` = NULL, `create_by` = 'admin', `create_time` = '2022-06-22 10:05:03', `update_by` = 'admin', `update_time` = '2022-07-28 10:52:00', `del_flag` = 0, `rule_flag` = 0, `status` = '1', `internal_or_external` = 0, `menu_en` = 'Escalation library management' WHERE `id` = '1539429224550457346';
UPDATE `laws_weilai`.`sys_permission` SET `parent_id` = '1516964175944798210', `name` = '参数导出模板管理', `url` = '/Parameterexport', `component` = 'parameter/parameterexport/index', `component_name` = NULL, `redirect` = NULL, `menu_type` = 1, `perms` = 'report:exportTemplate:page', `perms_type` = '1', `sort_no` = 2.00, `always_show` = 0, `icon` = NULL, `is_route` = 1, `is_leaf` = 0, `keep_alive` = 0, `hidden` = 0, `description` = NULL, `create_by` = 'admin', `create_time` = '2022-06-22 09:55:24', `update_by` = 'admin', `update_time` = '2022-07-28 10:40:02', `del_flag` = 0, `rule_flag` = 0, `status` = '1', `internal_or_external` = 0, `menu_en` = 'Parameter export template management' WHERE `id` = '1539426795780005889';
+INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1554745894282264577', '1552487412749369345', '保存', NULL, NULL, NULL, NULL, 2, 'report:detail:export:save', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-08-03 16:28:02', NULL, NULL, 0, 0, '1', 0, 'Save');
-- 角色表-增加对外报告管理员角色 2022-7-28 已同步生产环境
INSERT INTO `sys_role` VALUES ('1552536424587862017', '对外报告管理员', 'ExternalReportsManager', '对外报告文件夹列表的管理员', 'admin', '2022-7-28 14:08:23', NULL, NULL, NULL, NULL);
@@ -692,3 +693,9 @@ CREATE TABLE `laws_weilai`.`problem_knowledge_base_collect` (
`collect_status` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收藏状态',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '问题知识库收藏表' ROW_FORMAT = Dynamic;
+
+-- 参数清单 添加字段 2022-08-04
+ALTER TABLE `laws_weilai`.`params_manifest`
+ ADD COLUMN `params_template_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数模板名称' AFTER `params_template_publish_version`;
+ALTER TABLE `laws_weilai`.`params_manifest_history`
+ ADD COLUMN `params_template_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数模板名称' AFTER `source_params_manifest_id`;
\ No newline at end of file
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java
index 0e5fa32ec..9d9cb0d9b 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java
@@ -94,7 +94,7 @@ public class ParamsManifestEO implements Serializable {
@ApiModelProperty(value = "对应参数模板发布版本")
private Integer paramsTemplatePublishVersion;
- @TableField(exist = false)
+ @ApiModelProperty(value = "参数模板名称")
private String paramsTemplateName;
@TableField(exist = false)
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml
index a27b4ca68..12e46fcfd 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml
@@ -43,7 +43,7 @@
pm.project_id as project_id,
pm.params_template_id as params_template_id,
pm.params_template_publish_version as params_template_publish_version,
- pt.params_template_name as params_template_name
+ if (pt.params_template_name is not null, pt.params_template_name, pm.params_template_name) as params_template_name
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java
index ea5d647c5..cbfd3c68c 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java
@@ -87,4 +87,7 @@ public interface IParamsManifestEOService extends IService {
List> labelListForProjectDetails(String projectId);
Map getStatisticsForProjectDetails(String paramsManifestId, String cut);
+
+ // 参数模板删除时，记录参数模板名称到清单
+ boolean setTemplateName(List paramsTemplateIds);
}
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
index 18b513804..66829d8f5 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
@@ -705,6 +705,40 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl paramsTemplateIds) {
+ List updateManifestEOList = new ArrayList<>();
+
+ // 查询被删除模板信息
+ LambdaQueryWrapper paramsTemplateEOLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ paramsTemplateEOLambdaQueryWrapper.in(ParamsTemplateEO::getId, paramsTemplateIds);
+ List paramsTemplateEOList = paramsTemplateEOService.list(paramsTemplateEOLambdaQueryWrapper);
+ List paramsTemplateIdList = paramsTemplateEOList.stream().map(ParamsTemplateEO::getId).collect(Collectors.toList());
+
+ // 查询被删除模板的所有清单
+ LambdaQueryWrapper paramsManifestEOLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ paramsManifestEOLambdaQueryWrapper.in(ParamsManifestEO::getParamsTemplateId, paramsTemplateIdList);
+ List paramsManifestEOList = list(paramsManifestEOLambdaQueryWrapper);
+
+ paramsTemplateEOList.forEach(templateEO-> {
+ // 查询使用该模板的所有清单
+ List paramsManifestEOS = paramsManifestEOList.stream()
+ .filter(e-> templateEO.getId().equals(e.getParamsTemplateId()))
+ .collect(Collectors.toList());
+
+ paramsManifestEOS.forEach(manifestEO -> {
+ ParamsManifestEO updateManifestEO = new ParamsManifestEO();
+ updateManifestEO.setId(manifestEO.getId());
+ updateManifestEO.setParamsTemplateName(templateEO.getParamsTemplateName());
+ updateManifestEO.setFinishTime(manifestEO.getFinishTime());
+
+ updateManifestEOList.add(updateManifestEO);
+ });
+
+ });
+ return updateBatchById(updateManifestEOList);
+ }
+
private void getData(List> data, double quantity, String percentage) {
Map map = new HashMap<>();
map.put("quantity", quantity);
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java
index 20b992308..76c937679 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java
@@ -1,5 +1,6 @@
package com.jero.modules.cert.report.service.impl;
+import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -14,6 +15,7 @@ import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
/**
* @Description: 上报库
@@ -132,18 +134,31 @@ public class ParamsReportEOServiceImpl extends ServiceImpl updateEOList = new ArrayList<>();
List paramsManifestEOList = paramsManifestEOMapper.listInfoAll(oldParamsManifestIdList);
+ List paramsManifestIdList = paramsManifestEOList.stream().map(ParamsManifestVO::getId).collect(Collectors.toList());
+ List paramsManifestVersionList = paramsManifestEOList.stream().map(ParamsManifestVO::getVersion).collect(Collectors.toList());
+
+ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.in(ParamsReportEO::getOldParamsManifestId, paramsManifestIdList)
+ .in(ParamsReportEO::getVersion, paramsManifestVersionList);
+ List paramsReportEOList = list(queryWrapper);
+
paramsManifestEOList.forEach(paramsManifestVO -> {
- LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(ParamsReportEO::getOldParamsManifestId, paramsManifestVO.getId())
- .eq(ParamsReportEO::getVersion, paramsManifestVO.getVersion());
- ParamsReportEO paramsReportEO = getOne(queryWrapper);
- ParamsReportEO updateEO = new ParamsReportEO();
- updateEO.setId(paramsReportEO.getId());
- updateEO.setTitle(paramsManifestVO.getTitle());
- updateEO.setProjectName(paramsManifestVO.getProjectName());
+ List paramsReportEOS = paramsReportEOList.stream()
+ .filter(e-> paramsManifestVO.getId().equals(e.getOldParamsManifestId()) && paramsManifestVO.getVersion().equals(e.getVersion()))
+ .collect(Collectors.toList());
+
+ if (CollectionUtil.isNotEmpty(paramsReportEOS)) {
+ ParamsReportEO paramsReportEO = paramsReportEOS.get(0);
+
+ ParamsReportEO updateEO = new ParamsReportEO();
+ updateEO.setId(paramsReportEO.getId());
+ updateEO.setTitle(paramsManifestVO.getTitle());
+ updateEO.setProjectName(paramsManifestVO.getProjectName());
+
+ updateEOList.add(updateEO);
+ }
- updateEOList.add(updateEO);
});
return updateBatchById(updateEOList);
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsTemplateEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsTemplateEOServiceImpl.java
index 8e69d4f13..4d44a3fa7 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsTemplateEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsTemplateEOServiceImpl.java
@@ -2,6 +2,7 @@ package com.jero.modules.cert.template.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.system.vo.LoginUser;
+import com.jero.modules.cert.collect.service.IParamsManifestEOService;
import com.jero.modules.cert.template.entity.CertCategoryParamsInfoEO;
import com.jero.modules.cert.template.entity.ParamsInfoEO;
import com.jero.modules.cert.template.entity.ParamsTemplateEO;
@@ -16,10 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.transaction.Transactional;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
/**
* @Description: 参数模板表
@@ -37,6 +35,9 @@ public class ParamsTemplateEOServiceImpl extends ServiceImpl
Date: Thu, 4 Aug 2022 13:44:30 +0800
Subject: [PATCH 28/54] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A3=E4=BB=BB?=
=?UTF-8?q?=E9=A2=86=E5=9F=9F=E5=90=8E=E4=BF=9D=E7=95=99=E9=AB=98=E7=BA=A7?=
=?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jero-web/src/components/tableCollection/index.vue | 11 ++++++++++-
.../components/ParameterItemCollectionList.vue | 3 +++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index 40b343d06..90d9d638b 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -322,6 +322,8 @@
xs: { span: 24 },
sm: { span: 7 }
},
+ queryParamQuery:{},
+ queryParam:{},
querySdtList: [], // 工程接口人
Dateline: {},
getquerySdtId: '', // 当前工程接口人的id
@@ -331,6 +333,9 @@
},
mounted() {
this.getHeader()
+ eventBUs.$on('getTableList', search => {
+ this.queryParamQuery = search
+ })
},
watch: {
currentPersonRole: {
@@ -565,7 +570,9 @@
if (!(result.some(val => val.value == res.result.userType))) {
res.result.userType = result[0] ? result[0].value : ''
}
+ this.queryParam = {...this.queryParamQuery}
this.getTableList(res.result.userType)
+
} else {
this.getTableList(result[0].value)
}
@@ -650,6 +657,7 @@
},
getTableListReset() {
this.formInline = {}
+ this.queryParam = {}
let params = {
paramsManifestId: this.$route.query.id,
pageNo: this.pageNo,
@@ -735,7 +743,8 @@
userTypes: this.currentPersonRole || currentPersonRole,
paramsManifestId: paramsManifestid,
...this.formInline,
- ...currentPersonRole
+ ...currentPersonRole,
+ ...this.queryParam
}
this.loading = true
getAction(url, params).then((res) => {
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 0ff67a9de..fbaf24817 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -424,6 +424,7 @@
+
+
\ No newline at end of file
From ec5b57fa3916c461a6b8c240f264ee967dae516c Mon Sep 17 00:00:00 2001
From: liyawei
Date: Thu, 4 Aug 2022 14:17:00 +0800
Subject: [PATCH 30/54] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E4=B8=8A=E6=8A=A5?=
=?UTF-8?q?=E5=BA=93-=E5=8F=82=E6=95=B0=E9=A1=B9=E6=9F=A5=E7=9C=8B-?=
=?UTF-8?q?=E4=BF=9D=E5=AD=98-=E5=8F=AF=E4=BB=A5=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E6=A0=87=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../impl/ParamsCollectManifestEOServiceImpl.java | 12 ++++++++++++
.../impl/ParamsReportDetailEOServiceImpl.java | 4 ++--
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index 9da886739..9efca35d4 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -1936,6 +1936,18 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl
Date: Thu, 4 Aug 2022 14:27:54 +0800
Subject: [PATCH 31/54] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=9F=A5=E8=AF=86?=
=?UTF-8?q?=E5=BA=93-country=5Fcard-=E7=AE=A1=E7=90=86=E5=8F=91=E5=B8=83?=
=?UTF-8?q?=E3=80=81=E6=98=8E=E7=BB=86=E5=BC=80=E5=8F=91=E3=80=82=20?=
=?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=A3=9E=E4=B9=A6=E4=BA=A4=E4=BA=92=E5=BC=80?=
=?UTF-8?q?=E5=8F=91=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jero-boot/db/蔚来标准sql/dev_third_record.sql | 28 +++
.../com/jero/config/shiro/ShiroConfig.java | 3 +
.../feishu/controller/LarkController.java | 91 +++++++++
.../feishu/service/IFeishuService.java | 13 ++
.../service/impl/FeishuServiceImpl.java | 173 ++++++++++++++++++
.../modules/feishu/utils/LarkDecryptUtil.java | 55 ++++++
...ryCardManageReleaseDetailEOController.java | 170 +++++++++++++++++
.../CountryCardManageReleaseEOController.java | 170 +++++++++++++++++
.../CountryCardManageReleaseDetailEO.java | 84 +++++++++
.../entity/CountryCardManageReleaseEO.java | 74 ++++++++
...ountryCardManageReleaseDetailEOMapper.java | 17 ++
.../CountryCardManageReleaseEOMapper.java | 17 ++
...CountryCardManageReleaseDetailEOMapper.xml | 16 ++
.../xml/CountryCardManageReleaseEOMapper.xml | 14 ++
...untryCardManageReleaseDetailEOService.java | 61 ++++++
.../ICountryCardManageReleaseEOService.java | 61 ++++++
...yCardManageReleaseDetailEOServiceImpl.java | 89 +++++++++
...CountryCardManageReleaseEOServiceImpl.java | 89 +++++++++
.../src/main/resources/application-dev.yml | 10 +
19 files changed, 1235 insertions(+)
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/controller/LarkController.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/utils/LarkDecryptUtil.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseDetailEOController.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseDetailEO.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseEO.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/CountryCardManageReleaseDetailEOMapper.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/CountryCardManageReleaseEOMapper.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/CountryCardManageReleaseDetailEOMapper.xml
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/CountryCardManageReleaseEOMapper.xml
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseDetailEOService.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseDetailEOServiceImpl.java
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java
diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index f20a9f262..3212dfc50 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -692,3 +692,31 @@ CREATE TABLE `laws_weilai`.`problem_knowledge_base_collect` (
`collect_status` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收藏状态',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '问题知识库收藏表' ROW_FORMAT = Dynamic;
+
+-- 问题知识库-country_card-管理发布表 2022-08-04
+CREATE TABLE `laws_weilai`.`country_card_manage_release` (
+ `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+ `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
+ `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期',
+ `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
+ `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期',
+ `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门',
+ `apply_market` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '适用市场',
+ `release_status` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发布状态',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '问题知识库-country_card-管理发布表' ROW_FORMAT = Dynamic;
+
+-- 问题知识库-country_card-管理发布明细表 2022-08-04
+CREATE TABLE `laws_weilai`.`country_card_manage_release_detail` (
+ `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+ `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
+ `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期',
+ `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
+ `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期',
+ `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门',
+ `country_card_manage_release_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'country_card管理发布表id',
+ `country_card_temp_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '模板表id',
+ `description` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述',
+ `content` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '内容',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '问题知识库-country_card-管理发布明细表' ROW_FORMAT = Dynamic;
diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java
index a57e7db62..dc48bf546 100644
--- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java
+++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java
@@ -151,6 +151,9 @@ public class ShiroConfig {
filterChainDefinitionMap.put("/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/processCall", "anon");
// 法规技术评估-条款信息评估结果表 工作流处理数据接口排除
filterChainDefinitionMap.put("/lawsTechnologyEvaluation/lawsTechnologyEvaluationItemResultEO/processCall", "anon");
+
+ filterChainDefinitionMap.put("/lark/larkEventSubscriptionConfig", "anon"); //飞书调用接口，事件订阅配置。
+ filterChainDefinitionMap.put("/lark/larkCardMessageConfig", "anon"); //飞书调用接口，卡片消息配置。
filterChainDefinitionMap.put("/sys/user/querySysUserListByIdList", "anon"); // 工作流根据用户idList获取用户信息接口
// 添加自己的过滤器并且取名为jwt
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/controller/LarkController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/controller/LarkController.java
new file mode 100644
index 000000000..c7b51528e
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/controller/LarkController.java
@@ -0,0 +1,91 @@
+package com.jero.modules.feishu.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.jero.modules.feishu.service.IFeishuService;
+import com.jero.modules.feishu.utils.LarkDecryptUtil;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(tags="飞书交互控制层")
+@RestController
+@RequestMapping("/lark")
+@Slf4j
+public class LarkController {
+ @Autowired
+ private IFeishuService feishuService;
+
+ //加密密钥
+ @Value("${Feishu.eventSubscription.encryptKey}")
+ private String encryptKey;
+ /**
+ * 飞书调用接口，飞书事件订阅配置。
+ * @param jsonObject
+ * @return
+ */
+ @PostMapping(value = "/larkEventSubscriptionConfig")
+ public String larkEventSubscriptionConfig(@RequestBody JSONObject jsonObject){
+ String encrypt = jsonObject.getString("encrypt");
+ log.info(encrypt);
+
+ LarkDecryptUtil d = new LarkDecryptUtil(encryptKey);
+
+ String decrypt = null;
+ try {
+ decrypt = d.decrypt(encrypt);
+ } catch (Exception exception) {
+ exception.printStackTrace();
+ }
+ log.info("decrypt:==========================================================" + decrypt);
+
+ //解析密钥json
+ JSONObject decryptJson = JSONObject.parseObject(decrypt);
+ Object event = decryptJson.get("event");
+ if(event != null){
+ JSONObject eventJson = JSONObject.parseObject(decryptJson.get("event").toString());
+
+ // 消息类型 与飞书开放平台文档应该一致
+ String msgType = eventJson.getString("msg_type");
+
+ //如果是文本类型消息，进入处理，
+ if(StringUtils.equals(msgType,"text")){
+ //用户发送的内容
+ String textWithoutAtBot = eventJson.getString("text_without_at_bot");
+ //用户发送的内容 与上方textWithoutAtBot变量一致(迷惑行为，同样的内容，用了两个字段返回)
+ String text = eventJson.getString("text");
+ //用户id
+ String employeeId = eventJson.getString("employee_id");
+
+ //判断用户发送的消息内容，如果包含"知识库" 那么给用户推送知识库分类菜单
+ if(StringUtils.contains(text,"知识库")){
+ log.info("给"+employeeId+"用户推送知识库一级分类菜单:==========================================================");
+ feishuService.sendKnowledgeBaseTypeCard(employeeId.split(","));
+ }
+ }
+ }
+ return decrypt;
+ }
+
+ /**
+ * 飞书卡片消息配置
+ * @param jsonObject
+ * @return
+ */
+ @PostMapping(value = "/larkCardMessageConfig")
+ public JSONObject larkCardMessageConfig(@RequestBody JSONObject jsonObject){
+ JSONObject result = new JSONObject();
+ String challenge = jsonObject.getString("challenge");
+ if(StringUtils.isEmpty(challenge)){
+ this.feishuService.sendKnowledgeBaseInfoCard(jsonObject);
+ }
+ result.put("challenge",challenge);
+ log.info(result.toString());
+ return result;
+ }
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/IFeishuService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/IFeishuService.java
index 0a857879d..5c8a8d213 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/IFeishuService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/IFeishuService.java
@@ -1,5 +1,6 @@
package com.jero.modules.feishu.service;
+import com.alibaba.fastjson.JSONObject;
import com.jero.modules.feishu.vo.FeishuMsgVo;
import java.io.IOException;
@@ -43,4 +44,16 @@ public interface IFeishuService {
* @return
*/
String translateText(Map params);
+
+ /**
+ * 发送知识库分类卡片消息 （用户输入知识库的时候）
+ * @param userIds
+ */
+ void sendKnowledgeBaseTypeCard(String[] userIds);
+
+ /**
+ * 发送知识库信息卡片消息 （用户点击某一个分类的时候）
+ * @param jsonObject
+ */
+ void sendKnowledgeBaseInfoCard(JSONObject jsonObject);
}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java
index df3ed86d6..55e6e2429 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java
@@ -3,11 +3,13 @@ package com.jero.modules.feishu.service.impl;
import cn.hutool.core.util.StrUtil;
import com.alibaba.druid.support.json.JSONUtils;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.jero.modules.feishu.service.IFeishuService;
import com.jero.modules.feishu.vo.FeishuMsgVo;
import com.jero.modules.system.util.HttpRequestUtil;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -306,4 +308,175 @@ public class FeishuServiceImpl implements IFeishuService {
return result;
}
+ /**
+ * 发送知识库分类卡片消息 （用户输入知识库的时候）
+ * @param userIds
+ */
+ @Override
+ public void sendKnowledgeBaseTypeCard(String[] userIds){
+ String token = null;
+ try {
+ token = getTenantAccessToken();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ // 设置请求头
+ Map headerMap = new HashMap<>();
+ headerMap.put("Authorization", "Bearer " + token);
+ headerMap.put("Content-Type", "application/json; charset=utf-8");
+
+ String sendJson = " {\n" +
+ " \"config\": {\n" +
+ " \"wide_screen_mode\": true\n" +
+ " },\n" +
+ " \"header\": {\n" +
+ " \"title\": {\n" +
+ " \"tag\": \"plain_text\",\n" +
+ " \"content\": \"点击下方的分类查看常见问题\"\n" +
+ " }\n" +
+ " }\n" +
+ "}";
+ JSONObject jsonObject = JSONObject.parseObject(sendJson);
+ JSONArray elements = new JSONArray();
+ JSONObject element = new JSONObject();
+ element.put("tag","action");
+ element.put("layout","bisected");
+
+ JSONArray actions = new JSONArray();
+ //组装推送过去的点击按钮
+ for (int i=0; i<5; i++){
+
+ JSONObject buttonObject = new JSONObject();
+ JSONObject text = new JSONObject();
+ JSONObject value = new JSONObject();
+ buttonObject.put("tag","button");
+
+ if(i==0){
+ text.put("tag","plain_text");
+ text.put("content","content1");
+
+ value.put("chosen","chosen1");
+ }
+ if(i==1){
+ text.put("tag","plain_text");
+ text.put("content","content2");
+
+ value.put("chosen","chosen2");
+ }
+ if(i==2){
+ text.put("tag","plain_text");
+ text.put("content","content3");
+
+ value.put("chosen","chosen3");
+ }
+ if(i==3){
+ text.put("tag","plain_text");
+ text.put("content","content4");
+
+ value.put("chosen","chosen4");
+ }
+ if(i==4){
+ text.put("tag","plain_text");
+ text.put("content","content5");
+
+ value.put("chosen","chosen5");
+ }
+ if(i==5){
+ text.put("tag","plain_text");
+ text.put("content","content6");
+
+ value.put("chosen","chosen6");
+ }
+ buttonObject.put("text",text);
+ buttonObject.put("type","primary");
+ buttonObject.put("value",value);
+ actions.add(buttonObject);
+ }
+ element.put("actions",actions);
+
+
+ elements.add(element);
+ jsonObject.put("elements",elements);
+ // 设置请求参数
+ JSONObject paramsMap = new JSONObject();
+ paramsMap.put("user_ids", userIds);
+ paramsMap.put("msg_type", "interactive");
+ paramsMap.put("card", jsonObject);
+
+ // 发送请求给飞书
+ String response = null;
+ try {
+ response = HttpRequestUtil.getResponseOfPOST(batchSendMessageUrl, headerMap, paramsMap.toJSONString());
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ // 获取返回结果
+ JSONObject tokenJson = JSONObject.parseObject(response);
+ if(!tokenJson.get("code").toString().equals("0")) {
+ log.error("请求出现异常：" + tokenJson.get("msg") + " " + tokenJson);
+ }
+ }
+
+ @Override
+ public void sendKnowledgeBaseInfoCard(JSONObject jsonObject) {
+ String[] userIds = jsonObject.getString("user_id").split(",");
+ String clickStr = JSONObject.toJSONString(JSONObject.parseObject(JSONObject.toJSONString(jsonObject.get("action"))).get("value"));
+ log.info("用户点击的数据: " + clickStr);
+
+ String sendJson = " ";
+
+ JSONObject clickJson = JSONObject.parseObject(clickStr);
+ if(StringUtils.isNotEmpty(clickJson.getString("chosen"))){
+ sendJson = clickJson.getString("chosen");
+ }
+
+ String token = null;
+ try {
+ token = getTenantAccessToken();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ // 设置请求头
+ Map headerMap = new HashMap<>();
+ headerMap.put("Authorization", "Bearer " + token);
+ headerMap.put("Content-Type", "application/json; charset=utf-8");
+ // 设置消息标题
+ JSONObject zh_cn = new JSONObject();
+ zh_cn.put("title", "title");
+ // 设置消息内容
+ // 第一行
+ JSONObject contentOne = new JSONObject();
+ contentOne.put("tag", "text");
+ contentOne.put("text", sendJson);
+ List contentList = new ArrayList<>();
+ contentList.add(contentOne);
+
+ List> list = new ArrayList<>();
+ list.add(contentList);
+ zh_cn.put("content", list);
+
+ JSONObject post = new JSONObject();
+ post.put("zh_cn", zh_cn);
+ JSONObject contentObj = new JSONObject();
+ contentObj.put("post", post);
+ // 设置请求参数
+ JSONObject paramsMap = new JSONObject();
+ paramsMap.put("user_ids", userIds);
+ paramsMap.put("msg_type", "post");
+ paramsMap.put("content", contentObj);
+ // 发送请求给飞书
+ String response = null;
+ try {
+ response = HttpRequestUtil.getResponseOfPOST(batchSendMessageUrl, headerMap, paramsMap.toJSONString());
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ // 返回结果样例：{"code":0,"data":{"invalid_department_ids":[],"invalid_open_ids":[],"invalid_union_ids":[],"invalid_user_ids":[],"message_id":"bm-d595567e4f448fafe397bc916f0be646"},"msg":"ok"}
+ // 获取返回结果
+ JSONObject tokenJson = JSONObject.parseObject(response);
+ if(!tokenJson.get("code").toString().equals("0")) {
+ log.error("请求出现异常：" + tokenJson.get("msg") + " " + tokenJson);
+ }
+ }
+
}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/utils/LarkDecryptUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/utils/LarkDecryptUtil.java
new file mode 100644
index 000000000..8ef4967f1
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/utils/LarkDecryptUtil.java
@@ -0,0 +1,55 @@
+package com.jero.modules.feishu.utils;
+
+import javax.crypto.Cipher;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Base64;
+
+/**
+ * 飞书解密工具类
+ * @Author: wzj
+ * @Date: 2022/8/4 10:52
+ **/
+public class LarkDecryptUtil {
+
+ public static void main(String[] args) throws Exception {
+ LarkDecryptUtil d = new LarkDecryptUtil("test key");
+ System.out.println(d.decrypt("P37w+VZImNgPEO1RBhJ6RtKl7n6zymIbEG1pReEzghk=")); //hello world
+ }
+
+ private byte[] keyBs;
+ public LarkDecryptUtil(String key) {
+ MessageDigest digest = null;
+ try {
+ digest = MessageDigest.getInstance("SHA-256");
+ } catch (NoSuchAlgorithmException e) {
+ // won't happen
+ }
+ keyBs = digest.digest(key.getBytes(StandardCharsets.UTF_8));
+ }
+
+ public String decrypt(String base64) throws Exception {
+ byte[] decode = Base64.getDecoder().decode(base64);
+ Cipher cipher = Cipher.getInstance("AES/CBC/NOPADDING");
+ byte[] iv = new byte[16];
+ System.arraycopy(decode, 0, iv, 0, 16);
+ byte[] data = new byte[decode.length - 16];
+ System.arraycopy(decode, 16, data, 0, data.length);
+ cipher.init(Cipher.DECRYPT_MODE, new SecretKeySpec(keyBs, "AES"), new IvParameterSpec(iv));
+ byte[] r = cipher.doFinal(data);
+ if (r.length > 0) {
+ int p = r.length - 1;
+ for (; p >= 0 && r[p] <= 16; p--) {
+ }
+ if (p != r.length - 1) {
+ byte[] rr = new byte[p + 1];
+ System.arraycopy(r, 0, rr, 0, p + 1);
+ r = rr;
+ }
+ }
+ return new String(r, StandardCharsets.UTF_8);
+ }
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseDetailEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseDetailEOController.java
new file mode 100644
index 000000000..685e49453
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseDetailEOController.java
@@ -0,0 +1,170 @@
+package com.jero.modules.problemKnowledgeBase.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.jero.common.api.vo.Result;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseDetailEO;
+import com.jero.modules.problemKnowledgeBase.service.ICountryCardManageReleaseDetailEOService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import com.jero.common.system.base.controller.JeroController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.jero.common.aspect.annotation.AutoLog;
+
+
+ /**
+ * @Description: 问题知识库-country_card-管理发布明细表
+ * @Author: jero-boot
+ * @Date: 2022-08-04
+ * @Version: V1.0
+ */
+@Api(tags="问题知识库-country_card-管理发布明细表")
+@RestController
+@RequestMapping("/problemKnowledgeBase/countryCardManageReleaseDetailEO")
+@Slf4j
+public class CountryCardManageReleaseDetailEOController extends JeroController {
+ @Autowired
+ private ICountryCardManageReleaseDetailEOService countryCardManageReleaseDetailEOService;
+
+ /**
+ * 分页列表查询
+ *
+ * @param countryCardManageReleaseDetailEO
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "问题知识库-country_card-管理发布明细表-分页列表查询")
+ @ApiOperation(value="问题知识库-country_card-管理发布明细表-分页列表查询", notes="问题知识库-country_card-管理发布明细表-分页列表查询")
+ @GetMapping(value = "/page")
+ public Result queryPageList(CountryCardManageReleaseDetailEO countryCardManageReleaseDetailEO,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(countryCardManageReleaseDetailEO, req.getParameterMap());
+ Page page = new Page(pageNo, pageSize);
+ IPage pageList = countryCardManageReleaseDetailEOService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 列表查询
+ *
+ * @return
+ */
+ @AutoLog(value = "问题知识库-country_card-管理发布明细表-列表查询")
+ @ApiOperation(value="问题知识库-country_card-管理发布明细表-列表查询", notes="问题知识库-country_card-管理发布明细表-列表查询")
+ @GetMapping(value = "/list")
+ public Result> queryList() {
+ List list = countryCardManageReleaseDetailEOService.queryList();
+ return Result.OK(list);
+ }
+
+ /**
+ * 添加
+ *
+ * @param countryCardManageReleaseDetailEO
+ * @return
+ */
+ @AutoLog(value = "问题知识库-country_card-管理发布明细表-添加")
+ @ApiOperation(value="问题知识库-country_card-管理发布明细表-添加", notes="问题知识库-country_card-管理发布明细表-添加")
+ @PostMapping(value = "/add")
+ public Result add(@Validated @RequestBody CountryCardManageReleaseDetailEO countryCardManageReleaseDetailEO) {
+ countryCardManageReleaseDetailEOService.add(countryCardManageReleaseDetailEO);
+ return Result.OK("添加成功！");
+ }
+
+ /**
+ * 编辑
+ *
+ * @param countryCardManageReleaseDetailEO
+ * @return
+ */
+ @AutoLog(value = "问题知识库-country_card-管理发布明细表-编辑")
+ @ApiOperation(value="问题知识库-country_card-管理发布明细表-编辑", notes="问题知识库-country_card-管理发布明细表-编辑")
+ @PutMapping(value = "/edit")
+ public Result edit(@Validated @RequestBody CountryCardManageReleaseDetailEO countryCardManageReleaseDetailEO) {
+ countryCardManageReleaseDetailEOService.editById(countryCardManageReleaseDetailEO);
+ return Result.OK("编辑成功!");
+ }
+
+ /**
+ * 通过id删除
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "问题知识库-country_card-管理发布明细表-通过id删除")
+ @ApiOperation(value="问题知识库-country_card-管理发布明细表-通过id删除", notes="问题知识库-country_card-管理发布明细表-通过id删除")
+ @DeleteMapping(value = "/delete")
+ public Result delete(@RequestParam(name="id",required=true) String id) {
+ countryCardManageReleaseDetailEOService.deleteById(id);
+ return Result.OK("删除成功!");
+ }
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "问题知识库-country_card-管理发布明细表-批量删除")
+ @ApiOperation(value="问题知识库-country_card-管理发布明细表-批量删除", notes="问题知识库-country_card-管理发布明细表-批量删除")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+ this.countryCardManageReleaseDetailEOService.deleteByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("批量删除成功!");
+ }
+
+ /**
+ * 通过id查询
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "问题知识库-country_card-管理发布明细表-通过id查询")
+ @ApiOperation(value="问题知识库-country_card-管理发布明细表-通过id查询", notes="问题知识库-country_card-管理发布明细表-通过id查询")
+ @GetMapping(value = "/queryById")
+ public Result queryById(@RequestParam(name="id",required=true) String id) {
+ CountryCardManageReleaseDetailEO countryCardManageReleaseDetailEO = countryCardManageReleaseDetailEOService.queryById(id);
+ if(countryCardManageReleaseDetailEO==null) {
+ return Result.error("未找到对应数据");
+ }
+ return Result.OK(countryCardManageReleaseDetailEO);
+ }
+
+ /**
+ * 导出excel
+ *
+ * @param request
+ * @param countryCardManageReleaseDetailEO
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, CountryCardManageReleaseDetailEO countryCardManageReleaseDetailEO) {
+ return super.exportXls(request, countryCardManageReleaseDetailEO, CountryCardManageReleaseDetailEO.class, "问题知识库-country_card-管理发布明细表");
+ }
+
+ /**
+ * 通过excel导入数据
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, CountryCardManageReleaseDetailEO.class);
+ }
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java
new file mode 100644
index 000000000..7504e7c33
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java
@@ -0,0 +1,170 @@
+package com.jero.modules.problemKnowledgeBase.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.jero.common.api.vo.Result;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseEO;
+import com.jero.modules.problemKnowledgeBase.service.ICountryCardManageReleaseEOService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import com.jero.common.system.base.controller.JeroController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.jero.common.aspect.annotation.AutoLog;
+
+
+ /**
+ * @Description: 问题知识库-country_card-管理发布表
+ * @Author: jero-boot
+ * @Date: 2022-08-04
+ * @Version: V1.0
+ */
+@Api(tags="问题知识库-country_card-管理发布表")
+@RestController
+@RequestMapping("/problemKnowledgeBase/countryCardManageReleaseEO")
+@Slf4j
+public class CountryCardManageReleaseEOController extends JeroController {
+ @Autowired
+ private ICountryCardManageReleaseEOService countryCardManageReleaseEOService;
+
+ /**
+ * 分页列表查询
+ *
+ * @param countryCardManageReleaseEO
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "问题知识库-country_card-管理发布表-分页列表查询")
+ @ApiOperation(value="问题知识库-country_card-管理发布表-分页列表查询", notes="问题知识库-country_card-管理发布表-分页列表查询")
+ @GetMapping(value = "/page")
+ public Result queryPageList(CountryCardManageReleaseEO countryCardManageReleaseEO,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(countryCardManageReleaseEO, req.getParameterMap());
+ Page page = new Page(pageNo, pageSize);
+ IPage pageList = countryCardManageReleaseEOService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 列表查询
+ *
+ * @return
+ */
+ @AutoLog(value = "问题知识库-country_card-管理发布表-列表查询")
+ @ApiOperation(value="问题知识库-country_card-管理发布表-列表查询", notes="问题知识库-country_card-管理发布表-列表查询")
+ @GetMapping(value = "/list")
+ public Result> queryList() {
+ List list = countryCardManageReleaseEOService.queryList();
+ return Result.OK(list);
+ }
+
+ /**
+ * 添加
+ *
+ * @param countryCardManageReleaseEO
+ * @return
+ */
+ @AutoLog(value = "问题知识库-country_card-管理发布表-添加")
+ @ApiOperation(value="问题知识库-country_card-管理发布表-添加", notes="问题知识库-country_card-管理发布表-添加")
+ @PostMapping(value = "/add")
+ public Result add(@Validated @RequestBody CountryCardManageReleaseEO countryCardManageReleaseEO) {
+ countryCardManageReleaseEOService.add(countryCardManageReleaseEO);
+ return Result.OK("添加成功！");
+ }
+
+ /**
+ * 编辑
+ *
+ * @param countryCardManageReleaseEO
+ * @return
+ */
+ @AutoLog(value = "问题知识库-country_card-管理发布表-编辑")
+ @ApiOperation(value="问题知识库-country_card-管理发布表-编辑", notes="问题知识库-country_card-管理发布表-编辑")
+ @PutMapping(value = "/edit")
+ public Result edit(@Validated @RequestBody CountryCardManageReleaseEO countryCardManageReleaseEO) {
+ countryCardManageReleaseEOService.editById(countryCardManageReleaseEO);
+ return Result.OK("编辑成功!");
+ }
+
+ /**
+ * 通过id删除
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "问题知识库-country_card-管理发布表-通过id删除")
+ @ApiOperation(value="问题知识库-country_card-管理发布表-通过id删除", notes="问题知识库-country_card-管理发布表-通过id删除")
+ @DeleteMapping(value = "/delete")
+ public Result delete(@RequestParam(name="id",required=true) String id) {
+ countryCardManageReleaseEOService.deleteById(id);
+ return Result.OK("删除成功!");
+ }
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "问题知识库-country_card-管理发布表-批量删除")
+ @ApiOperation(value="问题知识库-country_card-管理发布表-批量删除", notes="问题知识库-country_card-管理发布表-批量删除")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+ this.countryCardManageReleaseEOService.deleteByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("批量删除成功!");
+ }
+
+ /**
+ * 通过id查询
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "问题知识库-country_card-管理发布表-通过id查询")
+ @ApiOperation(value="问题知识库-country_card-管理发布表-通过id查询", notes="问题知识库-country_card-管理发布表-通过id查询")
+ @GetMapping(value = "/queryById")
+ public Result queryById(@RequestParam(name="id",required=true) String id) {
+ CountryCardManageReleaseEO countryCardManageReleaseEO = countryCardManageReleaseEOService.queryById(id);
+ if(countryCardManageReleaseEO==null) {
+ return Result.error("未找到对应数据");
+ }
+ return Result.OK(countryCardManageReleaseEO);
+ }
+
+ /**
+ * 导出excel
+ *
+ * @param request
+ * @param countryCardManageReleaseEO
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, CountryCardManageReleaseEO countryCardManageReleaseEO) {
+ return super.exportXls(request, countryCardManageReleaseEO, CountryCardManageReleaseEO.class, "问题知识库-country_card-管理发布表");
+ }
+
+ /**
+ * 通过excel导入数据
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, CountryCardManageReleaseEO.class);
+ }
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseDetailEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseDetailEO.java
new file mode 100644
index 000000000..6df383189
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseDetailEO.java
@@ -0,0 +1,84 @@
+package com.jero.modules.problemKnowledgeBase.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+
+/**
+ * @Description: 问题知识库-country_card-管理发布明细表
+ * @Author: jero-boot
+ * @Date: 2022-08-04
+ * @Version: V1.0
+ */
+@Data
+@TableName("country_card_manage_release_detail")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="country_card_manage_release_detail对象", description="问题知识库-country_card-管理发布明细表")
+public class CountryCardManageReleaseDetailEO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**主键*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "主键")
+ private java.lang.String id;
+
+ /**创建人*/
+ @ApiModelProperty(value = "创建人")
+ private java.lang.String createBy;
+
+ /**创建日期*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "创建日期")
+ private java.util.Date createTime;
+
+ /**更新人*/
+ @ApiModelProperty(value = "更新人")
+ private java.lang.String updateBy;
+
+ /**更新日期*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "更新日期")
+ private java.util.Date updateTime;
+
+ /**所属部门*/
+ @ApiModelProperty(value = "所属部门")
+ private java.lang.String sysOrgCode;
+
+ /**country_card管理发布表id*/
+ @Excel(name = "country_card管理发布表id", width = 15)
+ @ApiModelProperty(value = "country_card管理发布表id")
+ private java.lang.String countryCardManageReleaseId;
+
+ /**模板表id*/
+ @Excel(name = "模板表id", width = 15)
+ @ApiModelProperty(value = "模板表id")
+ private java.lang.String countryCardTempId;
+
+ /**描述*/
+ @Excel(name = "描述", width = 15)
+ @ApiModelProperty(value = "描述")
+ private java.lang.String description;
+
+ /**内容*/
+ @Excel(name = "内容", width = 15)
+ @ApiModelProperty(value = "内容")
+ private java.lang.String content;
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseEO.java
new file mode 100644
index 000000000..03b247fc6
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseEO.java
@@ -0,0 +1,74 @@
+package com.jero.modules.problemKnowledgeBase.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+
+/**
+ * @Description: 问题知识库-country_card-管理发布表
+ * @Author: jero-boot
+ * @Date: 2022-08-04
+ * @Version: V1.0
+ */
+@Data
+@TableName("country_card_manage_release")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="country_card_manage_release对象", description="问题知识库-country_card-管理发布表")
+public class CountryCardManageReleaseEO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**主键*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "主键")
+ private java.lang.String id;
+
+ /**创建人*/
+ @ApiModelProperty(value = "创建人")
+ private java.lang.String createBy;
+
+ /**创建日期*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "创建日期")
+ private java.util.Date createTime;
+
+ /**更新人*/
+ @ApiModelProperty(value = "更新人")
+ private java.lang.String updateBy;
+
+ /**更新日期*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "更新日期")
+ private java.util.Date updateTime;
+
+ /**所属部门*/
+ @ApiModelProperty(value = "所属部门")
+ private java.lang.String sysOrgCode;
+
+ /**适用市场*/
+ @Excel(name = "适用市场", width = 15)
+ @ApiModelProperty(value = "适用市场")
+ private java.lang.String applyMarket;
+
+ /**发布状态*/
+ @Excel(name = "发布状态", width = 15)
+ @ApiModelProperty(value = "发布状态")
+ private java.lang.String releaseStatus;
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/CountryCardManageReleaseDetailEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/CountryCardManageReleaseDetailEOMapper.java
new file mode 100644
index 000000000..90b7d3ab5
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/CountryCardManageReleaseDetailEOMapper.java
@@ -0,0 +1,17 @@
+package com.jero.modules.problemKnowledgeBase.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseDetailEO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 问题知识库-country_card-管理发布明细表
+ * @Author: jero-boot
+ * @Date: 2022-08-04
+ * @Version: V1.0
+ */
+public interface CountryCardManageReleaseDetailEOMapper extends BaseMapper {
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/CountryCardManageReleaseEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/CountryCardManageReleaseEOMapper.java
new file mode 100644
index 000000000..1785a2ecf
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/CountryCardManageReleaseEOMapper.java
@@ -0,0 +1,17 @@
+package com.jero.modules.problemKnowledgeBase.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseEO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 问题知识库-country_card-管理发布表
+ * @Author: jero-boot
+ * @Date: 2022-08-04
+ * @Version: V1.0
+ */
+public interface CountryCardManageReleaseEOMapper extends BaseMapper {
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/CountryCardManageReleaseDetailEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/CountryCardManageReleaseDetailEOMapper.xml
new file mode 100644
index 000000000..e1ba89471
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/CountryCardManageReleaseDetailEOMapper.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/CountryCardManageReleaseEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/CountryCardManageReleaseEOMapper.xml
new file mode 100644
index 000000000..24321aefd
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/mapper/xml/CountryCardManageReleaseEOMapper.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseDetailEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseDetailEOService.java
new file mode 100644
index 000000000..9d078df1b
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseDetailEOService.java
@@ -0,0 +1,61 @@
+package com.jero.modules.problemKnowledgeBase.service;
+
+import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseDetailEO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 问题知识库-country_card-管理发布明细表
+ * @Author: jero-boot
+ * @Date: 2022-08-04
+ * @Version: V1.0
+ */
+public interface ICountryCardManageReleaseDetailEOService extends IService {
+
+ /**
+ * 保存
+ *
+ * @param countryCardManageReleaseDetailEO
+ * @return
+ */
+ void add(CountryCardManageReleaseDetailEO countryCardManageReleaseDetailEO);
+
+ /**
+ * 更新
+ *
+ * @param countryCardManageReleaseDetailEO
+ * @return
+ */
+ void editById(CountryCardManageReleaseDetailEO countryCardManageReleaseDetailEO);
+
+ /**
+ * 通过id删除
+ *
+ * @param id
+ * @return
+ */
+ void deleteById(String id);
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return
+ */
+ void deleteByIds(List ids);
+
+ /**
+ * 通过id查询
+ *
+ * @param id
+ * @return
+ */
+ CountryCardManageReleaseDetailEO queryById(String id);
+
+ /**
+ * 列表查询
+ *
+ * @return
+ */
+ List queryList();
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java
new file mode 100644
index 000000000..e5958d1e2
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java
@@ -0,0 +1,61 @@
+package com.jero.modules.problemKnowledgeBase.service;
+
+import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseEO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 问题知识库-country_card-管理发布表
+ * @Author: jero-boot
+ * @Date: 2022-08-04
+ * @Version: V1.0
+ */
+public interface ICountryCardManageReleaseEOService extends IService {
+
+ /**
+ * 保存
+ *
+ * @param countryCardManageReleaseEO
+ * @return
+ */
+ void add(CountryCardManageReleaseEO countryCardManageReleaseEO);
+
+ /**
+ * 更新
+ *
+ * @param countryCardManageReleaseEO
+ * @return
+ */
+ void editById(CountryCardManageReleaseEO countryCardManageReleaseEO);
+
+ /**
+ * 通过id删除
+ *
+ * @param id
+ * @return
+ */
+ void deleteById(String id);
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return
+ */
+ void deleteByIds(List ids);
+
+ /**
+ * 通过id查询
+ *
+ * @param id
+ * @return
+ */
+ CountryCardManageReleaseEO queryById(String id);
+
+ /**
+ * 列表查询
+ *
+ * @return
+ */
+ List queryList();
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseDetailEOServiceImpl.java
new file mode 100644
index 000000000..af3a13a20
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseDetailEOServiceImpl.java
@@ -0,0 +1,89 @@
+package com.jero.modules.problemKnowledgeBase.service.impl;
+
+import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseDetailEO;
+import com.jero.modules.problemKnowledgeBase.mapper.CountryCardManageReleaseDetailEOMapper;
+import com.jero.modules.problemKnowledgeBase.service.ICountryCardManageReleaseDetailEOService;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Date;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 问题知识库-country_card-管理发布明细表
+ * @Author: jero-boot
+ * @Date: 2022-08-04
+ * @Version: V1.0
+ */
+@Service
+public class CountryCardManageReleaseDetailEOServiceImpl extends ServiceImpl implements ICountryCardManageReleaseDetailEOService {
+
+ /**
+ * 保存
+ *
+ * @param countryCardManageReleaseDetailEO
+ * @return
+ */
+ @Override
+ public void add(CountryCardManageReleaseDetailEO countryCardManageReleaseDetailEO) {
+ Date now = new Date();
+ countryCardManageReleaseDetailEO.setCreateTime(now);
+ countryCardManageReleaseDetailEO.setUpdateTime(now);
+ save(countryCardManageReleaseDetailEO);
+ }
+
+ /**
+ * 更新
+ *
+ * @param countryCardManageReleaseDetailEO
+ * @return
+ */
+ @Override
+ public void editById(CountryCardManageReleaseDetailEO countryCardManageReleaseDetailEO) {
+ Date now = new Date();
+ countryCardManageReleaseDetailEO.setUpdateTime(now);
+ saveOrUpdate(countryCardManageReleaseDetailEO);
+ }
+
+ /**
+ * 通过id删除
+ *
+ * @param id
+ * @return
+ */
+ @Override
+ public void deleteById(String id) {
+ removeById(id);
+ }
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return
+ */
+ @Override
+ public void deleteByIds(List ids) {
+ removeByIds(ids);
+ }
+
+ /**
+ * 通过id查询
+ *
+ * @param id
+ * @return
+ */
+ @Override
+ public CountryCardManageReleaseDetailEO queryById(String id) {
+ return getById(id);
+ }
+
+ /**
+ * 列表查询
+ *
+ * @return
+ */
+ @Override
+ public List queryList() {
+ return list();
+ }
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java
new file mode 100644
index 000000000..2dbad6d0c
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java
@@ -0,0 +1,89 @@
+package com.jero.modules.problemKnowledgeBase.service.impl;
+
+import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseEO;
+import com.jero.modules.problemKnowledgeBase.mapper.CountryCardManageReleaseEOMapper;
+import com.jero.modules.problemKnowledgeBase.service.ICountryCardManageReleaseEOService;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Date;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 问题知识库-country_card-管理发布表
+ * @Author: jero-boot
+ * @Date: 2022-08-04
+ * @Version: V1.0
+ */
+@Service
+public class CountryCardManageReleaseEOServiceImpl extends ServiceImpl implements ICountryCardManageReleaseEOService {
+
+ /**
+ * 保存
+ *
+ * @param countryCardManageReleaseEO
+ * @return
+ */
+ @Override
+ public void add(CountryCardManageReleaseEO countryCardManageReleaseEO) {
+ Date now = new Date();
+ countryCardManageReleaseEO.setCreateTime(now);
+ countryCardManageReleaseEO.setUpdateTime(now);
+ save(countryCardManageReleaseEO);
+ }
+
+ /**
+ * 更新
+ *
+ * @param countryCardManageReleaseEO
+ * @return
+ */
+ @Override
+ public void editById(CountryCardManageReleaseEO countryCardManageReleaseEO) {
+ Date now = new Date();
+ countryCardManageReleaseEO.setUpdateTime(now);
+ saveOrUpdate(countryCardManageReleaseEO);
+ }
+
+ /**
+ * 通过id删除
+ *
+ * @param id
+ * @return
+ */
+ @Override
+ public void deleteById(String id) {
+ removeById(id);
+ }
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return
+ */
+ @Override
+ public void deleteByIds(List ids) {
+ removeByIds(ids);
+ }
+
+ /**
+ * 通过id查询
+ *
+ * @param id
+ * @return
+ */
+ @Override
+ public CountryCardManageReleaseEO queryById(String id) {
+ return getById(id);
+ }
+
+ /**
+ * 列表查询
+ *
+ * @return
+ */
+ @Override
+ public List queryList() {
+ return list();
+ }
+}
diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml
index 79646a533..d8af54a19 100644
--- a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml
+++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml
@@ -413,15 +413,25 @@ Feishu:
# appId: cli_a16d47ca9f381013
# appSecret: DSfCrj70xku2VUjqwHBIuuY6HZnz7ppe
+ # wzj测试账号配置
appId: cli_a25c9fdae5bc100c
appSecret: zIS7BLzcWaFvlpdz7CqRJbwVml4g4ESy
+ # 事件订阅配置
+ eventSubscription:
+ # 加密密钥
+ encryptKey: EKdOsbNapPj0EFdFiBIINfn5FQrZ2QvQ
# 正式
# appId: cli_a2a1a6014679500d
# appSecret: AeHwisC82S0fhiREJg6bkdxhIZMevnZZ
+ # 事件订阅配置
+ #eventSubscription:
+ # 加密密钥 需要登录这个正式飞书账号，去事件订阅中获取
+ #encryptKey:
getTenantAccessTokenUrl: https://open.feishu.cn/open-apis/auth/v3/tenant_access_token/internal
batchSendMessageUrl: https://open.feishu.cn/open-apis/message/v4/batch_send/
translateTextUrl: https://open.feishu.cn/open-apis/translation/v1/text/translate
+
local-tool:
uri: http://139.9.235.66:9022
opensso:
From 45f2415dc702a40e4a7096896d9ecab7f6586540 Mon Sep 17 00:00:00 2001
From: "zyx.net"
Date: Thu, 4 Aug 2022 14:46:52 +0800
Subject: [PATCH 32/54] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93=E4=BF=9D?=
=?UTF-8?q?=E5=AD=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jero-web/src/components/tableCollection/index.vue | 12 ++++++++----
.../components/ParameterItemCollectionList.vue | 14 +++++++-------
2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index 90d9d638b..8103f72e0 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -335,12 +335,13 @@
this.getHeader()
eventBUs.$on('getTableList', search => {
this.queryParamQuery = search
+ console.log(this.queryParamQuery)
+ this.getTableList()
})
},
watch: {
currentPersonRole: {
handler: function() {
- console.log(123)
this.getTableList()
},
immediate: true
@@ -566,11 +567,12 @@
}
getAction('/params/userTypeLog/queryCurrentType', query).then((res) => {
if (res.success) {
+ this.queryParamQuery = {...this.queryParamQuery}
+
if (res.result && res.result.userType) {
if (!(result.some(val => val.value == res.result.userType))) {
res.result.userType = result[0] ? result[0].value : ''
}
- this.queryParam = {...this.queryParamQuery}
this.getTableList(res.result.userType)
} else {
@@ -657,7 +659,7 @@
},
getTableListReset() {
this.formInline = {}
- this.queryParam = {}
+ this.queryParamQuery = {}
let params = {
paramsManifestId: this.$route.query.id,
pageNo: this.pageNo,
@@ -725,6 +727,8 @@
this.selectedRowKeys = []
},
getTableList(currentPersonRole) {
+ console.log(currentPersonRole)
+ console.log(this.queryParamQuery)
// todo
let paramsManifestid
let url
@@ -744,7 +748,7 @@
paramsManifestId: paramsManifestid,
...this.formInline,
...currentPersonRole,
- ...this.queryParam
+ ...this.queryParamQuery
}
this.loading = true
getAction(url, params).then((res) => {
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index fbaf24817..6398aeb5d 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -671,7 +671,7 @@
getAction('/params/collectManifest/bringSdtInto', query).then((res) => {
if (res.success) {
this.$message.success(this.$t('OperationSuccessful'))
- this.$refs.CollectionTabel.getTableList()
+ this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
} else {
this.$message.warning(this.$t('operationFailed'))
}
@@ -720,7 +720,7 @@
this.$refs.CollectionTabel.getLoginUserType()
},
GetgetTableList() {
- this.$refs.CollectionTabel.getTableList()
+ this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
},
// 错误数据的弹框
cancleoperationFailed() {
@@ -854,7 +854,7 @@
sqp['superQueryMatchType'] = matchType
}
this.queryParamQuery = sqp
- this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
+ // this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
eventBUs.$emit('getTableList',this.queryParamQuery)
},
// 认证工程师 批量删除 权限
@@ -1103,7 +1103,7 @@
this.textLoading = false
_this.$message.success(this.$t('OperationSuccessful'))
this.areaVisibleFreeze = false
- this.$refs.CollectionTabel.getTableList()
+ this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
this.$refs.CollectionTabel.getHeader()
} else {
this.textLoading = false
@@ -1501,12 +1501,12 @@
areaVisibleTaskCutOffTimeflag(val) {
console.log(val)
this.areaVisibleTaskCutOffTime = val
- this.$refs.CollectionTabel.getTableList()
+ this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
},
areaVisibleTaskCutOffTimeAll(val){
console.log(val)
this.OneclickCollection = val
- this.$refs.CollectionTabel.getTableList()
+ this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
},
//引用参数
referenceparameter() {
@@ -1579,7 +1579,7 @@
_this.$message.success(_this.$t('OperationSuccessful'))
_this.selectedRowKeys = []
// _this.$refs.CollectionTabel.getData()
- _this.$refs.CollectionTabel.getTableList()
+ _this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
_this.textLoading = false
} else {
_this.textLoading = false
From ffb31b7e4f83ea2d0897acc95967c82bfa6d6305 Mon Sep 17 00:00:00 2001
From: liyawei
Date: Thu, 4 Aug 2022 15:13:10 +0800
Subject: [PATCH 33/54] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?=
=?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86-=E6=89=B9=E9=87=8F=E5=88=A0?=
=?UTF-8?q?=E9=99=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../collect/controller/ParamsCollectManifestEOController.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
index 35994b066..c797b78a3 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
@@ -179,7 +179,7 @@ public class ParamsCollectManifestEOController extends JeroController deleteBatch(ParamsCollectManifestVO paramsCollectManifestVO) {
+ public Result deleteBatch(@RequestBody ParamsCollectManifestVO paramsCollectManifestVO) {
boolean isSuccess = paramsCollectManifestEOService.deleteBatch(paramsCollectManifestVO);
if (isSuccess) {
return Result.OK("批量删除成功！");
From 482b5b101ec093eee626194a166363a6374779c0 Mon Sep 17 00:00:00 2001
From: liyawei
Date: Thu, 4 Aug 2022 15:21:18 +0800
Subject: [PATCH 34/54] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?=
=?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86-bug57094?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/impl/ParamsCollectManifestEOServiceImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index 9efca35d4..3df787f08 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -2029,8 +2029,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl list = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO);
- // 过滤出 状态为：待发起收集，且工程接口人处为空的参数项
- list = list.stream().filter(e-> CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState()) && StringUtils.isBlank(e.getSdt())).collect(Collectors.toList());
+ // 过滤出 状态为：待发起收集的参数项
+ list = list.stream().filter(e-> CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState())).collect(Collectors.toList());
List updateCollectManifestEOList = new ArrayList<>();
if (CollectionUtil.isNotEmpty(list)) {
From 94a0cf619bbcce5bd4ac48bc6c52851cc4537ff5 Mon Sep 17 00:00:00 2001
From: "zyx.net"
Date: Thu, 4 Aug 2022 15:27:48 +0800
Subject: [PATCH 35/54] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=B9=E6=94=B6?=
=?UTF-8?q?=E9=9B=86=E6=B8=85=E5=8D=95=E5=A2=9E=E5=8A=A0=E5=B7=A5=E7=A8=8B?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BA=BA=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/components/tableCollection/index.vue | 1 -
.../parameter/managementdetails/index.vue | 2 +-
.../ParameterItemCollectionList.vue | 50 ++++++++-----------
3 files changed, 21 insertions(+), 32 deletions(-)
diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index 8103f72e0..f29c53e4e 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -335,7 +335,6 @@
this.getHeader()
eventBUs.$on('getTableList', search => {
this.queryParamQuery = search
- console.log(this.queryParamQuery)
this.getTableList()
})
},
diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue
index d178b43be..703ffe5b8 100644
--- a/jero-web/src/views/parameter/managementdetails/index.vue
+++ b/jero-web/src/views/parameter/managementdetails/index.vue
@@ -62,7 +62,7 @@
{{$t('sdt')}}
+
+
+
+
+
+
-
-
-
-
-
+
+
-
+ *
+ {{$t('LabelName')}}
+
+
-
-
-
Date: Thu, 4 Aug 2022 09:59:24 +0800
Subject: [PATCH 23/54] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=B9=E6=94=B6?=
=?UTF-8?q?=E9=9B=86=E6=B8=85=E5=8D=95=E6=B7=BB=E5=8A=A0=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jero-web/src/components/ParameterLibraryAdd/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/jero-web/src/components/ParameterLibraryAdd/index.vue b/jero-web/src/components/ParameterLibraryAdd/index.vue
index f64e2d323..537bd69ab 100644
--- a/jero-web/src/components/ParameterLibraryAdd/index.vue
+++ b/jero-web/src/components/ParameterLibraryAdd/index.vue
@@ -240,7 +240,7 @@ export default {
let postDate = {
paramsInfoPublishEOList: this.selectedRowKeysDate,
paramsManifestId: this.paramsManifest.id,
- projectId: this.$route.query.id
+ projectId: this.$route.query.projectId
}
postAction(`params/collectManifest/add`, postDate).then(res => {
if (res.success) {
From 5c414cf52c40aa8f51134e4fba0363dde0ed4409 Mon Sep 17 00:00:00 2001
From: liyawei
Date: Thu, 4 Aug 2022 10:07:49 +0800
Subject: [PATCH 24/54] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?=
=?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86-=E6=89=B9=E9=87=8F=E5=88=A0?=
=?UTF-8?q?=E9=99=A4-=E4=BF=AE=E6=94=B9bug=EF=BC=9A=E5=88=A0=E9=99=A4?=
=?UTF-8?q?=E6=9C=AA=E6=94=B6=E9=9B=86=E5=8F=AA=E5=89=A9=E5=B7=B2=E4=B8=8A?=
=?UTF-8?q?=E6=8A=A5=E5=8F=82=E6=95=B0=E5=90=8E=E6=B8=85=E5=8D=95=E7=8A=B6?=
=?UTF-8?q?=E6=80=81=E6=9C=AA=E6=94=B9=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ParamsCollectManifestEOController.java | 7 ++--
.../IParamsCollectManifestEOService.java | 11 +++++-
.../ParamsCollectManifestEOServiceImpl.java | 37 ++++++++++++++++++-
3 files changed, 49 insertions(+), 6 deletions(-)
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
index 6ee8b20a4..35994b066 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
@@ -23,7 +23,6 @@ import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -173,15 +172,15 @@ public class ParamsCollectManifestEOController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- boolean isSuccess = paramsCollectManifestEOService.deleteByIds(Arrays.asList(ids.split(",")));
+ public Result deleteBatch(ParamsCollectManifestVO paramsCollectManifestVO) {
+ boolean isSuccess = paramsCollectManifestEOService.deleteBatch(paramsCollectManifestVO);
if (isSuccess) {
return Result.OK("批量删除成功！");
} else {
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java
index 8ba0fa9e6..fac103ab5 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java
@@ -43,13 +43,22 @@ public interface IParamsCollectManifestEOService extends IService ids);
+
+ /**
+ * 批量删除-参数项收集页面级
+ *
+ * @param paramsCollectManifestVO
+ * @return
+ */
+ boolean deleteBatch(ParamsCollectManifestVO paramsCollectManifestVO);
+
/**
* 通过id查询
*
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index 91bfb3d99..9da886739 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -235,7 +235,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl ids = Arrays.asList(paramsCollectManifestVO.getIds().split(","));
+ String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
+
+ // 删除参数项
+ boolean isSuccess = removeByIds(ids);
+ // 关联删除配置数据
+ paramsConfigDataEOService.deleteByParamsCollectManifestIdList(ids);
+
+ // 判断清单收集状态
+ Map map = isCollectFinished(paramsManifestId);
+ Boolean finish = (Boolean) map.get("finish");
+ Date time = (Date) map.get("time");
+ if (finish) {
+ // 更新清单状态和完成时间
+ ParamsManifestEO updateParamsManifestEO = new ParamsManifestEO();
+ updateParamsManifestEO.setId(paramsManifestId);
+ updateParamsManifestEO.setState(ManifestStateEnum.FINISHED.getValue());
+ updateParamsManifestEO.setFinishTime(time);
+ boolean isSuccess2 = paramsManifestEOService.updateById(updateParamsManifestEO);
+ if (isSuccess2) {
+ webSocketServer.sendMessage();
+ }
+ }
+
+ return isSuccess;
+ }
+
/**
* 通过id查询
*
From f7b55b5f32ff64693259b1439a7d5a9f0ec97070 Mon Sep 17 00:00:00 2001
From: "zyx.net"
Date: Thu, 4 Aug 2022 10:39:56 +0800
Subject: [PATCH 25/54] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9=E6=8E=A8=E9=80=81=E6=8C=89=E9=92=AE=E4=B8=BA=E5=88=86?=
=?UTF-8?q?=E4=BA=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jero-web/src/common/lang/en-us.js | 1 +
jero-web/src/common/lang/zh-cn.js | 1 +
jero-web/src/views/documentManage/library/index.vue | 2 +-
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index cddee045e..355390f1c 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1233,4 +1233,5 @@ module.exports = {
displayInformation:'Display information',
addComparison:'Add comparison',
showOrNot:'Show or not',
+ share:'share',
}
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 2b024825c..fd8e3409e 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1336,4 +1336,5 @@ module.exports = {
displayInformation:'展示信息',
addComparison:'添加对比',
showOrNot:'是否展示',
+ share:'分享',
}
\ No newline at end of file
diff --git a/jero-web/src/views/documentManage/library/index.vue b/jero-web/src/views/documentManage/library/index.vue
index cd12fa778..b5caea42c 100644
--- a/jero-web/src/views/documentManage/library/index.vue
+++ b/jero-web/src/views/documentManage/library/index.vue
@@ -18,7 +18,7 @@
- *
- {{$t('LabelType')}}
+
+
+
+
+
-
-
-
-
-
+
+
-
+ *
+ {{$t('LabelType')}}
+
+
-
-
-
+
+
\ No newline at end of file
From 4a433711cdfa33674257e74835632f45c2ef61a4 Mon Sep 17 00:00:00 2001
From: "zyx.net"
- *
- {{$t('dropDownOptions')}}
+
+
+
+
+
-
- {{$t('dropDownOptionMaintenance')}}
-
-
-
-
-
-
+
+
+ {{$t('dropDownOptionMaintenance')}}
+
+
-
+ *
+ {{$t('dropDownOptions')}}
+
+
-
-
-
- *
- {{$t('DisplayOrder')}}
+
+
+
+
+
-
-
-
-
-
+
+
-
+ *
+ {{$t('DisplayOrder')}}
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
From 1ddf2274982b91e0814f691e53290b9df6a22fc0 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 4 Aug 2022 09:58:39 +0800
Subject: [PATCH 22/54] =?UTF-8?q?=E5=B8=83=E5=B1=80=E7=9F=A5=E8=AF=86?=
=?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/countryCardRelease.vue | 9 +-
.../components/countryCardReleaseAdd.vue | 230 ++++++++++++++++++
2 files changed, 236 insertions(+), 3 deletions(-)
create mode 100644 jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue
index 16f764ed2..e39f8816f 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue
@@ -96,17 +96,20 @@
+
+
+
+
+
-
-
-
-
-
+
+
-
{{$t('associatedWebsite')}}
+
+
-
+
+
+
\ No newline at end of file
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/optionMaintenanceAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/optionMaintenanceAdd.vue
new file mode 100644
index 000000000..8b6f1d610
--- /dev/null
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/optionMaintenanceAdd.vue
@@ -0,0 +1,215 @@
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
-
{{$t('describe')}}
+
+
+
+
+
+
+ *
+ {{$t('name')}}
+
+
+
+
+
+
+ *
+ {{$t('enName')}}
+
+
+
+
+
+
+ *
+ {{$t('DisplayOrder')}}
+
+
+
+
+
+
+ {{$t('describe')}}
+
+
+
+
+ {{$t('sdt')}}
+
+
- queryWrapper = QueryGenerator.initQueryWrapper(lawsMonthlyReportWriteEOTemp, req.getParameterMap());
queryWrapper.orderByDesc("create_time");
+ //管理员查看全部数据,其余人只能查看自己的数据
+ LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ List rolesList = sysBaseApi.getRolesByUsername(currentUser.getUsername());
+ if(!rolesList.contains(ProjectRoleEnum.ADMIN.getCode())){
+ queryWrapper.in("create_by",currentUser.getUsername());
+ }
Page page = new Page(pageNo, pageSize);
Page pageInfo = this.page(page, queryWrapper);
//法规月报id
From cd8fce4ed368f7074fdfdf51175c8ab0c03e8583 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 4 Aug 2022 16:45:21 +0800
Subject: [PATCH 42/54] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E7=AE=A1=E7=90=86--?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E5=80=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/impl/LawsMonthlyReportManageEOServiceImpl.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java
index 2dd8d1757..339832758 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java
@@ -103,6 +103,7 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl pageInfo = this.page(page, queryWrapper);
return pageInfo;
}
From e25d1a6af3700d14d6f2cf4434ecd9052065803a Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 4 Aug 2022 17:04:25 +0800
Subject: [PATCH 43/54] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=A1=AB=E5=86=99?=
=?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=9C=AA=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java
index 78fe59813..4401d668d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java
@@ -98,6 +98,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl
Date: Thu, 4 Aug 2022 17:15:13 +0800
Subject: [PATCH 44/54] =?UTF-8?q?=E6=A0=87=E9=A2=98=E6=A8=A1=E6=9D=BF?=
=?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/LawsMonthlyReportTitleTemplateEOController.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java
index 4ccc7a42f..a4ec13edc 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java
@@ -100,7 +100,7 @@ public class LawsMonthlyReportTitleTemplateEOController extends JeroController edit(@Validated @RequestBody LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEO) {
lawsMonthlyReportTitleTemplateEOService.editById(lawsMonthlyReportTitleTemplateEO);
return Result.OK("编辑成功!");
From ed5ed2923340a2de080b3a78b3f8cf0aadbd6284 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 4 Aug 2022 17:17:15 +0800
Subject: [PATCH 45/54] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?=
=?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/PersonnelSelection/index.vue | 1 +
.../components/initiatingProcess.vue | 11 ++++
.../components/feedbackInformation.vue | 7 ++-
.../components/standardContent.vue | 54 +++++++++++++++----
.../processForm/regulatoryProcess/index.vue | 3 +-
5 files changed, 64 insertions(+), 12 deletions(-)
diff --git a/jero-web/src/components/PersonnelSelection/index.vue b/jero-web/src/components/PersonnelSelection/index.vue
index 59a15eb92..476db1404 100644
--- a/jero-web/src/components/PersonnelSelection/index.vue
+++ b/jero-web/src/components/PersonnelSelection/index.vue
@@ -15,6 +15,7 @@
+
@@ -86,7 +86,7 @@
pageNo: 1,
dataSource: [],
formInline: {},
- userInfoQuery:{},
+ userInfoQuery: {},
columns: [
{
title: this.$t('relevantSections'),
@@ -135,7 +135,7 @@
}
},
mounted() {
- this.userInfoQuery = this.userInfo()
+ this.userInfoQuery = this.userInfo()
},
methods: {
...mapGetters(['userInfo']),
@@ -178,8 +178,8 @@
//导出
handleExport() {
let query = {
- pageSize:this.pageSize,
- pageNo:this.pageNo,
+ pageSize: this.pageSize,
+ pageNo: this.pageNo,
lawsOpinionGatherId: this.lawsOpinionGatherId,
actiProcInstId: this.actiProcInstId
}
@@ -201,7 +201,7 @@
this.pageNo = page
this.getList()
},
- SizeChange(page,pageSize) {
+ SizeChange(page, pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.getList()
@@ -210,8 +210,8 @@
let query = {
lawsOpinionGatherId: this.lawsOpinionGatherId,
actiProcInstId: this.actiProcInstId,
- pageSize:this.pageSize,
- pageNo:this.pageNo
+ pageSize: this.pageSize,
+ pageNo: this.pageNo
}
this.loading = true
getAction('/lawsOpinionGather/lawsOpinionAssessmentResultEO/page', query).then((res) => {
diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
index 232ff83e1..6fdb2362f 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
@@ -141,7 +141,7 @@
addModelList: '/dummy/dummyInventoryInfoEO/queryPageDummy'
},
loading: false,
- JLoading:false,
+ JLoading: false,
dataSource: [],
selectedRowKeys: [],
total: 0,
@@ -172,12 +172,14 @@
align: 'center',
dataIndex: 'serial_number',
width: 170,
+ ellipsis: true,
scopedSlots: { customRender: 'serial_number' }
},
{
title: this.$t('title'),
align: 'center',
dataIndex: 'title',
+ ellipsis: true,
width: 170,
scopedSlots: { customRender: 'titleName' }
},
@@ -232,7 +234,7 @@
this.pageNo = page
this.getList()
},
- SizeChange(page,pageSize) {
+ SizeChange(page, pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.getList()
@@ -261,7 +263,7 @@
if (this.selectedRowKeys.length > 1) {
this.selectedRowKeys.shift()
}
- this.selectedRowKeysRecord = record.filter(res=>{
+ this.selectedRowKeysRecord = record.filter(res => {
return res.id == this.selectedRowKeys[0]
})
this.selectedRowKeysRecord = [...this.selectedRowKeysRecord]
@@ -297,14 +299,14 @@
dateChange(item) {
this.formInline[item] = this.formInline[item] ? moment(this.formInline[item]).format('YYYY-MM-DD') : ''
},
- getUUID(){
- var str=[];
- var Chars='0123456789abcdefghijklmnopqrstuvwxyz';
- for(var i=0;i<36;i++){
- str[i]=Chars.substr(Math.floor(Math.random()*16),1)
+ getUUID() {
+ var str = []
+ var Chars = '0123456789abcdefghijklmnopqrstuvwxyz'
+ for (var i = 0; i < 36; i++) {
+ str[i] = Chars.substr(Math.floor(Math.random() * 16), 1)
}
- str[0]=str[8]=str[13]=str[18]=str[23]='-';
- return str.join("")
+ str[0] = str[8] = str[13] = str[18] = str[23] = '-'
+ return str.join('')
},
submit() {
this.$refs.ruleForm.validate(valid => {
@@ -338,7 +340,7 @@
postAction('/workFlow/startProcess', query).then((res) => {
if (res.success) {
this.completeTask(value, res.result)
- }else{
+ } else {
this.JLoading = false
}
})
diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
index 0f0d418b3..173a0f4e2 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
@@ -92,7 +92,10 @@
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
:columns="columns"
>
-
+
+ {{text}}
+
+
{{$t('viewProcess')}}
{{$t('evaluationResults')}}
@@ -157,7 +160,8 @@
align: 'center',
dataIndex: 'serialNumber',
ellipsis: true,
- width: 170
+ width: 170,
+ scopedSlots: { customRender: 'serialNumber' }
},
{
title: this.$t('title'),
@@ -235,7 +239,7 @@
this.pageNo = page
this.getList()
},
- SizeChange(page,pageSize) {
+ SizeChange(page, pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.getList()
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
index 168270ba7..08db600d4 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
@@ -250,12 +250,14 @@
align: 'center',
dataIndex: 'serial_number',
width: 170,
+ ellipsis: true,
scopedSlots: { customRender: 'serial_number' }
},
{
title: this.$t('title'),
align: 'center',
dataIndex: 'title',
+ ellipsis: true,
width: 170,
scopedSlots: { customRender: 'titleName' }
},
@@ -335,7 +337,7 @@
this.pageNo = page
this.getList()
},
- SizeChange(page,pageSize) {
+ SizeChange(page, pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.getList()
From bae86a49a305f7c9f68581dee0ef04d5180da3b1 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 4 Aug 2022 16:41:26 +0800
Subject: [PATCH 41/54] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=A1=AB=E5=86=99?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../impl/LawsMonthlyReportWriteEOServiceImpl.java | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java
index 6a484cceb..78fe59813 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java
@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.constant.enums.CutEnum;
import com.jero.common.constant.enums.ModuleEnum;
import com.jero.common.system.query.QueryGenerator;
+import com.jero.common.system.vo.LoginUser;
import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl;
import com.jero.modules.document.enums.FieldTypeEnum;
@@ -29,11 +30,14 @@ import com.jero.modules.report.service.INewStandardTemplateEOService;
import com.jero.modules.report.util.WordUtil;
import com.jero.modules.system.entity.SysCategory;
import com.jero.modules.system.entity.SysDictItem;
+import com.jero.modules.system.enums.ProjectRoleEnum;
+import com.jero.modules.system.service.impl.SysBaseApiImpl;
import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
import com.jero.modules.system.util.StringUtils;
import org.apache.poi.xwpf.usermodel.ParagraphAlignment;
import org.apache.poi.xwpf.usermodel.XWPFDocument;
+import org.apache.shiro.SecurityUtils;
import org.aspectj.util.FileUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -81,6 +85,8 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl
-
-
+
-
+
+ {{ (item.accessoryFile === 'null' || item.accessoryFile === '' ||
+ item.accessoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+ }}
+
@@ -67,25 +64,26 @@
:prop="'dataList.'+index+'.reason'"
:rules="[{max: 300,message: $t('reason') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
}]">
-
-
- {{ (item.accessoryFile === 'null' || item.accessoryFile === '' ||
- item.accessoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles')
- }}
-
+
+
From 71e5a697f67ec1c42f1ba6993ce48224eab53176 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 4 Aug 2022 18:01:19 +0800
Subject: [PATCH 48/54] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?=
=?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/modules/defaultTemplate.vue | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue
index 23ffd3f15..3ccb0896f 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue
@@ -249,11 +249,11 @@
@@ -382,6 +382,12 @@
} else {
this.formInline.technologyTerritory = []
}
+ if (!this.formInline.useMethod) {
+ this.formInline.useMethod = undefined
+ }
+ if (!this.formInline.state) {
+ this.formInline.state = undefined
+ }
this.formInline = { ...this.formInline }
} else {
this.formInline = {}
@@ -443,6 +449,12 @@
formInline[res] = formInline[res].join(',')
}
})
+ if (!formInline.state || formInline.state == '' || formInline.state == 'null') {
+ formInline.state = ''
+ }
+ if (!formInline.useMethod || formInline.useMethod == '' || formInline.useMethod == 'null') {
+ formInline.useMethod = ''
+ }
callback && callback(formInline)
}
})
From 0ef92f8027c330010e88bd479020671f7b445b7e Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Thu, 4 Aug 2022 18:06:54 +0800
Subject: [PATCH 49/54] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=9F=A5=E8=AF=86?=
=?UTF-8?q?=E5=BA=93-=E6=A8=A1=E6=9D=BF=E7=BB=B4=E6=8A=A4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../CountryCardTempEOController.java | 20 +++++--
.../CountryCardTempItemEOController.java | 6 +-
.../entity/CountryCardTempEO.java | 9 +++
.../enums/LableTypeEnum.java | 49 +++++++++++++++
.../service/ICountryCardTempEOService.java | 11 +++-
.../ICountryCardTempItemEOService.java | 7 ++-
...yCardManageReleaseDetailEOServiceImpl.java | 3 +
...CountryCardManageReleaseEOServiceImpl.java | 3 +
.../impl/CountryCardTempEOServiceImpl.java | 60 ++++++++++++++++++-
.../CountryCardTempItemEOServiceImpl.java | 46 +++++++++++++-
...ledgeBaseBrowsingHistoryEOServiceImpl.java | 3 +
...lemKnowledgeBaseClassifyEOServiceImpl.java | 3 +
...blemKnowledgeBaseCollectEOServiceImpl.java | 3 +
...blemKnowledgeBaseCommentEOServiceImpl.java | 3 +
.../ProblemKnowledgeBaseEOServiceImpl.java | 3 +
...oblemKnowledgeBasePraiseEOServiceImpl.java | 3 +
...ProblemKnowledgeBaseUserEOServiceImpl.java | 3 +
17 files changed, 222 insertions(+), 13 deletions(-)
create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/enums/LableTypeEnum.java
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardTempEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardTempEOController.java
index fd9c18425..9c56a1552 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardTempEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardTempEOController.java
@@ -1,5 +1,6 @@
package com.jero.modules.problemKnowledgeBase.controller;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
@@ -35,7 +36,7 @@ import com.jero.common.aspect.annotation.AutoLog;
public class CountryCardTempEOController extends JeroController
@@ -63,7 +63,10 @@
+
{{$t('reason')}}
-
-
diff --git a/jero-web/src/views/processCenter/components/feedbackInformation.vue b/jero-web/src/views/processCenter/components/feedbackInformation.vue
index c8e8a146f..b237e6c53 100644
--- a/jero-web/src/views/processCenter/components/feedbackInformation.vue
+++ b/jero-web/src/views/processCenter/components/feedbackInformation.vue
@@ -41,18 +41,15 @@
+
@@ -95,7 +95,7 @@
visible: false,
languageList: [
{
- text: this.$t('chinese'),
+ text: this.$t('simplifiedChinese'),
value: 1
},
{
@@ -275,7 +275,7 @@
.button-text {
height: 38px;
- width: calc(100% - 100px);
+ width: 100%;
line-height: 38px;
background: #fff;
border: 1px #00B3BE solid;
diff --git a/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue b/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue
index c13dbc0ca..4298fc61f 100644
--- a/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue
+++ b/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue
@@ -94,7 +94,7 @@
-
{{item.title}}
{{ $t('viewFile') }}
-
{{queryForm[item.value]}}
@@ -58,14 +58,14 @@
type: Object,
default: {}
},
- title:{
- type:String,
- default:'',
- },
- isConfirmationDeadline:{
- type:Boolean,
- default:false,
+ title: {
+ type: String,
+ default: ''
},
+ isConfirmationDeadline: {
+ type: Boolean,
+ default: false
+ }
},
components: {
viewFileModel
@@ -77,6 +77,7 @@
},
mounted() {
this.queryForm = this.standardContentQuery
+ this.queryForm.taskExplain = 'sdf dsjf;l sdf;ldsf ;lsdfkj d;lsfkds;lfdksf第三方是德国搞定过分乐观看待给对方；公开地方领导反馈给东丽的反馈给管库给的给'
},
methods: {
urlClick(val) {
@@ -147,5 +148,40 @@
cursor: pointer;
}
}
+
+ .text-content-button-one {
+ width: 100%;
+
+ .text-field-left {
+ width: 124px;
+ display: inline-block;
+ font-size: 14px;
+ font-weight: 400;
+ color: #6F7385;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ overflow: hidden;
+ margin-right: 24px;
+ float: left;
+ margin-top: 3px;
+ }
+
+ .text-field-right {
+ width: calc(100% - 200px);
+ display: inline-block;
+ font-size: 16px;
+ text-overflow: ellipsis;
+ white-space: pre-wrap;
+ overflow: visible;
+ float: left;
+ color: #040B29;
+ font-weight: 400;
+ }
+
+ .text-field-right-url {
+ color: #00B3BE !important;
+ cursor: pointer;
+ }
+ }
}
\ No newline at end of file
diff --git a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
index 29935870b..503b8409d 100644
--- a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
@@ -88,7 +88,8 @@
{},
{
title: this.$t('taskDescription'),
- value: 'taskExplain'
+ value: 'taskExplain',
+ type:4,
}
// {
// title: this.$t('remarks'),
From e43ff1cb3f64b55c91638ea8f808df14154b91dc Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 4 Aug 2022 17:40:18 +0800
Subject: [PATCH 46/54] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=A0=87=E9=A2=98--?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
...nthlyReportTitleTemplateEOServiceImpl.java | 22 ++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java
index 151bfe9d2..c2c35988f 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java
@@ -5,12 +5,15 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.constant.enums.CutEnum;
+import com.jero.common.exception.JeroBootException;
import com.jero.common.system.query.QueryGenerator;
import com.jero.modules.report.entity.LawsMonthlyReportTitleTemplateEO;
+import com.jero.modules.report.entity.LawsMonthlyReportWriteEO;
import com.jero.modules.report.mapper.LawsMonthlyReportTitleTemplateEOMapper;
import com.jero.modules.report.service.ILawsMonthlyReportTitleTemplateEOService;
import com.jero.modules.report.vo.LawsMonthlyReportTitleTemplateVO;
import com.jero.modules.system.util.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
@@ -30,6 +33,8 @@ import java.util.stream.Collectors;
@Service
public class LawsMonthlyReportTitleTemplateEOServiceImpl extends ServiceImpl implements ILawsMonthlyReportTitleTemplateEOService {
+ @Autowired
+ private LawsMonthlyReportWriteEOServiceImpl lawsMonthlyReportWriteEOService;
/**
* 保存
*
@@ -98,7 +103,22 @@ public class LawsMonthlyReportTitleTemplateEOServiceImpl extends ServiceImpl ids) {
- removeByIds(ids);
+ //标题下存在内容或子标题时不能删除
+ //1. 判断是否存在子标题
+ LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>();
+ wrapper.in(LawsMonthlyReportTitleTemplateEO::getParentId,ids);
+ List list = this.list(wrapper);
+ if(list.size() != 0){
+ throw new JeroBootException("该标题下存在子标题,不能删除");
+ }
+ //2. 判断是否存在内容 memories_chapter
+ LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.in(LawsMonthlyReportWriteEO::getMemoriesChapter,ids);
+ List lawsMonthlyReportWriteEOS = lawsMonthlyReportWriteEOService.list(lambdaQueryWrapper);
+ if(lawsMonthlyReportWriteEOS.size() != 0){
+ throw new JeroBootException("该标题下存在新增内容,不能删除");
+ }
+ removeByIds(ids);
}
/**
From fccf1cbf6acc02fd5582be482e0760bf4cdd0626 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 4 Aug 2022 17:50:00 +0800
Subject: [PATCH 47/54] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?=
=?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jero-web/src/common/lang/en-us.js | 4 +-
jero-web/src/common/lang/zh-cn.js | 2 +
jero-web/src/components/uploadFile/file.vue | 8 ++--
.../RegulationMonthlyManagement.vue | 10 ++---
.../components/modules/fillTable.vue | 2 +-
.../components/modules/fillTableAdd.vue | 10 ++++-
.../components/modules/managementAdd.vue | 8 ++--
.../components/addModel.vue | 2 +-
.../components/feedbackInformation.vue | 44 +++++++++----------
9 files changed, 50 insertions(+), 40 deletions(-)
diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 7e92066b7..b1946fe76 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1235,5 +1235,7 @@ module.exports = {
addComparison: 'Add comparison',
showOrNot: 'Show or not',
comparisonMarket: 'Comparison Market',
- share: 'share'
+ share: 'share',
+ simplifiedChinese:'Simplified Chinese',
+ uploadOnly:'Upload only',
}
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 52078ad02..85ff24ea2 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1339,4 +1339,6 @@ module.exports = {
showOrNot:'是否展示',
comparisonMarket:'对比市场',
share:'分享',
+ simplifiedChinese:'简体中文',
+ uploadOnly:'只能上传',
}
\ No newline at end of file
diff --git a/jero-web/src/components/uploadFile/file.vue b/jero-web/src/components/uploadFile/file.vue
index b27182372..510dc1a4c 100644
--- a/jero-web/src/components/uploadFile/file.vue
+++ b/jero-web/src/components/uploadFile/file.vue
@@ -34,7 +34,7 @@
export default {
name: 'file',
- props: ['disableds', 'disabled', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads'],
+ props: ['disableds', 'disabled', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads', 'Uploadable'],
data() {
return {
visible: false,
@@ -68,7 +68,7 @@
if (this.isMultiple) {
this.multiple = false
}
- this.accept = this.restrictUploads ? '.docx,.doc' : '*.*'
+ this.accept = this.restrictUploads ? this.Uploadable : '*.*'
// console.log(this.thisFileType,this.thisFileSize,this.thisFileUploadUrl);
},
methods: {
@@ -99,10 +99,10 @@
let index1 = fileName.lastIndexOf('.')
let index2 = fileName.length
let fileSuffix = fileName.substring(index1, index2)
- if (fileSuffix == '.docx' || fileSuffix == '.doc') {
+ if (this.Uploadable.includes(fileSuffix)) {
} else {
- this.$message.warning(this.$t('onlyFilesUploaded'))
+ this.$message.warning(this.$t('uploadOnly') + this.Uploadable + this.$t('file'))
return false
}
}
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue
index 77c7b5dd3..a6b3cc5e1 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue
@@ -44,7 +44,7 @@
:columns="columns"
>
- {{text == 1?$t('chinese'):$t('English')}}
+ {{text == 1?$t('simplifiedChinese'):$t('English')}}
{{text}}
@@ -151,7 +151,7 @@
title: this.$t('operation'),
align: 'center',
fixed: 'right',
- width: 180,
+ width: 240,
scopedSlots: { customRender: 'operation' }
}
]
@@ -179,7 +179,7 @@
this.pageNo = page
this.getList()
},
- SizeChange(page,pageSize) {
+ SizeChange(page, pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.getList()
@@ -220,9 +220,9 @@
let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.fileId + fileSuffix)
window.open(url, '_blank')
} else {
- if (item.createBy == this.userInfo().username){
+ if (item.createBy == this.userInfo().username) {
downloadFile('/sys/common/downLoadFile', item.name, { id: item.fileId, userName: this.userInfo().username })
- }else{
+ } else {
this.$message.warning(this.$t('theDoesNotSupportPreview'))
}
}
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue
index a93e3f426..df745bf88 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue
@@ -97,7 +97,7 @@
title: this.$t('operation'),
align: 'center',
fixed: 'right',
- width: 180,
+ width: 280,
scopedSlots: { customRender: 'operation' }
}
]
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue
index 15940fc5e..51b79e4d2 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue
@@ -51,6 +51,7 @@
class="box-input"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
allowClear
+ :disabled="isParentId"
v-model="formInline.parentId">
{
+ this.isParentId = false
this.formInline = {}
this.$refs.ruleForm.clearValidate()
})
@@ -139,8 +142,13 @@
this.title = this.$t('edit')
this.visible = true
this.getParent()
+ this.isParentId = false
this.$nextTick(() => {
this.formInline = row
+ if (!row.parentId) {
+ this.formInline.parentId = undefined
+ this.isParentId = true
+ }
this.$refs.ruleForm.clearValidate()
})
},
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/managementAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/managementAdd.vue
index 9fb30c097..2fdbfc14e 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/managementAdd.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/managementAdd.vue
@@ -38,7 +38,6 @@
@@ -61,7 +60,8 @@
{{$t('submit')}}
-
- *
- {{$t('questionsSuggestions')}}
+ {{$t('enclosure')}}
-
- {{$t('enclosure')}}
+ *
+ {{$t('questionsSuggestions')}}
-