From 179ea619321d4bcdf46ec95099197c391a00b477 Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Thu, 4 Jan 2024 18:09:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=B8=B8=E9=A2=98=E5=BA=93=E4=B8=8A?= =?UTF-8?q?=E9=9D=A2=E5=86=8D=E5=8A=A0=E4=B8=80=E5=B1=82=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E5=88=86=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 3 +- .../project/smallProgram/question/add.html | 1 + .../project/smallProgram/question/view.html | 16 +- .../project/smallProgram/questionLib/add.html | 35 +++ .../smallProgram/questionLib/detail.html | 29 +++ .../smallProgram/questionLib/edit.html | 36 +++ .../smallProgram/questionLib/view.html | 208 ++++++++++++++++++ .../controller/QuestionBankController.java | 7 +- .../controller/QuestionLibraryController.java | 141 ++++++++++++ .../zdxt/knowledge/domain/QuestionBank.java | 11 + .../knowledge/domain/QuestionLibrary.java | 91 ++++++++ .../mapper/QuestionLibraryMapper.java | 70 ++++++ .../service/IQuestionLibraryService.java | 68 ++++++ .../impl/QuestionLibraryServiceImpl.java | 107 +++++++++ .../resources/mapper/QuestionBankMapper.xml | 19 +- .../mapper/QuestionLibraryMapper.xml | 114 ++++++++++ .../zdxt/knowledge/dto/QuestionBankBean.java | 11 + 17 files changed, 953 insertions(+), 14 deletions(-) create mode 100644 lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/questionLib/add.html create mode 100644 lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/questionLib/detail.html create mode 100644 lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/questionLib/edit.html create mode 100644 lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/questionLib/view.html create mode 100755 lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/QuestionLibraryController.java create mode 100755 lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/QuestionLibrary.java create mode 100755 lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/QuestionLibraryMapper.java create mode 100755 lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/IQuestionLibraryService.java create mode 100755 lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/QuestionLibraryServiceImpl.java create mode 100755 lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/QuestionLibraryMapper.xml diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application.yml b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application.yml index 81a28074..db6f594c 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application.yml +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application.yml @@ -10,8 +10,7 @@ ruoyi: demoEnabled: true # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） # profile: E:/ruoyi/uploadPath -# profile: /Users/kylin_stone/Workspaces/uploads - profile: /Users/yan/upload + profile: /Users/kylin_stone/Workspaces/uploads # 获取ip地址开关 addressEnabled: true diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/question/add.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/question/add.html index ffe3f834..2649a7d8 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/question/add.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/question/add.html @@ -9,6 +9,7 @@
+
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/question/view.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/question/view.html index 7edae267..00731b1d 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/question/view.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/question/view.html @@ -9,6 +9,7 @@
+
  • 标题： @@ -23,7 +24,7 @@
