工作人员登录时更新工作人员窗口

base-manager/src/main/java/com/mortals/xhx/module/workman/web/WorkmanController.java

@@ -9,32 +9,18 @@ import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
-import com.mortals.framework.util.DateUtils;
 import com.mortals.framework.util.FileUtil;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
-import com.mortals.xhx.base.framework.annotation.Operlog;
 import com.mortals.xhx.base.system.param.service.ParamService;
-import com.mortals.xhx.base.system.role.model.RoleQuery;
-import com.mortals.xhx.base.system.role.model.RoleUserEntity;
-import com.mortals.xhx.base.system.role.model.RoleUserQuery;
-import com.mortals.xhx.base.system.role.service.RoleService;
-import com.mortals.xhx.base.system.role.service.RoleUserService;
 import com.mortals.xhx.base.system.upload.service.UploadService;
-import com.mortals.xhx.base.system.user.model.UserEntity;
-import com.mortals.xhx.base.system.user.model.UserQuery;
-import com.mortals.xhx.base.system.user.service.UserService;
 import com.mortals.xhx.common.code.OnlineEnum;
 import com.mortals.xhx.module.dept.model.DeptEntity;
 import com.mortals.xhx.module.dept.service.DeptService;
-import com.mortals.xhx.module.model.model.ModelQuery;
-import com.mortals.xhx.module.model.service.ModelService;
 import com.mortals.xhx.module.site.model.SiteEntity;
 import com.mortals.xhx.module.site.service.SiteService;
 import com.mortals.xhx.module.window.model.WindowEntity;
 import com.mortals.xhx.module.window.service.WindowService;
 import com.mortals.xhx.module.workman.model.WorkmanEntity;
-import com.mortals.xhx.module.workman.model.WorkmanQuery;
 import com.mortals.xhx.module.workman.service.WorkmanService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,7 +31,6 @@ import java.io.IOException;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * 工作人员
@@ -107,6 +92,13 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
             WorkmanEntity workmanEntity = this.service.doLogin(query.getLoginName(), query.getLoginPwd(), ip);
             workmanEntity.setLastLoginAddress(ip);
             workmanEntity.setLastLoginTime(new Date());
+            if(query.getWindowId()!=null) {
+                workmanEntity.setWindowId(query.getWindowId());
+                WindowEntity windowEntity = windowService.get(query.getWindowId());
+                if(windowEntity!=null){
+                    workmanEntity.setWindowName(windowEntity.getName());
+                }
+            }
             this.service.getDao().update(workmanEntity);
             if (query.getSiteId() != workmanEntity.getSiteId()) {
                 throw new AppException("当前工作人员不在当前站点下！");