diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_6.xml b/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_6.xml
deleted file mode 100644
index a3593055..00000000
--- a/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/xm-backend.iml b/.idea/xm-backend.iml
index 7951c93c..e886f85d 100644
--- a/.idea/xm-backend.iml
+++ b/.idea/xm-backend.iml
@@ -113,15 +113,17 @@
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/xm-bootstrap/src/main/java/com/WebSecurityConfig.java b/xm-bootstrap/src/main/java/com/WebSecurityConfig.java
index 6d47bb21..a64fb0b1 100644
--- a/xm-bootstrap/src/main/java/com/WebSecurityConfig.java
+++ b/xm-bootstrap/src/main/java/com/WebSecurityConfig.java
@@ -1,6 +1,6 @@
package com;
-import com.mdp.oauth2.client.resource.MdpJwtAuthenticationConverter;
+import com.mdp.safe.client.jwt.JwtAuthenticationConverter;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.builders.WebSecurity;
@@ -19,7 +19,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
@Autowired
- MdpJwtAuthenticationConverter jwtConverter;
+ JwtAuthenticationConverter jwtConverter;
@Autowired
diff --git a/xm-bootstrap/xm-bootstrap.iml b/xm-bootstrap/xm-bootstrap.iml
index d53899ab..6ac8c078 100644
--- a/xm-bootstrap/xm-bootstrap.iml
+++ b/xm-bootstrap/xm-bootstrap.iml
@@ -197,15 +197,17 @@
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmFuncController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmFuncController.java
index 3aaf2aa2..3131f2d3 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmFuncController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmFuncController.java
@@ -132,7 +132,7 @@ public class XmFuncController {
if( xmFuncDb == null ){
return Result.error("data-not-exists","数据不存在，无法删除");
}
- int childcnt=xmFuncService.count(QueryTools.initQueryWrapper(XmFunc.class).eq("pid",xmFuncDb.getId()));
+ long childcnt=xmFuncService.count(QueryTools.initQueryWrapper(XmFunc.class).eq("pid",xmFuncDb.getId()));
if(childcnt>0){
return Result.error("childcnt-not-0","至少还有"+childcnt+"个子节点,请先删除子节点，再删除父节点");
}
diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java
index 031beb5c..6c515202 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java
@@ -8,7 +8,6 @@ import com.mdp.core.entity.Tips;
import com.mdp.core.query.QueryTools;
import com.mdp.core.utils.BaseUtils;
import com.mdp.core.utils.RequestUtils;
-import com.mdp.core.utils.ResponseHelper;
import com.mdp.msg.client.PushNotifyMsgService;
import com.mdp.safe.client.entity.User;
import com.mdp.safe.client.utils.LoginUtils;
@@ -203,14 +202,14 @@ public class XmMenuController {
public Result getXmMenuAttDist(@ApiIgnore @RequestParam Map params){
this.paramsInit(params);
List> datas= this.xmMenuService.getXmMenuAttDist(params);
- return ResponseHelper.ok("ok","成功",datas);
+ return Result.ok("ok","成功",datas);
}
@RequestMapping(value="/getXmMenuAgeDist",method=RequestMethod.GET)
public Result getXmMenuAgeDist(@ApiIgnore @RequestParam Map params){
this.paramsInit(params);
List> datas= this.xmMenuService.getXmMenuAgeDist(params);
- return ResponseHelper.ok("ok","成功",datas);
+ return Result.ok("ok","成功",datas);
}
@RequestMapping(value="/getXmMenuSort",method=RequestMethod.GET)
diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java
index c853a6f3..07bb5fbd 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java
@@ -9,7 +9,6 @@ import com.mdp.core.entity.Tips;
import com.mdp.core.query.QueryTools;
import com.mdp.core.utils.BaseUtils;
import com.mdp.core.utils.RequestUtils;
-import com.mdp.core.utils.ResponseHelper;
import com.mdp.msg.client.PushNotifyMsgService;
import com.mdp.safe.client.entity.User;
import com.mdp.safe.client.utils.LoginUtils;
@@ -137,7 +136,7 @@ public class XmQuestionController {
User user=LoginUtils.getCurrentUserInfo();
params.put("pbranchId",user.getBranchId());
List> datas= this.xmQuestionService.getXmQuestionAttDist(params);
- return ResponseHelper.ok("ok","成功",datas);
+ return Result.ok("ok","成功",datas);
}
@RequestMapping(value="/getXmQuestionAgeDist",method=RequestMethod.GET)
@@ -145,14 +144,14 @@ public class XmQuestionController {
User user=LoginUtils.getCurrentUserInfo();
params.put("pbranchId",user.getBranchId());
List> datas= this.xmQuestionService.getXmQuestionAgeDist(params);
- return ResponseHelper.ok("ok","成功",datas);
+ return Result.ok("ok","成功",datas);
}
@RequestMapping(value="/getXmQuestionRetestDist",method=RequestMethod.GET)
public Result getXmQuestionRetestDist(@ApiIgnore @RequestParam Map params){
User user=LoginUtils.getCurrentUserInfo();
params.put("pbranchId",user.getBranchId());
List> datas= this.xmQuestionService.getXmQuestionRetestDist(params);
- return ResponseHelper.ok("ok","成功",datas);
+ return Result.ok("ok","成功",datas);
}
@RequestMapping(value="/getXmQuestionSort",method=RequestMethod.GET)
public Result getXmQuestionSort(@ApiIgnore @RequestParam Map params){
diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
index ec59c8c2..ce088356 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
@@ -11,7 +11,6 @@ import com.mdp.core.query.QueryTools;
import com.mdp.core.utils.BaseUtils;
import com.mdp.core.utils.NumberUtil;
import com.mdp.core.utils.RequestUtils;
-import com.mdp.core.utils.ResponseHelper;
import com.mdp.msg.client.PushNotifyMsgService;
import com.mdp.safe.client.entity.Dept;
import com.mdp.safe.client.entity.User;
@@ -200,7 +199,7 @@ public class XmTaskController {
User user=LoginUtils.getCurrentUserInfo();
params.put("pbranchId",user.getBranchId());
List> datas= this.xmTaskService.getXmTaskAttDist(params);
- return ResponseHelper.ok("ok","成功",datas);
+ return Result.ok("ok","成功",datas);
}
@RequestMapping(value="/getXmTaskAgeDist",method=RequestMethod.GET)
@@ -208,7 +207,7 @@ public class XmTaskController {
User user=LoginUtils.getCurrentUserInfo();
params.put("pbranchId",user.getBranchId());
List> datas= this.xmTaskService.getXmTaskAgeDist(params);
- return ResponseHelper.ok("ok","成功",datas);
+ return Result.ok("ok","成功",datas);
}
@@ -222,7 +221,7 @@ public class XmTaskController {
}
}
- return ResponseHelper.ok("成功");
+ return Result.ok("成功");
}
@ApiOperation("统计所有上级的进度情况")
@@ -231,7 +230,7 @@ public class XmTaskController {
User user=LoginUtils.getCurrentUserInfo();
XmTask xmTaskDb=this.xmTaskService.selectOneById(xmTask.getId());
this.xmTaskService.sumParents(xmTaskDb);
- return ResponseHelper.ok("成功");
+ return Result.ok("成功");
}
@RequestMapping(value="/getXmTaskSort",method=RequestMethod.GET)
public Result getXmTaskSort(@ApiIgnore @RequestParam Map params){
@@ -289,7 +288,7 @@ public class XmTaskController {
msg="成功设置"+oks.size()+"个任务的执行人。"+msg;
return Result.ok(msg);
}
- return ResponseHelper.result(returnTips);
+ return Result.ok();
}else if(ids.size()==1){
XmTaskExecuser xmTaskExecuser=new XmTaskExecuser();
xmTaskExecuser.setTaskId(ids.get(0));
diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillDetailController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillDetailController.java
index d5e7af53..0d87dfbd 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillDetailController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillDetailController.java
@@ -6,7 +6,6 @@ import com.mdp.core.entity.Result;
import com.mdp.core.entity.Tips;
import com.mdp.core.query.QueryTools;
import com.mdp.core.utils.RequestUtils;
-import com.mdp.core.utils.ResponseHelper;
import com.mdp.safe.client.entity.User;
import com.mdp.safe.client.utils.LoginUtils;
import com.xm.core.entity.XmTaskSbill;
@@ -230,7 +229,7 @@ public class XmTaskSbillDetailController {
this.xmTaskSbillDetailService.preCalcSamt(detail);
this.xmTaskSbillDetailService.updateSomeFieldByPk(detail);
this.xmTaskSbillService.updateBySbillDetailList(Arrays.asList(detail.getSbillId()));
- return ResponseHelper.ok("成功");
+ return Result.ok("成功");
}
}
List can=new ArrayList<>();
diff --git a/xm-core/xm-core.iml b/xm-core/xm-core.iml
index 244e7436..ebd278ab 100644
--- a/xm-core/xm-core.iml
+++ b/xm-core/xm-core.iml
@@ -41,16 +41,18 @@
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+