2.0

.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_6.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.mybatis:mybatis-spring:2.0.6">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/2.0.6/mybatis-spring-2.0.6.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/2.0.6/mybatis-spring-2.0.6-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/2.0.6/mybatis-spring-2.0.6-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/xm-backend.iml

@@ -113,15 +113,17 @@
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.4.1" level="project" />
     <orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.41" level="project" />
+    <orderEntry type="library" name="Maven: com.mdp:mdp-utils:2.0.0-RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.0.M4" level="project" />
     <orderEntry type="library" name="Maven: com.mdp:mdp-dao-mybatis:2.0.0-RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.7" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.5.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.5.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.5.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.5.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.5.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.4" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.10" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.7" level="project" />
     <orderEntry type="library" name="Maven: com.mdp:mdp-mybatis-enhance:2.0.0-RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.mdp:mdp-spring-enhance:2.0.0-RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.mdp:mdp-swagger-enhance:2.0.0-RELEASE" level="project" />

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

xm-bootstrap/xm-bootstrap.iml

@@ -197,15 +197,17 @@
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.4.1" level="project" />
     <orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.41" level="project" />
+    <orderEntry type="library" name="Maven: com.mdp:mdp-utils:2.0.0-RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.0.M4" level="project" />
     <orderEntry type="library" name="Maven: com.mdp:mdp-dao-mybatis:2.0.0-RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.7" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.5.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.5.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.5.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.5.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.5.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.4" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.10" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.7" level="project" />
     <orderEntry type="library" name="Maven: com.mdp:mdp-mybatis-enhance:2.0.0-RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.mdp:mdp-spring-enhance:2.0.0-RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.mdp:mdp-swagger-enhance:2.0.0-RELEASE" level="project" />

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+"个子节点,请先删除子节点，再删除父节点");
 			}

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<String,Object> params){
  		this.paramsInit(params);
 		List<Map<String,Object>> 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<String,Object> params){
 		this.paramsInit(params);
 		List<Map<String,Object>> datas= this.xmMenuService.getXmMenuAgeDist(params);
-		return ResponseHelper.ok("ok","成功",datas);
+		return Result.ok("ok","成功",datas);
 	}
 
 	@RequestMapping(value="/getXmMenuSort",method=RequestMethod.GET)

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<Map<String,Object>> 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<Map<String,Object>> 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<String,Object> params){
 		User user=LoginUtils.getCurrentUserInfo();
 		params.put("pbranchId",user.getBranchId());
 		List<Map<String,Object>> 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<String,Object> params){

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<Map<String,Object>> 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<Map<String,Object>> 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<String,Object> 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));

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<XmTaskSbillDetail> can=new ArrayList<>();

xm-core/xm-core.iml

@@ -41,16 +41,18 @@
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.4.1" level="project" />
     <orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.41" level="project" />
+    <orderEntry type="library" name="Maven: com.mdp:mdp-utils:2.0.0-RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.0.M4" level="project" />
     <orderEntry type="library" name="Maven: com.mdp:mdp-qx-api:2.0.0-RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.mdp:mdp-dao-mybatis:2.0.0-RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.7" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.5.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.5.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.5.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.5.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.5.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.4" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.10" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.7" level="project" />
     <orderEntry type="library" name="Maven: com.mdp:mdp-mybatis-enhance:2.0.0-RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.mdp:mdp-spring-enhance:2.0.0-RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.mdp:mdp-swagger-enhance:2.0.0-RELEASE" level="project" />