微调

src/main/java/com/shr/controller/EasController.java

@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
+import java.net.URLEncoder;
 
 /**
  * @author Lnori
@@ -17,11 +18,7 @@ import java.io.IOException;
 public class EasController {
 
     @GetMapping(value = "/eas/ssoLogin")
-    public void ssoLogin(HttpServletResponse response) throws IOException {
-        response.sendRedirect(loginEasportal());
-    }
-
-    public static String loginEasportal() {
+    public void easSsoLogin(HttpServletResponse response) throws IOException {
         //从EAS服务器上下载     server\profiles\server(1...n)\config\portalConfig\LtpaToken.properties
         File file2 = new File("src/main/resources/LtpaToken.properties");
         String configPath = file2.getAbsolutePath();
@@ -30,15 +27,37 @@ public class EasController {
         String redirectTo = "//";
         //调用LtpaTokenManager,根据密钥生成用户令牌
         String username = "administrator";
-        String password = LtpaTokenManager.generate(username, configPath).toString();
+        String password = LtpaTokenManager.generate(username, LtpaTokenManager.getDefaultLtpaConfig()).toString();
         System.out.println("password: " + password);
 
-        //生成EAS单点登录地址 192.168.0.119 192.168.2.219
+        //生成EAS单点登录地址
         String url = "http://192.168.2.219:6888/portal/index2sso.jsp?username=" + username + "&password=" + password + "&redirectTo=" + redirectTo + "&isNotCheckRelogin=true";
         //验证Token
         LtpaTokenManager.isValid(password);
         System.out.println(url);
-        return url;
+
+        response.sendRedirect(url);
+    }
+
+    @GetMapping(value = "/shr/ssoLogin")
+    public void shrSsoLogin(HttpServletResponse response) throws IOException {
+        //s-HR地址
+        String shrLocal = "http://127.0.0.1:6888/shr/home.do";
+        String redirectTo = URLEncoder.encode(shrLocal);
+
+        //登陆用户名
+        String username = "user";
+        //根据密钥生成的密码串
+        String password = LtpaTokenManager.generate(username, LtpaTokenManager.getDefaultLtpaConfig(), "OTP").toString();
+        System.out.println("password: " + password);
+
+        //生成SHR单点登录地址
+        String url = "http://192.168.2.219:6888/shr/OTP2sso.jsp?username=" + username + "&password=" + password + "&redirectTo=" + redirectTo + "&userAuthPattern=OTP&isNotCheckRelogin=true";
+        //验证Token
+        LtpaTokenManager.isValid(password);
+        System.out.println(url);
+
+        response.sendRedirect(url);
     }
 
 

src/main/java/com/shr/serivce/impl/UnProcessAssignImpl.java

@@ -8,9 +8,13 @@ import com.shr.transfer.unprocessassign.UnProcessAssignDetailedOutVo;
 import com.shr.transfer.unprocessassign.UnProcessAssignListInVo;
 import com.shr.transfer.unprocessassign.UnProcessAssignListOutVo;
 import com.shr.utils.JsonUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * @author Inori
  */
@@ -32,7 +36,17 @@ public class UnProcessAssignImpl implements IUnProcessAssign {
 
     @Override
     public UnProcessAssignDetailedOutVo unProcessAssignDetailed(UnProcessAssignDetailedInVo inVo) {
-        Response response = callShrOsfApi.callShrOsf("getUnProcessAssignCount", null);
+        Map<String, Object> map = new HashMap<>(3);
+        if (StringUtils.isNotBlank(inVo.getTotal())) {
+            map.put("total", inVo.getTotal());
+        }
+        if (StringUtils.isNotBlank(inVo.getPage())) {
+            map.put("page", inVo.getPage());
+        }
+        if (StringUtils.isNotBlank(inVo.getRows())) {
+            map.put("rows", inVo.getRows());
+        }
+        Response response = callShrOsfApi.callShrOsf("getUnProcessAssignCount", map);
 
         UnProcessAssignDetailedOutVo outVo = new UnProcessAssignDetailedOutVo();
         outVo.setRecords(JsonUtil.toList(JsonUtil.toString(response.getData()), Object.class));

src/main/java/com/shr/transfer/unprocessassign/UnProcessAssignDetailedInVo.java

@@ -11,6 +11,24 @@ import javax.validation.constraints.NotBlank;
 public class UnProcessAssignDetailedInVo {
 
     /**
+     * 待处理任务总条数
+     */
+    private String total;
+
+
+    /**
+     * 页码
+     */
+    private String page;
+
+
+    /**
+     * 每页条数
+     */
+    private String rows;
+
+
+    /**
      * 系统类型
      */
     @NotBlank(message = "参数systemType缺失")