修改前端

base-manager/db/params.sql

@@ -369,3 +369,6 @@ INSERT INTO `mortals_xhx_product` VALUES (null, '样表机', 'ybj', '样表机',
 INSERT INTO `mortals_sys_model` VALUES (null, '基础设置平台', 'basic setting ', 'file/fileupload/1672810627756.svg', 'http://192.168.0.98:11071/#/jump', '基础设置平台-test', 1, '2022-04-20 09:55:59', 1, '2023-01-04 13:37:09');
 
 INSERT INTO `mortals_xhx_task` VALUES (null, '用户同步', 'syncUserTask', 0, 'SyncUserTask', NULL, NULL, 4, 120, '00', NULL, '127.0.1.1', '2023-01-13 15:41:40', 0, '2022-07-06 10:49:48', 1, '系统管理员');
+
+
+INSERT INTO `mortals_xhx_param` VALUES (null, null, null, null, 'domain', 'http://192.168.2.169:11071', '1', '4', '0', null, null, null, null);
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/window/model/vo/WindowBusinessVo.java

@@ -25,4 +25,7 @@ public class WindowBusinessVo extends BaseEntityLong {
      */
     private String fromnum;
 
+    /** 窗口id列表 */
+    private List <Long> windowIdList;
+
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/workman/service/impl/WorkmanServiceImpl.java

 package com.mortals.xhx.module.workman.service.impl;
 
-import com.mortals.framework.common.code.UserType;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
-import com.mortals.framework.model.PageInfo;
-import com.mortals.framework.service.IUser;
 import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
 import com.mortals.framework.util.SecurityUtil;
 import com.mortals.framework.util.StringUtils;
-import com.mortals.xhx.base.system.role.model.RoleUserQuery;
-import com.mortals.xhx.base.system.role.service.RoleUserService;
-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.module.workman.dao.WorkmanDao;
+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 org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
-import com.mortals.xhx.module.workman.dao.WorkmanDao;
-import com.mortals.xhx.module.workman.model.WorkmanEntity;
-import com.mortals.xhx.module.workman.service.WorkmanService;
-import org.springframework.util.ObjectUtils;
 
-import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
 
 /**

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
+import com.mortals.framework.util.DateUtils;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.framework.annotation.Operlog;
@@ -18,8 +19,14 @@ 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;
@@ -28,6 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
@@ -44,6 +52,12 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
 
     @Autowired
     private ParamService paramService;
+    @Autowired
+    private SiteService siteService;
+    @Autowired
+    private DeptService deptService;
+    @Autowired
+    private WindowService windowService;
 
     public WorkmanController() {
         super.setModuleDesc("工作人员");
@@ -69,10 +83,10 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
         JSONObject ret = new JSONObject();
         try {
             String ip = super.getRequestIP(request);
-            WorkmanEntity workmanEntity = this.service.doLogin(query.getLoginName(), query.getLoginPwd(),ip);
-           if(query.getSiteId()!=workmanEntity.getSiteId()){
-               throw new AppException("当前工作人员不在当前站点下！");
-           }
+            WorkmanEntity workmanEntity = this.service.doLogin(query.getLoginName(), query.getLoginPwd(), ip);
+            if (query.getSiteId() != workmanEntity.getSiteId()) {
+                throw new AppException("当前工作人员不在当前站点下！");
+            }
             ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
             ret.put(KEY_RESULT_MSG, "工作人员登录成功！");
             ret.put(KEY_RESULT_DATA, workmanEntity);
@@ -105,4 +119,50 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
         }
         return ret.toJSONString();
     }
+
+
+    /**
+     * @param list
+     * @param updateSupport
+     * @param context
+     * @throws AppException
+     */
+    @Override
+    public void doImportDataBefore(List<WorkmanEntity> list, boolean updateSupport, Context context) throws AppException {
+        String queryString = request.getQueryString();
+        String siteId = request.getParameter("siteId");
+        String deptId = request.getParameter("deptId");
+        String windowId = request.getParameter("windowId");
+
+        log.info("queryString:{},siteId:{},deptId:{},windowId:{},", queryString, siteId, deptId, windowId);
+        SiteEntity siteEntity = null;
+        DeptEntity deptEntity = null;
+        WindowEntity windowEntity = null;
+        if (!ObjectUtils.isEmpty(siteId)) {
+            siteEntity = siteService.get(Long.parseLong(siteId));
+        }
+        if (!ObjectUtils.isEmpty(deptId)) {
+            deptEntity = deptService.get(Long.parseLong(deptId));
+        }
+        if (!ObjectUtils.isEmpty(windowId)) {
+            windowEntity = windowService.get(Long.parseLong(windowId));
+        }
+
+        for (WorkmanEntity workmanEntity : list) {
+            if (!ObjectUtils.isEmpty(siteEntity)) {
+                workmanEntity.setSiteId(siteEntity.getId());
+                workmanEntity.setSiteName(siteEntity.getSiteName());
+            }
+            if (!ObjectUtils.isEmpty(deptEntity)) {
+                workmanEntity.setDeptId(deptEntity.getId());
+                workmanEntity.setDeptName(deptEntity.getName());
+            }
+            if (!ObjectUtils.isEmpty(windowEntity)) {
+                workmanEntity.setWindowId(windowEntity.getId());
+                workmanEntity.setWindowName(windowEntity.getName());
+            }
+        }
+
+        super.doImportDataBefore(list, updateSupport, context);
+    }
 }
\ No newline at end of file

base-manager/src/test/java/com/mortals/httpclient/http-client.env.json

@@ -11,5 +11,7 @@
   "base-test1": {
     "baseUrl": "http://192.168.0.98:17211/base"
   },
-
+  "base-yibintest": {
+    "baseUrl": "http://192.168.2.169:11078/base"
+  }
 }
\ No newline at end of file

base-manager/src/test/java/com/mortals/httpclient/window/WindowController.http

@@ -4,7 +4,7 @@ POST {{baseUrl}}/window/list
 Content-Type: application/json
 
 {
-  "siteId":8,
+   "siteId":8,
     "page":1,
     "size":10
 }