From faec3f5be9b630bd5a1b023dd209262b959b0ff0 Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Mon, 24 Oct 2022 21:35:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=83=E5=A4=96=E6=B4=A5=E8=B4=B4=E6=A0=B8?=
 =?UTF-8?q?=E7=AE=97web=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/OverseasAllowanceCountController.java | 49 ++++++++++++-------
 1 file changed, 31 insertions(+), 18 deletions(-)

diff --git a/src/com/engine/bjcj220907/web/OverseasAllowanceCountController.java b/src/com/engine/bjcj220907/web/OverseasAllowanceCountController.java
index 6ed6f54..380d594 100644
--- a/src/com/engine/bjcj220907/web/OverseasAllowanceCountController.java
+++ b/src/com/engine/bjcj220907/web/OverseasAllowanceCountController.java
@@ -5,16 +5,9 @@ import com.engine.bjcj220907.service.impl.OverseasAllowanceCountServiceImpl;
 import com.engine.bjcj220907.utils.BjcjCommonUtils;
 import com.engine.common.util.ServiceUtil;
 import weaver.general.BaseBean;
-import weaver.hrm.HrmUserVarify;
 import weaver.hrm.User;
+import weaver.interfaces.schedule.BaseCronJob;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
 import java.util.Calendar;
 
 /**
@@ -22,26 +15,46 @@ import java.util.Calendar;
  * @date 2022/09/26 13:42
  * @description
  */
-public class OverseasAllowanceCountController {
+public class OverseasAllowanceCountController  extends BaseCronJob  {
 
     BaseBean baseBean = new BaseBean();
 
+
     private OverseasAllowanceCountService getOverseasAllowanceCountService(User user) {
         return ServiceUtil.getService(OverseasAllowanceCountServiceImpl.class,user);
     }
 
-    /**
-     * 境外津贴计算
-     */
-    @GET
-    @Path("/countOverseasAllowance")
-    @Produces(MediaType.APPLICATION_JSON)
-    public void countOverseasAllowance(@Context HttpServletRequest request, @Context HttpServletResponse response) {
-        User user = HrmUserVarify.getUser(request, response);
+    @Override
+    public void execute() {
+        User user1 = new User();
+        user1.setUid(1);
+        user1.setLoginid("sysadmin");
+        user1.setSeclevel("30");
+        user1.setLanguage(7);
         Calendar cal = BjcjCommonUtils.getNowCalendar();
         cal.add(Calendar.MONTH,-1);
         baseBean.writeLog("开始计算:"+cal.getTime()+"的境外津贴");
-        getOverseasAllowanceCountService(user).countOverseasAllowance(cal);
+        getOverseasAllowanceCountService(user1).countOverseasAllowance(cal);
     }
 
+    /**
+     * 境外津贴计算
+     */
+//    @GET
+//    @Path("/countOverseasAllowance")
+//    @Produces(MediaType.APPLICATION_JSON)
+//    public void countOverseasAllowance(@Context HttpServletRequest request, @Context HttpServletResponse response) {
+//
+////        User user = HrmUserVarify.getUser(request, response);
+//        User user1 = new User();
+//        user1.setUid(1);
+//        user1.setLoginid("sysadmin");
+//        user1.setSeclevel("30");
+//        user1.setLanguage(7);
+//        Calendar cal = BjcjCommonUtils.getNowCalendar();
+//        cal.add(Calendar.MONTH,-1);
+//        baseBean.writeLog("开始计算:"+cal.getTime()+"的境外津贴");
+//        getOverseasAllowanceCountService(user1).countOverseasAllowance(cal);
+//    }
+
 }