- + 新增 @@ -59,11 +60,12 @@ function initTable() { var options = { url: prefix + "/list", - createUrl: prefix + "/add", + createUrl: prefix + "/add/{id}", updateUrl: prefix + "/edit/{id}", detailUrl: prefix + "/detail/{id}", removeUrl: prefix + "/remove", importUrl: prefix + "/importData", + queryParams: queryParams, sortName: "srot", modalName: "知识点", uniqueId:"guid", @@ -150,6 +152,12 @@ $.table.init(options); } + function queryParams(params) { + var search = $.table.queryParams(params); + search.questionLibId = $("#questionLibId").val(); + return search; + } + /** 发布 */ function toPublishState(key, state) { $.ajax({ @@ -195,6 +203,10 @@ } } + function toAdd() { + $.operate.add($("#questionLibId").val()); + } + function removeAll() { var ids = ""; var isRemove = true; diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/questionLib/add.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/questionLib/add.html new file mode 100644 index 00000000..0124f4ca --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/questionLib/add.html @@ -0,0 +1,35 @@ + + + + + + +
+ +
+ +
+ +
+
+
+ +
+ +
+
+ +
+ + + + diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/questionLib/detail.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/questionLib/detail.html new file mode 100644 index 00000000..e8a11f0d --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/questionLib/detail.html @@ -0,0 +1,29 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/questionLib/edit.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/questionLib/edit.html new file mode 100644 index 00000000..d4c256ac --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/questionLib/edit.html @@ -0,0 +1,36 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/questionLib/view.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/questionLib/view.html new file mode 100644 index 00000000..19c706db --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/questionLib/view.html @@ -0,0 +1,208 @@ + + + + + + +
+
+
+
+
+ +
+
+
+ + + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/QuestionBankController.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/QuestionBankController.java index d6a5490c..9594e726 100755 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/QuestionBankController.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/QuestionBankController.java @@ -64,9 +64,10 @@ public class QuestionBankController extends BaseController /** * 新增题库 */ - @GetMapping("/add") - public String add() + @GetMapping("/add/{key}") + public String add(@PathVariable("key") String key, ModelMap mmap) { + mmap.put("questionLibId", key); return prefix + "/add"; } @@ -139,7 +140,7 @@ public class QuestionBankController extends BaseController /** * 修改发布状态 */ - @RequiresPermissions("small:library:edit") + @RequiresPermissions("small:question:edit") @PostMapping("/toPublishState") @ResponseBody public ZDResponse toPublishState(String ids, String state) diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/QuestionLibraryController.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/QuestionLibraryController.java new file mode 100755 index 00000000..2e1a899e --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/QuestionLibraryController.java @@ -0,0 +1,141 @@ +package com.zdxt.knowledge.controller; + +import java.util.List; + +import com.zdxt.common.ZDResponse; +import com.zdxt.common.controller.BaseController; +import com.zdxt.common.util.TableDataInfo; +import com.zdxt.knowledge.domain.QuestionLibrary; +import com.zdxt.knowledge.service.IQuestionLibraryService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 题库Controller + * + * @author ruoyi + * @date 2024-01-04 + */ +@Controller +@RequestMapping("/small/questionLib") +public class QuestionLibraryController extends BaseController +{ + private String prefix = "project/smallProgram/questionLib"; + + @Autowired + private IQuestionLibraryService questionLibraryService; + + @RequiresPermissions("small:questionLib:view") + @GetMapping() + public String library() + { + return prefix + "/view"; + } + + /** + * 查询题库列表 + */ + @RequiresPermissions("small:questionLib:view") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(QuestionLibrary questionLibrary) + { + startPage(); + List list = questionLibraryService.selectQuestionLibraryList(questionLibrary); + return getDataTable(list); + } + + /** + * 题库详情 + */ + @GetMapping("/detail/{guid}") + public String detail(@PathVariable("guid") String guid, ModelMap mmap) + { + QuestionLibrary questionLibrary = questionLibraryService.selectQuestionLibraryById(guid); + mmap.put("questionLibrary", questionLibrary); + return prefix + "/detail"; + } + + /** + * 新增题库 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存题库 + */ + @RequiresPermissions("small:questionLib:add") + @PostMapping("/add") + @ResponseBody + public ZDResponse addSave(QuestionLibrary questionLibrary) + { + int resNum = questionLibraryService.insertQuestionLibrary(questionLibrary); + return resNum>0?ZDResponse.success("操作成功", resNum):ZDResponse.error("操作失败", resNum); + } + + /** + * 修改题库 + */ + @GetMapping("/edit/{guid}") + public String edit(@PathVariable("guid") String guid, ModelMap mmap) + { + QuestionLibrary questionLibrary = questionLibraryService.selectQuestionLibraryById(guid); + mmap.put("questionLibrary", questionLibrary); + return prefix + "/edit"; + } + + /** + * 修改保存题库 + */ + @RequiresPermissions("small:questionLib:edit") + @PostMapping("/edit") + @ResponseBody + public ZDResponse editSave(QuestionLibrary questionLibrary) + { + int resNum = questionLibraryService.updateQuestionLibrary(questionLibrary); + return resNum>0?ZDResponse.success("操作成功", resNum):ZDResponse.error("操作失败", resNum); + } + + /** + * 删除题库 + */ + @RequiresPermissions("small:questionLib:remove") + @PostMapping( "/remove") + @ResponseBody + public ZDResponse remove(String ids) + { + int resNum = questionLibraryService.deleteQuestionLibraryByIds(ids); + return resNum>0?ZDResponse.success("操作成功", resNum):ZDResponse.error("操作失败", resNum); + } + + /** + * 修改发布状态 + */ + @RequiresPermissions("small:library:edit") + @PostMapping("/toPublishState") + @ResponseBody + public ZDResponse toPublishState(String ids, String state) + { + int resNum = questionLibraryService.updatePublishState(ids, state); + return resNum>0?ZDResponse.success("操作成功", resNum):ZDResponse.error("操作失败", resNum); + } + + @RequiresPermissions("small:library:view") + @GetMapping("/toBanks/{key}") + public String toBanks(@PathVariable("key") String key, ModelMap mmap) + { + mmap.put("questionLibId", key); + return "project/smallProgram/question/view"; + } +} diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/QuestionBank.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/QuestionBank.java index dd207528..22d0b779 100755 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/QuestionBank.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/QuestionBank.java @@ -15,6 +15,9 @@ public class QuestionBank extends BaseDomain /** 主键 */ private String guid; + /** 关联库id */ + private String questionLibId; + /** 标题 */ private String title; @@ -50,6 +53,14 @@ public class QuestionBank extends BaseDomain this.guid = guid; } + public String getQuestionLibId() { + return questionLibId; + } + + public void setQuestionLibId(String questionLibId) { + this.questionLibId = questionLibId; + } + public String getTitle() { return title; } diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/QuestionLibrary.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/QuestionLibrary.java new file mode 100755 index 00000000..2f3e7e5b --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/QuestionLibrary.java @@ -0,0 +1,91 @@ +package com.zdxt.knowledge.domain; + +import com.zdxt.common.BaseDomain; + +/** + * 题库对象 question_library + * + * @author ruoyi + * @date 2024-01-04 + */ +public class QuestionLibrary extends BaseDomain +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private String guid; + + /** 标题 */ + private String title; + + /** 描述 */ + private String desc; + + /** 排序 */ + private Long srot; + + /** 状态(0:正常,1:停用) */ + private Integer status; + + /** 发布时间 */ + private String publishdate; + + /** 发布状态(0:待发布,1:已发布,2:已上线,3:已下线) */ + private Integer publishstate; + + public String getGuid() { + return guid; + } + + public void setGuid(String guid) { + this.guid = guid; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getDesc() { + return desc; + } + + public void setDesc(String desc) { + this.desc = desc; + } + + public Long getSrot() { + return srot; + } + + public void setSrot(Long srot) { + this.srot = srot; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public String getPublishdate() { + return publishdate; + } + + public void setPublishdate(String publishdate) { + this.publishdate = publishdate; + } + + public Integer getPublishstate() { + return publishstate; + } + + public void setPublishstate(Integer publishstate) { + this.publishstate = publishstate; + } +} diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/QuestionLibraryMapper.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/QuestionLibraryMapper.java new file mode 100755 index 00000000..08548dcc --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/QuestionLibraryMapper.java @@ -0,0 +1,70 @@ +package com.zdxt.knowledge.mapper; + +import com.zdxt.knowledge.domain.QuestionLibrary; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 题库Mapper接口 + * + * @author ruoyi + * @date 2024-01-04 + */ +public interface QuestionLibraryMapper +{ + /** + * 查询题库 + * + * @param guid 题库ID + * @return 题库 + */ + public QuestionLibrary selectQuestionLibraryById(String guid); + + /** + * 查询题库列表 + * + * @param questionLibrary 题库 + * @return 题库集合 + */ + public List selectQuestionLibraryList(QuestionLibrary questionLibrary); + + /** + * 新增题库 + * + * @param questionLibrary 题库 + * @return 结果 + */ + public int insertQuestionLibrary(QuestionLibrary questionLibrary); + + /** + * 修改题库 + * + * @param questionLibrary 题库 + * @return 结果 + */ + public int updateQuestionLibrary(QuestionLibrary questionLibrary); + + /** + * 删除题库 + * + * @param guid 题库ID + * @return 结果 + */ + public int deleteQuestionLibraryById(String guid); + + /** + * 批量删除题库 + * + * @param guids 需要删除的数据ID + * @return 结果 + */ + public int deleteQuestionLibraryByIds(String[] guids); + + /** + * 批量修改发布状态 + * @param guids + * @return + */ + public int updatePublishState(@Param("guids") String[] guids, @Param("state") String state, @Param("publishdate") String publishdate); +} diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/IQuestionLibraryService.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/IQuestionLibraryService.java new file mode 100755 index 00000000..e3c4dd3a --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/IQuestionLibraryService.java @@ -0,0 +1,68 @@ +package com.zdxt.knowledge.service; + +import com.zdxt.knowledge.domain.QuestionLibrary; +import java.util.List; + +/** + * 题库Service接口 + * + * @author ruoyi + * @date 2024-01-04 + */ +public interface IQuestionLibraryService +{ + /** + * 查询题库 + * + * @param guid 题库ID + * @return 题库 + */ + public QuestionLibrary selectQuestionLibraryById(String guid); + + /** + * 查询题库列表 + * + * @param questionLibrary 题库 + * @return 题库集合 + */ + public List selectQuestionLibraryList(QuestionLibrary questionLibrary); + + /** + * 新增题库 + * + * @param questionLibrary 题库 + * @return 结果 + */ + public int insertQuestionLibrary(QuestionLibrary questionLibrary); + + /** + * 修改题库 + * + * @param questionLibrary 题库 + * @return 结果 + */ + public int updateQuestionLibrary(QuestionLibrary questionLibrary); + + /** + * 批量删除题库 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteQuestionLibraryByIds(String ids); + + /** + * 删除题库信息 + * + * @param guid 题库ID + * @return 结果 + */ + public int deleteQuestionLibraryById(String guid); + + /** + * 批量修改发布状态 + * @param ids + * @return + */ + public int updatePublishState(String ids, String state); +} diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/QuestionLibraryServiceImpl.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/QuestionLibraryServiceImpl.java new file mode 100755 index 00000000..6d4877f6 --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/QuestionLibraryServiceImpl.java @@ -0,0 +1,107 @@ +package com.zdxt.knowledge.service.impl; + +import java.util.List; + +import com.zdxt.auth.feign.UserApi; +import com.zdxt.common.util.Convert; +import com.zdxt.common.util.DateUtils; +import com.zdxt.common.util.StringUtils; +import com.zdxt.knowledge.domain.QuestionLibrary; +import com.zdxt.knowledge.mapper.QuestionLibraryMapper; +import com.zdxt.knowledge.service.IQuestionLibraryService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * 题库Service业务层处理 + * + * @author ruoyi + * @date 2024-01-04 + */ +@Service +public class QuestionLibraryServiceImpl implements IQuestionLibraryService +{ + @Autowired private QuestionLibraryMapper questionLibraryMapper; + @Autowired private UserApi userApi; + + /** + * 查询题库 + * + * @param guid 题库ID + * @return 题库 + */ + @Override + public QuestionLibrary selectQuestionLibraryById(String guid) + { + return questionLibraryMapper.selectQuestionLibraryById(guid); + } + + /** + * 查询题库列表 + * + * @param questionLibrary 题库 + * @return 题库 + */ + @Override + public List selectQuestionLibraryList(QuestionLibrary questionLibrary) + { + return questionLibraryMapper.selectQuestionLibraryList(questionLibrary); + } + + /** + * 新增题库 + * + * @param questionLibrary 题库 + * @return 结果 + */ + @Override + public int insertQuestionLibrary(QuestionLibrary questionLibrary) + { + questionLibrary.setGuid(StringUtils.getUUID()); + questionLibrary.setCreator(userApi.getCurrentUser().getUserName()); + return questionLibraryMapper.insertQuestionLibrary(questionLibrary); + } + + /** + * 修改题库 + * + * @param questionLibrary 题库 + * @return 结果 + */ + @Override + public int updateQuestionLibrary(QuestionLibrary questionLibrary) + { + questionLibrary.setUpdator(userApi.getCurrentUser().getUserName()); + return questionLibraryMapper.updateQuestionLibrary(questionLibrary); + } + + /** + * 删除题库对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteQuestionLibraryByIds(String ids) + { + return questionLibraryMapper.deleteQuestionLibraryByIds(Convert.toStrArray(ids)); + } + + /** + * 删除题库信息 + * + * @param guid 题库ID + * @return 结果 + */ + @Override + public int deleteQuestionLibraryById(String guid) + { + return questionLibraryMapper.deleteQuestionLibraryById(guid); + } + + @Override + public int updatePublishState(String ids, String state) { + String publishdate = DateUtils.getTime(); + return questionLibraryMapper.updatePublishState(Convert.toStrArray(ids), state, publishdate); + } +} diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/QuestionBankMapper.xml b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/QuestionBankMapper.xml index 4c7707aa..5cd649e7 100755 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/QuestionBankMapper.xml +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/QuestionBankMapper.xml @@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -22,19 +23,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select guid, title, content, tips, answer, srot, status, type, publishDate, publishState, creator, create_time, updator, update_time from question_bank + select guid, question_lib_id, title, content, tips, answer, srot, status, type, publishDate, publishState, creator, create_time, updator, update_time from question_bank + + + and title = #{title} + and `desc` = #{desc} + and srot = #{srot} + and status = #{status} + and publishDate = #{publishdate} + and publishState = #{publishstate} + and creator = #{creator} + and updator = #{updator} + + + + + + + insert into question_library + + guid, + title, + `desc`, + srot, + status, + publishDate, + publishState, + creator, + create_time, + updator, + update_time, + + + #{guid}, + #{title}, + #{desc}, + #{srot}, + #{status}, + #{publishdate}, + #{publishstate}, + #{creator}, + #{createTime}, + #{updator}, + #{updateTime}, + + + + + update question_library + + title = #{title}, + `desc` = #{desc}, + srot = #{srot}, + status = #{status}, + publishDate = #{publishdate}, + publishState = #{publishstate}, + creator = #{creator}, + create_time = #{createTime}, + updator = #{updator}, + update_time = #{updateTime}, + + where guid = #{guid} + + + + delete from question_library where guid = #{guid} + + + + delete from question_library where guid in + + #{guid} + + + + + update question_library + + publishDate = #{publishdate}, + publishState = #{state}, + + where guid in + + #{guid} + + + + \ No newline at end of file diff --git a/lib/EmergencyServiceApi/emergencyKnowledgeServiceApi/src/main/java/com/zdxt/knowledge/dto/QuestionBankBean.java b/lib/EmergencyServiceApi/emergencyKnowledgeServiceApi/src/main/java/com/zdxt/knowledge/dto/QuestionBankBean.java index 9d03d1f3..3c6b9128 100755 --- a/lib/EmergencyServiceApi/emergencyKnowledgeServiceApi/src/main/java/com/zdxt/knowledge/dto/QuestionBankBean.java +++ b/lib/EmergencyServiceApi/emergencyKnowledgeServiceApi/src/main/java/com/zdxt/knowledge/dto/QuestionBankBean.java @@ -15,6 +15,9 @@ public class QuestionBankBean extends BaseDomain /** 主键 */ private String guid; + /** 关联库id */ + private String questionLibId; + /** 标题 */ private String title; @@ -54,6 +57,14 @@ public class QuestionBankBean extends BaseDomain this.guid = guid; } + public String getQuestionLibId() { + return questionLibId; + } + + public void setQuestionLibId(String questionLibId) { + this.questionLibId = questionLibId; + } + public String getTitle() { return title; }