Merge remote-tracking branch 'origin/develop' into develop

isc-common-service-public/src/main/java/com/brilliance/isc/common/lock/controller/LockController.java

@@ -47,7 +47,7 @@ public class LockController {
     private SptDataComponent sptDataComponent;
 
     @PostMapping("/isAccessible")
-    public ResponseSet<LockInfo> accessible(LockInfo lockInfo){
+    public ResponseSet<LockInfo> accessible(@RequestBody LockInfo lockInfo){
         lockInfo.setUsrId(SettleContext.getSessionUserVo().getLogName());
         if(!bizLocker.isAccessible(lockInfo)){
             LockInfo respLock = bizLocker.getLock(lockInfo);
@@ -60,7 +60,7 @@ public class LockController {
     }
 
     @PostMapping("/isReroutingAccessible")
-    public ResponseSet<LockInfo> isReroutingAccessible(LockInfo lockInfo){
+    public ResponseSet<LockInfo> isReroutingAccessible(@RequestBody LockInfo lockInfo){
         lockInfo.setUsrId(SettleContext.getSessionUserVo().getLogName());
         if(!bizLocker.isAccessible(lockInfo,"Y")){
             LockInfo respLock = bizLocker.getLock(lockInfo);
@@ -86,7 +86,7 @@ public class LockController {
 
 
     @PostMapping("/isSptAccessible")
-    public ResponseSet<LockInfo> sptAccessible(LockInfo lockInfo){
+    public ResponseSet<LockInfo> sptAccessible(@RequestBody LockInfo lockInfo){
         lockInfo.setUsrId(SettleContext.getSessionUserVo().getLogName());
         if(!bizLocker.isAccessible(lockInfo)){
             LockInfo respLock = bizLocker.getLock(lockInfo);
@@ -121,7 +121,7 @@ public class LockController {
     }
 
     @PostMapping("/getSptAccessible")
-    public ResponseSet<LockInfo> getSptAccessible(LockInfo lockInfo){
+    public ResponseSet<LockInfo> getSptAccessible(@RequestBody LockInfo lockInfo){
         lockInfo.setUsrId(SettleContext.getSessionUserVo().getLogName());
         LockInfo respLock = bizLocker.getLock(lockInfo);
         if(respLock != null) {
@@ -132,7 +132,7 @@ public class LockController {
 
 
     @PostMapping("/checkPending")
-    public ResponseSet<PendingCheckResult> checkPending(PendingCheckVo pendingCheckVo){
+    public ResponseSet<PendingCheckResult> checkPending(@RequestBody PendingCheckVo pendingCheckVo){
         pendingCheckVo.setSetWarning(false);
         PendingCheckResult pendingCheckResult = pendingCheckService.checkPendingSPTs(pendingCheckVo);
         return ResponseSet.simpleSuccess(pendingCheckResult);

isc-common-service-public/src/main/java/com/brilliance/isc/common/ptspta/resource/PtsptaResource.java

@@ -35,12 +35,12 @@ public class PtsptaResource {
 
 
     @PostMapping("/queryptainfo")
-    public ResponseSet queryPtaInfo(PtsptaQueryVo ptsptaVo) {
+    public ResponseSet queryPtaInfo(@RequestBody PtsptaQueryVo ptsptaVo) {
         return ptsptaService.queryPta(ptsptaVo);
     }
 
     @PostMapping("/queryptsptainfo")
-    public ResponseSet queryPtsptaInfo(PtsptaQueryVo ptsptaVo) {
+    public ResponseSet queryPtsptaInfo(@RequestBody PtsptaQueryVo ptsptaVo) {
 
 
 
@@ -51,7 +51,7 @@ public class PtsptaResource {
      * function: 生成临时客户规则
      */
     @PostMapping("/ptsTmpAdrAddAuto")
-    public ResponseSet ptsTmpAdrAddAuto(PtsptaVo ptsptaVo) {
+    public ResponseSet ptsTmpAdrAddAuto(@RequestBody PtsptaVo ptsptaVo) {
         settleContext.simpleLoadSettleSession();
         Map<String, Object> map = ptsptaService.ptsTmpAdrAddAuto(ptsptaVo);
         if(map.containsKey("errorMsg")){
@@ -64,7 +64,7 @@ public class PtsptaResource {
      * function: Ptap13组件生成临时客户规则
      */
     @PostMapping("/ptsTmpAdrAdd")
-    public ResponseSet ptsTmpAdrAdd(PtsptaVo ptsptaVo) {
+    public ResponseSet ptsTmpAdrAdd(@RequestBody PtsptaVo ptsptaVo) {
         settleContext.simpleLoadSettleSession();
         Map<String, Object> map = ptsptaService.ptsTmpAdrAdd(ptsptaVo);
         if(map.containsKey("errorMsg")){
@@ -74,54 +74,54 @@ public class PtsptaResource {
     }
 
     @PostMapping("/getPtsptaInfo")
-    public ResponseSet getPtsptaInfo(PtsptaQueryVo ptsptaVo) {
+    public ResponseSet getPtsptaInfo(@RequestBody PtsptaQueryVo ptsptaVo) {
         return ptsptaService.getPtsptaInfo(ptsptaVo);
     }
 
     @PostMapping("/queryPtyByExk")
-    public ResponseSet queryPtyByExk(PtsptaQueryVo ptsptaVo) {
+    public ResponseSet queryPtyByExk(@RequestBody PtsptaQueryVo ptsptaVo) {
         return new ResponseSet(ptsptaService.queryPtyByExk(ptsptaVo));
     }
 
     //Ptap1-13显示弹窗
     @PostMapping("/queryPtaInfos")
-    public ResponseSet queryPtaInfos(PtsptaQueryVo ptsptaVo) {
+    public ResponseSet queryPtaInfos(@RequestBody PtsptaQueryVo ptsptaVo) {
         return ptsptaService.queryPtas(ptsptaVo);
     }
 
     //Ptap3组件当事人弹窗回填，返回页面使用信息
     @PostMapping("/queryptsptainfo3")
-    public ResponseSet queryPtsptaInfo3(PtsptaQueryVo ptsptaVo) {
+    public ResponseSet queryPtsptaInfo3(@RequestBody PtsptaQueryVo ptsptaVo) {
         return ptsptaService.queryPtsptaInfo3(ptsptaVo);
     }
 
     //Ptap5、Ptap8显示弹窗
     @PostMapping("/queryPtaInfo5")
-    public ResponseSet queryPtaInfo5(PtsptaQueryVo ptsptaVo) {
+    public ResponseSet queryPtaInfo5(@RequestBody PtsptaQueryVo ptsptaVo) {
         return ptsptaService.queryPta5(ptsptaVo);
     }
 
     //Ptap5 Bic显示弹窗
     @PostMapping("/queryPtaBic")
-    public ResponseSet queryPtaBic(PtsptaQueryVo ptsptaVo) {
+    public ResponseSet queryPtaBic(@RequestBody PtsptaQueryVo ptsptaVo) {
         return ptsptaService.queryPtaBic(ptsptaVo);
     }
 
     //Ptap5 Bic回填
     @PostMapping("/queryPtsptaBic")
-    public ResponseSet queryPtsptaBic(PtsptaQueryVo ptsptaVo) {
+    public ResponseSet queryPtsptaBic(@RequestBody PtsptaQueryVo ptsptaVo) {
         return ptsptaService.queryPtsptaBic(ptsptaVo);
     }
 
     //Ptap5、Ptap8组件当事人弹窗回填，返回页面使用信息
     @PostMapping("/queryptsptainfo5")
-    public ResponseSet queryPtsptaInfo5(PtsptaQueryVo ptsptaVo) {
+    public ResponseSet queryPtsptaInfo5(@RequestBody PtsptaQueryVo ptsptaVo) {
         return ptsptaService.queryPtsptaInfo5(ptsptaVo);
     }
 
     //Ptap12和Ptap13组件当事人弹窗回填，返回页面使用信息和账号
     @PostMapping("/queryPtsptaInfo12")
-    public ResponseSet queryPtsptaInfo12(PtsptaQueryVo ptsptaVo) {
+    public ResponseSet queryPtsptaInfo12(@RequestBody PtsptaQueryVo ptsptaVo) {
         try{
             settleContext.simpleLoadSettleSession();
             Bch orgbch = SettleContext.getUserSession().getOrgBch();
@@ -141,7 +141,7 @@ public class PtsptaResource {
 
     //Ptap12和Ptap13输入账号显示弹窗
     @PostMapping("/queryPtaInfoByOrcact")
-    public ResponseSet queryPtaInfoByOrcact(PtsptaQueryVo ptsptaVo) {
+    public ResponseSet queryPtaInfoByOrcact(@RequestBody PtsptaQueryVo ptsptaVo) {
         try {
             settleContext.simpleLoadSettleSession();
             return ptsptaService.queryPtaInfoByOrcact(ptsptaVo);
@@ -154,7 +154,7 @@ public class PtsptaResource {
 
     //应收账款和信保融资通过客户编号查询客户信息
     @PostMapping("/queryPtyInfos")
-    public ResponseSet queryPtyInfos(PtsptaQueryVo ptsptaVo) {
+    public ResponseSet queryPtyInfos(@RequestBody PtsptaQueryVo ptsptaVo) {
         return ptsptaService.queryPtyInfos(ptsptaVo);
     }
 

isc-common-service-public/src/main/java/com/brilliance/isc/common/smh/SmhCommonQuery.java

@@ -6,12 +6,10 @@ import com.brilliance.isc.common.smh.vo.SmhQueryVo;
 import com.brilliance.isc.common.vo.SimpleModuleVo;
 import com.brilliance.isc.vo.ResponseSet;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
@@ -26,13 +24,13 @@ public class SmhCommonQuery {
     private SmhCommonService smhCommonService;
 
     @PostMapping("/listRcvSmhByObj")
-    public ResponseSet<List<Smh>> queryRcvSmhByObjTypAndInr(SmhQueryVo smhQueryVo){
+    public ResponseSet<List<Smh>> queryRcvSmhByObjTypAndInr(@RequestBody SmhQueryVo smhQueryVo){
         return ResponseSet.simpleSuccess(smhCommonService.queryRcvSmhByObjTypAndInr(smhQueryVo));
     }
 
 
     @PostMapping("/listSndSmhByObj")
-    public ResponseSet<List<Smh>> queryAllSmhByObjTypAndInr(SmhQueryVo smhQueryVo){
+    public ResponseSet<List<Smh>> queryAllSmhByObjTypAndInr(@RequestBody SmhQueryVo smhQueryVo){
         return ResponseSet.simpleSuccess(smhCommonService.querySndSmhByObjTypAndInr(smhQueryVo));
 
     }