diff --git a/lib/EmergencyService/pom.xml b/lib/EmergencyService/pom.xml
index ebefad66..099e50e7 100644
--- a/lib/EmergencyService/pom.xml
+++ b/lib/EmergencyService/pom.xml
@@ -118,6 +118,12 @@
mybatis-plus-extension
3.4.2
+
+ io.jsonwebtoken
+ jjwt
+ 0.9.1
+
+
@@ -460,11 +466,11 @@
5.1.3
-
- EmergencyXxlJob
- xxl-job-core
- 1.0.0
-
+
+
+
+
+
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application.yml b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application.yml
index c9c0e6a6..2b37fa9c 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application.yml
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application.yml
@@ -46,6 +46,11 @@ wechat:
secret: e54f86b3b85e5e418c025392abe39807
grantType: authorization_code
requestUrl: https://api.weixin.qq.com/sns/jscode2session
+ jwt:
+ # 配置用户端令牌
+ userSecretKey: zdxtApp
+ userTtl: 7200000
+ userTokenName: Authentication
# 用户配置
user:
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/scene/manage.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/scene/manage.html
index 1c0f2f88..04201694 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/scene/manage.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/scene/manage.html
@@ -153,7 +153,7 @@
actions.push(' 编辑 ');
actions.push(' 删除');
actions.push('查看 ');
- actions.push('角色');
+ actions.push('角色');
actions.push('上移');
return actions.join('');
}
@@ -206,6 +206,10 @@
});
}
+ function rolePage(id) {
+ window.location.href=ctx + "small/project/role/view/" + id;
+ }
+
function generateQRCode() {
table.set();
var rows = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId);
diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/annotation/Applet.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/annotation/Applet.java
new file mode 100644
index 00000000..0c5bc1aa
--- /dev/null
+++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/annotation/Applet.java
@@ -0,0 +1,12 @@
+package com.zdxt.knowledge.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Applet {
+
+}
diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/AnswerBankController.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/AnswerBankController.java
index 9f8d138e..0de1ab82 100755
--- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/AnswerBankController.java
+++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/AnswerBankController.java
@@ -57,6 +57,7 @@ public class AnswerBankController extends BaseController
* 新增答案库
*/
@GetMapping("/add")
+ @RequiresPermissions("small:answer:add")
public String add()
{
return prefix + "/add";
@@ -77,6 +78,7 @@ public class AnswerBankController extends BaseController
/**
* 修改答案库
*/
+ @RequiresPermissions("small:answer:edit")
@GetMapping("/edit/{guid}")
public String edit(@PathVariable("guid") String guid, ModelMap mmap)
{
diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/BannerManageController.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/BannerManageController.java
index ecd54bb6..702bf466 100755
--- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/BannerManageController.java
+++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/BannerManageController.java
@@ -56,6 +56,7 @@ public class BannerManageController extends BaseController
/**
* 新增横幅管理
*/
+ @RequiresPermissions("banner:manage:add")
@GetMapping("/add")
public String add()
{
@@ -77,6 +78,7 @@ public class BannerManageController extends BaseController
/**
* 修改横幅管理
*/
+ @RequiresPermissions("banner:manage:edit")
@GetMapping("/edit/{guid}")
public String edit(@PathVariable("guid") String guid, ModelMap mmap)
{
diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/CustomImageController.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/CustomImageController.java
index b0a0ca33..9fddfff9 100755
--- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/CustomImageController.java
+++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/CustomImageController.java
@@ -3,6 +3,7 @@ package com.zdxt.knowledge.controller;
import com.zdxt.common.ZDResponse;
import com.zdxt.common.controller.BaseController;
import com.zdxt.common.util.TableDataInfo;
+import com.zdxt.knowledge.annotation.Applet;
import com.zdxt.knowledge.domain.CustomImage;
import com.zdxt.knowledge.service.ICustomImageService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -60,6 +61,7 @@ public class CustomImageController extends BaseController {
*/
@PostMapping("/listAll")
@ResponseBody
+ @Applet
public ZDResponse listAll(@RequestBody CustomImage customImage) {
List list = customImageService.selectCustomImageListAll(customImage);
return ZDResponse.success("成功", list);
@@ -68,6 +70,7 @@ public class CustomImageController extends BaseController {
/**
* 新增自定义图片管理
*/
+ @RequiresPermissions("custom:image:add")
@GetMapping("/add")
public String add() {
return prefix + "/add";
@@ -112,6 +115,7 @@ public class CustomImageController extends BaseController {
/**
* 修改自定义图片管理
*/
+ @RequiresPermissions("custom:image:edit")
@GetMapping("/edit/{guid}")
public String edit(@PathVariable("guid") String guid, ModelMap mmap) {
CustomImage customImage = customImageService.selectCustomImageById(guid);
diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/KnowledgeLibraryController.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/KnowledgeLibraryController.java
index 894748e2..a6833cc8 100755
--- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/KnowledgeLibraryController.java
+++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/KnowledgeLibraryController.java
@@ -7,6 +7,7 @@ import com.zdxt.common.ZDResponse;
import com.zdxt.common.controller.BaseController;
import com.zdxt.common.util.StringUtils;
import com.zdxt.common.util.TableDataInfo;
+import com.zdxt.knowledge.annotation.Applet;
import com.zdxt.knowledge.domain.KnowledgeLibrary;
import com.zdxt.knowledge.service.IKnowledgeLibraryService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -60,6 +61,7 @@ public class KnowledgeLibraryController extends BaseController {
*/
@PostMapping("/listApp")
@ResponseBody
+ @Applet
public TableDataInfo listApp(@RequestBody KnowledgeLibrary knowledgeLibrary) {
if (StringUtils.isNotNull(knowledgeLibrary.getPageNum()) && StringUtils.isNotNull(knowledgeLibrary.getPageSize())) {
PageHelper.startPage(knowledgeLibrary.getPageNum(), knowledgeLibrary.getPageSize());
@@ -74,6 +76,7 @@ public class KnowledgeLibraryController extends BaseController {
*/
@PostMapping("/getById")
@ResponseBody
+ @Applet
public ZDResponse getById(@RequestBody KnowledgeLibrary knowledgeLibrary) {
KnowledgeLibrary library = knowledgeLibraryService.selectKnowledgeLibraryById(knowledgeLibrary.getGuid());
return ZDResponse.success("成功", library);
@@ -82,6 +85,7 @@ public class KnowledgeLibraryController extends BaseController {
/**
* 新增知识库
*/
+ @RequiresPermissions("small:library:add")
@GetMapping("/add")
public String add(ModelMap mmap) {
DictDataBean dictBean = new DictDataBean();
@@ -104,6 +108,7 @@ public class KnowledgeLibraryController extends BaseController {
/**
* 修改知识库
*/
+ @RequiresPermissions("small:library:edit")
@GetMapping("/edit/{guid}")
public String edit(@PathVariable("guid") String guid, ModelMap mmap) {
KnowledgeLibrary knowledgeLibrary = knowledgeLibraryService.selectKnowledgeLibraryById(guid);
diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/QuestionAnswerController.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/QuestionAnswerController.java
index abc8aab9..9f9af766 100755
--- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/QuestionAnswerController.java
+++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/QuestionAnswerController.java
@@ -4,6 +4,7 @@ import com.zdxt.common.ZDResponse;
import com.zdxt.common.controller.BaseController;
import com.zdxt.common.util.StringUtils;
import com.zdxt.common.util.TableDataInfo;
+import com.zdxt.knowledge.annotation.Applet;
import com.zdxt.knowledge.domain.QuestionAnswer;
import com.zdxt.knowledge.domain.QuestionCount;
import com.zdxt.knowledge.domain.SceneMedal;
@@ -66,6 +67,7 @@ public class QuestionAnswerController extends BaseController {
*/
@PostMapping("/listAll")
@ResponseBody
+ @Applet
public ZDResponse listAll(@RequestBody QuestionAnswer questionAnswer) {
List list = questionAnswerService.selectQuestionAnswerList(questionAnswer);
return ZDResponse.success("成功", list);
@@ -76,6 +78,7 @@ public class QuestionAnswerController extends BaseController {
*/
@PostMapping("/updateUserScore")
@ResponseBody
+ @Applet
public ZDResponse updateUserScore(@RequestBody QuestionCount questionCount) {
QuestionAnswer questionAnswer = new QuestionAnswer();
questionAnswer.setQuestionFreId(questionCount.getQuestionFreId());
@@ -126,6 +129,7 @@ public class QuestionAnswerController extends BaseController {
*/
@PostMapping("/add")
@ResponseBody
+ @Applet
public ZDResponse addSave(@RequestBody QuestionAnswer questionAnswer) {
int resNum = questionAnswerService.insertQuestionAnswer(questionAnswer);
return resNum > 0 ? ZDResponse.success("操作成功", resNum) : ZDResponse.error("操作失败", resNum);
@@ -167,6 +171,7 @@ public class QuestionAnswerController extends BaseController {
*/
@GetMapping("/queryQAByFreId/{guid}")
@ResponseBody
+ @Applet
public ZDResponse queryQAByFreId(@PathVariable("guid") String guid) {
List list = questionAnswerService.queryQAByFreId(guid);
return ZDResponse.success("操作成功", list);
diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/QuestionFreController.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/QuestionFreController.java
index 2a13cd5e..08447c36 100755
--- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/QuestionFreController.java
+++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/QuestionFreController.java
@@ -4,6 +4,7 @@ import com.zdxt.common.ZDResponse;
import com.zdxt.common.controller.BaseController;
import com.zdxt.common.util.StringUtils;
import com.zdxt.common.util.TableDataInfo;
+import com.zdxt.knowledge.annotation.Applet;
import com.zdxt.knowledge.domain.QuestionFre;
import com.zdxt.knowledge.service.IQuestionFreService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -52,6 +53,7 @@ public class QuestionFreController extends BaseController {
*/
@PostMapping("/listAll")
@ResponseBody
+ @Applet
public ZDResponse listAll(@RequestBody QuestionFre questionFre) {
List list = questionFreService.selectQuestionFreList(questionFre);
return ZDResponse.success("成功", list);
@@ -59,6 +61,7 @@ public class QuestionFreController extends BaseController {
@PostMapping("/getRelationInfo")
@ResponseBody
+ @Applet
public ZDResponse getRelationInfo(@RequestBody String guid) {
Map map = questionFreService.getRelationInfo(guid);
return ZDResponse.success("成功", map);
@@ -77,6 +80,7 @@ public class QuestionFreController extends BaseController {
*/
@PostMapping("/add")
@ResponseBody
+ @Applet
public ZDResponse addSave(@RequestBody QuestionFre questionFre) {
String guid = questionFreService.insertQuestionFre(questionFre);
return StringUtils.isNotEmpty(guid) ? ZDResponse.success("操作成功", guid) : ZDResponse.error("操作失败", guid);
diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneHomeController.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneHomeController.java
index c064d0c0..25cd46e9 100644
--- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneHomeController.java
+++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneHomeController.java
@@ -3,6 +3,7 @@ package com.zdxt.knowledge.controller;
import com.zdxt.common.ZDResponse;
import com.zdxt.common.controller.BaseController;
import com.zdxt.common.util.TableDataInfo;
+import com.zdxt.knowledge.annotation.Applet;
import com.zdxt.knowledge.domain.SceneHome;
import com.zdxt.knowledge.service.ISceneHomeService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -52,6 +53,7 @@ public class SceneHomeController extends BaseController {
*/
@PostMapping("/listAll")
@ResponseBody
+ @Applet
public ZDResponse listAll(@RequestBody SceneHome sceneHome) {
List list = sceneHomeService.selectSceneHomeListAll(sceneHome);
return ZDResponse.success("成功", list);
@@ -119,6 +121,7 @@ public class SceneHomeController extends BaseController {
/**
* 排序上移
*/
+ @RequiresPermissions("project:home:edit")
@GetMapping("/sort/{guid}")
@ResponseBody
public ZDResponse sort(@PathVariable("guid") String guid) {
diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneManageController.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneManageController.java
index a2fd831f..2930d405 100755
--- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneManageController.java
+++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneManageController.java
@@ -5,6 +5,7 @@ import com.zdxt.common.ZDResponse;
import com.zdxt.common.controller.BaseController;
import com.zdxt.common.util.StringUtils;
import com.zdxt.common.util.TableDataInfo;
+import com.zdxt.knowledge.annotation.Applet;
import com.zdxt.knowledge.domain.QuestionFre;
import com.zdxt.knowledge.domain.SceneImportDataModel;
import com.zdxt.knowledge.domain.SceneManage;
@@ -76,6 +77,7 @@ public class SceneManageController extends BaseController {
*/
@PostMapping("/listApp")
@ResponseBody
+ @Applet
public TableDataInfo listApp(@RequestBody SceneManage sceneManage) {
if (StringUtils.isNotNull(sceneManage.getPageNum()) && StringUtils.isNotNull(sceneManage.getPageSize())) {
PageHelper.startPage(sceneManage.getPageNum(), sceneManage.getPageSize());
@@ -113,6 +115,7 @@ public class SceneManageController extends BaseController {
*/
@PostMapping("/getQRCode")
@ResponseBody
+ @Applet
public ZDResponse getQRCode() throws Exception {
return sceneManageService.getQRCode();
}
@@ -140,6 +143,7 @@ public class SceneManageController extends BaseController {
/**
* 新增场景
*/
+ @RequiresPermissions("project:manage:add")
@GetMapping("/add")
public String add() {
return prefix + "/add";
@@ -159,6 +163,7 @@ public class SceneManageController extends BaseController {
/**
* 修改
*/
+ @RequiresPermissions("project:manage:edit")
@GetMapping("/edit/{guid}")
public String edit(@PathVariable("guid") String guid, ModelMap mmap) {
SceneManage sceneManage = sceneManageService.selectSceneManageById(guid);
@@ -191,6 +196,7 @@ public class SceneManageController extends BaseController {
/**
* 排序上移
*/
+ @RequiresPermissions("project:manage:sort")
@GetMapping("/sort/{guid}")
@ResponseBody
public ZDResponse sort(@PathVariable("guid") String guid) {
diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneMedalController.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneMedalController.java
index abf12024..8ef9c570 100755
--- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneMedalController.java
+++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneMedalController.java
@@ -5,6 +5,7 @@ import com.zdxt.common.ZDResponse;
import com.zdxt.common.controller.BaseController;
import com.zdxt.common.util.TableDataInfo;
import com.zdxt.domain.auth.DictData;
+import com.zdxt.knowledge.annotation.Applet;
import com.zdxt.knowledge.domain.SceneManage;
import com.zdxt.knowledge.domain.SceneMedal;
import com.zdxt.knowledge.service.ISceneManageService;
@@ -63,6 +64,7 @@ public class SceneMedalController extends BaseController {
/**
* 成就勋章图标
*/
+ @RequiresPermissions("project:medal:edit")
@GetMapping("/selected/{guid}")
public String selected(@PathVariable("guid") String guid, ModelMap mmap) {
SceneMedal sceneMedal = sceneMedalService.selectSceneMedalById(guid);
@@ -97,6 +99,7 @@ public class SceneMedalController extends BaseController {
*/
@PostMapping("/listAll")
@ResponseBody
+ @Applet
public ZDResponse listAll(@RequestBody SceneMedal sceneMedal) {
List list = sceneMedalService.selectSceneMedalList(sceneMedal);
return ZDResponse.success("成功", list);
@@ -107,6 +110,7 @@ public class SceneMedalController extends BaseController {
*/
@PostMapping("/medalInfo")
@ResponseBody
+ @Applet
public ZDResponse medalInfo(@RequestBody String guid) {
SceneMedal sceneMedal = new SceneMedal();
@@ -148,6 +152,7 @@ public class SceneMedalController extends BaseController {
/**
* 新增
*/
+ @RequiresPermissions("project:medal:add")
@GetMapping("/add/{type}")
public String add(@PathVariable("type") String type, ModelMap mmap) {
List sceneList = sceneManageService.selectSceneManageListAll(new SceneManage());
@@ -170,6 +175,7 @@ public class SceneMedalController extends BaseController {
/**
* 修改
*/
+ @RequiresPermissions("project:medal:edit")
@GetMapping("/edit/{guid}")
public String edit(@PathVariable("guid") String guid, ModelMap mmap) {
SceneMedal sceneMedal = sceneMedalService.selectSceneMedalById(guid);
@@ -203,6 +209,7 @@ public class SceneMedalController extends BaseController {
/**
* 排序上移
*/
+ @RequiresPermissions("project:medal:sort")
@GetMapping("/sort/{guid}/{type}")
@ResponseBody
public ZDResponse sort(@PathVariable("guid") String guid, @PathVariable("type") String type) {
diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneMessageController.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneMessageController.java
index 07e9925f..c0323683 100755
--- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneMessageController.java
+++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneMessageController.java
@@ -6,6 +6,7 @@ import com.zdxt.common.controller.BaseController;
import com.zdxt.common.util.SqlUtil;
import com.zdxt.common.util.StringUtils;
import com.zdxt.common.util.TableDataInfo;
+import com.zdxt.knowledge.annotation.Applet;
import com.zdxt.knowledge.domain.SceneMessage;
import com.zdxt.knowledge.service.ISceneMessageService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -55,6 +56,7 @@ public class SceneMessageController extends BaseController {
*/
@PostMapping("/listByApp")
@ResponseBody
+ @Applet
public TableDataInfo listByApp(@RequestBody SceneMessage sceneMessage) {
if (StringUtils.isNotNull(sceneMessage.getPageNum()) && StringUtils.isNotNull(sceneMessage.getPageSize())) {
PageHelper.startPage(sceneMessage.getPageNum(), sceneMessage.getPageSize());
@@ -68,6 +70,7 @@ public class SceneMessageController extends BaseController {
*/
@PostMapping("/getById")
@ResponseBody
+ @Applet
public ZDResponse getById(@RequestBody SceneMessage sceneMessage) {
SceneMessage message = sceneMessageService.selectSceneMessageById(sceneMessage.getGuid());
return ZDResponse.success("成功", message);
@@ -87,6 +90,7 @@ public class SceneMessageController extends BaseController {
/**
* 新增
*/
+ @RequiresPermissions("project:message:add")
@GetMapping("/add")
public String add() {
return prefix + "/add";
@@ -106,6 +110,7 @@ public class SceneMessageController extends BaseController {
/**
* 修改
*/
+ @RequiresPermissions("project:message:edit")
@GetMapping("/edit/{guid}")
public String edit(@PathVariable("guid") String guid, ModelMap mmap) {
SceneMessage sceneMessage = sceneMessageService.selectSceneMessageById(guid);
diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneQuestionController.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneQuestionController.java
index 7cde6876..fff5e1b3 100644
--- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneQuestionController.java
+++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneQuestionController.java
@@ -1,14 +1,12 @@
package com.zdxt.knowledge.controller;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
import com.zdxt.auth.feign.RoleApi;
import com.zdxt.common.ZDResponse;
import com.zdxt.common.controller.BaseController;
import com.zdxt.common.util.TableDataInfo;
+import com.zdxt.knowledge.annotation.Applet;
import com.zdxt.knowledge.domain.SceneManage;
import com.zdxt.knowledge.domain.SceneQuestion;
-import com.zdxt.knowledge.domain.SceneRole;
import com.zdxt.knowledge.mapper.SceneManageMapper;
import com.zdxt.knowledge.mapper.SceneRoleMapper;
import com.zdxt.knowledge.service.ISceneQuestionService;
@@ -40,8 +38,6 @@ public class SceneQuestionController extends BaseController {
@Autowired
private SceneManageMapper sceneManageMapper;
- @Autowired
- private SceneRoleMapper sceneRoleMapper;
@Autowired
private RoleApi roleApi;
@@ -76,6 +72,7 @@ public class SceneQuestionController extends BaseController {
/**
* 新增场景题目
*/
+ @RequiresPermissions("project:question:add")
@GetMapping("/add")
public String add(@RequestParam("parentId") String parentId, ModelMap mmap) {
mmap.put("parentId", parentId);
@@ -96,6 +93,7 @@ public class SceneQuestionController extends BaseController {
/**
* 修改场景题目
*/
+ @RequiresPermissions("project:question:edit")
@GetMapping("/edit/{guid}")
public String edit(@PathVariable("guid") String guid, ModelMap mmap) {
SceneQuestion sceneQuestion = sceneQuestionService.selectSceneQuestionById(guid);
@@ -175,6 +173,7 @@ public class SceneQuestionController extends BaseController {
/**
* 新增场景题目
*/
+ @RequiresPermissions("project:question:add")
@GetMapping("/addNew")
public String addNew(@RequestParam("guid") String guid, @RequestParam("parentId") String parentId, ModelMap mmap) {
SceneQuestion sceneQuestion = sceneQuestionService.selectSceneQuestionById(guid);
@@ -209,6 +208,7 @@ public class SceneQuestionController extends BaseController {
@PostMapping("/getBindJsonApp")
@ResponseBody
+ @Applet
public ZDResponse getBindJsonApp(@RequestBody String guid) {
List