From 05e13dc68b3db44868d9e02a10ccc330366a49c6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 08 八月 2023 11:58:36 +0800
Subject: [PATCH] 修改bug
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemConfigController.java | 70 ++++++++++++++++++++++++----------
1 files changed, 49 insertions(+), 21 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemConfigController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemConfigController.java
index 4599961..3d938ae 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemConfigController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemConfigController.java
@@ -4,6 +4,11 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.modular.system.model.TAgent;
+import com.stylefeng.guns.modular.system.model.TBranchOffice;
+import com.stylefeng.guns.modular.system.service.ITAgentService;
+import com.stylefeng.guns.modular.system.service.ITBranchOfficeService;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -18,6 +23,7 @@
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import java.util.Objects;
/**
* 控制器
@@ -33,6 +39,8 @@
@Autowired
private ITSystemConfigService tSystemConfigService;
+ @Autowired
+ private ITAgentService agentService;
/**
* 跳转到首页
@@ -73,7 +81,7 @@
model.addAttribute("num2",jsonObject.getInteger("num2"));
model.addAttribute("num3",jsonObject.getInteger("num3"));
model.addAttribute("num4",jsonObject.getInteger("num4"));
- model.addAttribute("num5",jsonObject.getInteger("num5"));
+// model.addAttribute("num5",jsonObject.getInteger("num5"));
return PREFIX + "tSystemConfigDispatchRules.html";
}
@@ -85,13 +93,13 @@
TSystemConfig tSystemConfig = tSystemConfigService.selectOne(new EntityWrapper<TSystemConfig>().eq("type", 2)
.last("LIMIT 1"));
JSONObject jsonObject = JSONObject.parseObject(tSystemConfig.getContent());
- model.addAttribute("num1",jsonObject.getInteger("num1"));
- model.addAttribute("num2",jsonObject.getInteger("num2"));
- model.addAttribute("num3",jsonObject.getInteger("num3"));
- model.addAttribute("num4",jsonObject.getInteger("num4"));
- model.addAttribute("num5",jsonObject.getInteger("num5"));
- model.addAttribute("num6",jsonObject.getInteger("num6"));
- model.addAttribute("num7",jsonObject.getInteger("num7"));
+ model.addAttribute("num1",jsonObject.getString("num1"));
+ model.addAttribute("num2",jsonObject.getString("num2"));
+ model.addAttribute("num3",jsonObject.getString("num3"));
+ model.addAttribute("num4",jsonObject.getString("num4"));
+ model.addAttribute("num5",jsonObject.getString("num5"));
+ model.addAttribute("num6",jsonObject.getString("num6"));
+ model.addAttribute("num7",jsonObject.getString("num7"));
return PREFIX + "tSystemConfigCommissionShareRules.html";
}
@@ -105,7 +113,7 @@
JSONObject jsonObject = JSONObject.parseObject(tSystemConfig.getContent());
model.addAttribute("num1",jsonObject.getInteger("num1"));
model.addAttribute("num2",jsonObject.getInteger("num2"));
- model.addAttribute("num3",jsonObject.getInteger("num3"));
+ model.addAttribute("num3",jsonObject.getString("num3"));
return PREFIX + "tSystemConfigExtractionRules.html";
}
/**
@@ -176,10 +184,20 @@
*/
@RequestMapping("/serviceMgmt")
public String serviceMgmt(Model model) {
- TSystemConfig tSystemConfig = tSystemConfigService.selectOne(new EntityWrapper<TSystemConfig>().eq("type", 7)
- .last("LIMIT 1"));
- JSONObject jsonObject = JSONObject.parseObject(tSystemConfig.getContent());
- model.addAttribute("num1",jsonObject.getString("num1"));
+ Integer roleType = Objects.requireNonNull(ShiroKit.getUser()).getRoleType();
+ Integer objectId = Objects.requireNonNull(ShiroKit.getUser()).getObjectId();
+ if(roleType == 1){
+ TSystemConfig tSystemConfig = tSystemConfigService.selectOne(new EntityWrapper<TSystemConfig>().eq("type", 7)
+ .last("LIMIT 1"));
+ JSONObject jsonObject = JSONObject.parseObject(tSystemConfig.getContent());
+ model.addAttribute("num1",jsonObject.getString("num1"));
+ }
+ if(roleType == 3){
+ TAgent tAgent = agentService.selectById(objectId);
+ if (Objects.nonNull(tAgent)){
+ model.addAttribute("num1",tAgent.getServiceCalls());
+ }
+ }
return PREFIX + "tSystemConfigServiceMgmt.html";
}
@@ -191,14 +209,24 @@
@ResponseBody
public Object systemConfigSubmit(Integer type,String content) {
- TSystemConfig tSystemConfig = tSystemConfigService.selectOne(new EntityWrapper<TSystemConfig>().eq("type", type)
- .last("LIMIT 1"));
-
- System.err.println(content);
-
- tSystemConfig.setContent(content);
-
- return tSystemConfigService.updateById(tSystemConfig);
+ Integer roleType = Objects.requireNonNull(ShiroKit.getUser()).getRoleType();
+ Integer objectId = Objects.requireNonNull(ShiroKit.getUser()).getObjectId();
+ if(roleType == 1){
+ TSystemConfig tSystemConfig = tSystemConfigService.selectOne(new EntityWrapper<TSystemConfig>().eq("type", type)
+ .last("LIMIT 1"));
+ tSystemConfig.setContent(content);
+ tSystemConfigService.updateById(tSystemConfig);
+ }
+ if(roleType == 3){
+ TAgent tAgent = agentService.selectById(objectId);
+ if (Objects.nonNull(tAgent)){
+ JSONObject jsonObject = JSONObject.parseObject(content);
+ String num1 = jsonObject.getString("num1");
+ tAgent.setServiceCalls(num1);
+ agentService.updateById(tAgent);
+ }
+ }
+ return SUCCESS_TIP;
}
/**
* 获取列表
--
Gitblit v1.7.1