From 0843d9fa608a6d319d9d1c37860a0f16ce263a19 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期一, 30 六月 2025 15:37:25 +0800
Subject: [PATCH] 设备车间管理与用户
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/WorkShopDepartController.java | 16 +++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IWorkShopDepartService.java | 7 ++
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java | 24 +++++--
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/WorkShopDepartUserController.java | 16 +++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/WorkShopDepartServiceImpl.java | 14 ++++
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java | 22 +++++--
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java | 18 ++++-
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml | 9 ++-
8 files changed, 104 insertions(+), 22 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/WorkShopDepartController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/WorkShopDepartController.java
index fc1b34c..77fd547 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/WorkShopDepartController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/WorkShopDepartController.java
@@ -9,6 +9,7 @@
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.entity.WorkShopDepart;
import org.jeecg.modules.eam.model.EamWorkShopDepartTreeModel;
+import org.jeecg.modules.eam.model.WorkShopIdModel;
import org.jeecg.modules.eam.service.IWorkShopDepartService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -80,6 +81,21 @@
return result;
}
+ @AutoLog(value = "浜х嚎琛�-鏌ヨ鏍戝舰缁撴瀯鎵�鏈変骇绾垮悕绉�")
+ @ApiOperation(value = "浜х嚎琛�-鏌ヨ鏍戝舰缁撴瀯鎵�鏈変骇绾垮悕绉�", notes = "浜х嚎琛�-鏌ヨ鏍戝舰缁撴瀯鎵�鏈変骇绾垮悕绉�")
+ @GetMapping(value = "/queryIdTree")
+ public Result<List<WorkShopIdModel>> queryIdTree() {
+ Result<List<WorkShopIdModel>> result = new Result<>();
+ try {
+ List<WorkShopIdModel> list = workShopDepartService.queryProductionIdTreeList();
+ result.setResult(list);
+ result.setSuccess(true);
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ }
+ return result;
+ }
+
/**
* 娣诲姞
*
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/WorkShopDepartUserController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/WorkShopDepartUserController.java
index 6627a9b..1d65cd3 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/WorkShopDepartUserController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/WorkShopDepartUserController.java
@@ -20,6 +20,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
+import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.service.ISysUserService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -50,6 +52,8 @@
@Autowired
private IWorkShopDepartUserService workShopDepartUserService;
+ @Autowired
+ private ISysUserService sysUserService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
@@ -72,6 +76,18 @@
return Result.OK(pageList);
}
+ @RequestMapping(value = "/workShopDepartUserList", method = RequestMethod.GET)
+ public Result<IPage<SysUser>> userRoleList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+ Result<IPage<SysUser>> result = new Result<IPage<SysUser>>();
+ Page<SysUser> page = new Page<SysUser>(pageNo, pageSize);
+ String workShopDepartId = req.getParameter("workShopDepartId");
+ IPage<SysUser> pageList = sysUserService.getUserByworkShopDepartId(page, workShopDepartId);
+ result.setSuccess(true);
+ result.setResult(pageList);
+ return result;
+ }
+
/**
* 娣诲姞
*
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IWorkShopDepartService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IWorkShopDepartService.java
index c7da5cf..245b210 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IWorkShopDepartService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IWorkShopDepartService.java
@@ -3,6 +3,8 @@
import org.jeecg.modules.eam.entity.WorkShopDepart;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.eam.model.EamWorkShopDepartTreeModel;
+import org.jeecg.modules.eam.model.WorkShopIdModel;
+import org.jeecg.modules.system.model.ProductionIdModel;
import java.util.List;
@@ -37,6 +39,11 @@
void saveWorkShopDepartData(WorkShopDepart workShopDepart);
/**
+ * 鏌ヨ鎵�鏈夐儴闂―epartId淇℃伅,骞跺垎鑺傜偣杩涜鏄剧ず
+ */
+ List<WorkShopIdModel> queryProductionIdTreeList();
+
+ /**
* 鏇存柊浜х嚎鏁版嵁
*/
boolean updateWorkShopDepartDataById(WorkShopDepart workShopDepart);
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/WorkShopDepartServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/WorkShopDepartServiceImpl.java
index 6df5ebc..f872bf6 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/WorkShopDepartServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/WorkShopDepartServiceImpl.java
@@ -13,9 +13,9 @@
import org.jeecg.modules.eam.mapper.WorkShopDepartMapper;
import org.jeecg.modules.eam.mapper.WorkShopDepartUserMapper;
import org.jeecg.modules.eam.model.EamWorkShopDepartTreeModel;
+import org.jeecg.modules.eam.model.WorkShopIdModel;
import org.jeecg.modules.eam.service.IWorkShopDepartService;
import org.jeecg.modules.eam.util.FindsWorkShopDepartsChildrenUtil;
-import org.jeecg.modules.system.entity.MdcUserProduction;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.mapper.SysUserMapper;
import org.springframework.beans.factory.annotation.Autowired;
@@ -126,6 +126,18 @@
}
}
+ @Override
+ @Cacheable(value = "eam:cache:workshop:allids")
+ public List<WorkShopIdModel> queryProductionIdTreeList() {
+ LambdaQueryWrapper<WorkShopDepart> query = new LambdaQueryWrapper<>();
+ query.eq(WorkShopDepart::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
+ query.orderByAsc(WorkShopDepart::getWorkShopOrder);
+ List<WorkShopDepart> list = this.list(query);
+ //璋冪敤wrapTreeDataToTreeList鏂规硶鐢熸垚鏍戠姸鏁版嵁
+ return FindsWorkShopDepartsChildrenUtil.wrapTreeDataToProductionIdTreeList(list);
+ }
+
+
/**
* updateProductionDataById 瀵瑰簲 edit 鏍规嵁璁惧杞﹂棿绠＄悊涓婚敭鏉ユ洿鏂板搴旂殑璁惧杞﹂棿绠＄悊鏁版嵁
*/
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java
index 8b2cb6f..e6eba38 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java
@@ -62,22 +62,30 @@
* @return
*/
IPage<SysUser> getUserByRoleId(Page page, @Param("roleId") String roleId, @Param("username") String username);
-
+
+ /**
+ * 鏍规嵁璁惧杞﹂棿绠＄悊Id鏌ヨ
+ * @param page
+ * @param workShopDepartId 璁惧杞﹂棿绠＄悊Id
+ * @return
+ */
+ IPage<SysUser> getUserByWorkShopDepartId(Page page, @Param("workShopDepartId") String workShopDepartId);
+
/**
* 鏍规嵁鐢ㄦ埛鍚嶈缃儴闂↖D
* @param username
* @param orgCode
*/
void updateUserDepart(@Param("username") String username,@Param("orgCode") String orgCode);
-
+
/**
* 鏍规嵁鎵嬫満鍙锋煡璇㈢敤鎴蜂俊鎭�
* @param phone
* @return
*/
public SysUser getUserByPhone(@Param("phone") String phone);
-
-
+
+
/**
* 鏍规嵁閭鏌ヨ鐢ㄦ埛淇℃伅
* @param email
@@ -150,7 +158,7 @@
*/
@Deprecated
int updateNullByEmptyString(@Param("fieldName") String fieldName);
-
+
/**
* 鏍规嵁閮ㄩ棬Ids,鏌ヨ閮ㄩ棬涓嬬敤鎴蜂俊鎭�
* @param departIds
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml
index a1edd02..4a9892b 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml
@@ -45,7 +45,7 @@
and username = #{username}
</if>
</select>
-
+
<!-- 淇敼鐢ㄦ埛閮ㄩ棬code -->
<update id="updateUserDepart">
UPDATE sys_user SET org_code = #{orgCode} where username = #{username}
@@ -55,7 +55,7 @@
<select id="getUserByPhone" resultType="org.jeecg.modules.system.entity.SysUser">
select * from sys_user where phone = #{phone} and del_flag = 0
</select>
-
+
<!-- 鏍规嵁閭鏌ヨ鐢ㄦ埛淇℃伅 -->
<select id="getUserByEmail" resultType="org.jeecg.modules.system.entity.SysUser">
select * from sys_user where email = #{email} and del_flag = 0
@@ -230,4 +230,7 @@
#{roleCode}
</foreach>
</select>
-</mapper>
\ No newline at end of file
+ <select id="getUserByWorkShopDepartId" resultType="org.jeecg.modules.system.entity.SysUser">
+ select * from sys_user where del_flag = 0 and id in (select user_id from mom_eam_work_shop_depart_user where work_shop_depart_id = #{workShopDepartId})
+ </select>
+</mapper>
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
index e44b1a4..0f15266 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
@@ -66,15 +66,15 @@
* @return SysUser
*/
public SysUser getUserByName(String username);
-
+
/**
* 娣诲姞鐢ㄦ埛鍜岀敤鎴疯鑹插叧绯�
* @param user
* @param roles
*/
public void addUserWithRole(SysUser user,String roles);
-
-
+
+
/**
* 淇敼鐢ㄦ埛鍜岀敤鎴疯鑹插叧绯�
* @param user
@@ -97,7 +97,7 @@
* @return
*/
public SysRoleIndex getDynamicIndexByUserRole(String username,String version);
-
+
/**
* 鏌ヨ鐢ㄦ埛淇℃伅鍖呮嫭 閮ㄩ棬淇℃伅
* @param username
@@ -162,6 +162,16 @@
*/
public IPage<SysUser> getUserByRoleId(Page<SysUser> page,String roleId, String username);
+
+ /**
+ * 鏍规嵁璁惧杞﹂棿绠＄悊Id鏌ヨ
+ * @param page
+ * @param workShopDepartId 璁惧杞﹂棿绠＄悊Id
+ * @return
+ */
+ public IPage<SysUser> getUserByworkShopDepartId(Page<SysUser> page,String workShopDepartId);
+
+
/**
* 閫氳繃鐢ㄦ埛鍚嶈幏鍙栫敤鎴疯鑹查泦鍚�
*
@@ -177,14 +187,14 @@
* @return 鏉冮檺闆嗗悎
*/
Set<String> getUserPermissionsSet(String username);
-
+
/**
* 鏍规嵁鐢ㄦ埛鍚嶈缃儴闂↖D
* @param username
* @param orgCode
*/
void updateUserDepart(String username,String orgCode);
-
+
/**
* 鏍规嵁鎵嬫満鍙疯幏鍙栫敤鎴峰悕鍜屽瘑鐮�
* @param phone 鎵嬫満鍙�
@@ -214,7 +224,7 @@
* @param departs
*/
void editUserWithDepart(SysUser user, String departs);
-
+
/**
* 鏍￠獙鐢ㄦ埛鏄惁鏈夋晥
* @param sysUser
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
index f19edce..96ad5de 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
@@ -48,7 +48,7 @@
@Service
@Slf4j
public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements ISysUserService {
-
+
@Autowired
private SysUserMapper userMapper;
@Autowired
@@ -141,8 +141,8 @@
public SysUser getUserByName(String username) {
return userMapper.getUserByName(username);
}
-
-
+
+
@Override
@Transactional(rollbackFor = Exception.class)
public void addUserWithRole(SysUser user, String roles) {
@@ -203,7 +203,7 @@
roleIndex = list.get(0);
}
}
-
+
//濡傛灉componentUrl涓虹┖锛屽垯杩斿洖绌�
if(oConvertUtils.isEmpty(roleIndex.getComponent())){
return null;
@@ -269,7 +269,7 @@
info.setSysUserName(sysUser.getRealname());
info.setSysOrgCode(sysUser.getOrgCode());
}
-
+
//澶氶儴闂ㄦ敮鎸乮n鏌ヨ
List<SysDepart> list = sysDepartMapper.queryUserDeparts(sysUser.getId());
List<String> sysMultiOrgCode = new ArrayList<String>();
@@ -285,7 +285,7 @@
}
}
info.setSysMultiOrgCode(sysMultiOrgCode);
-
+
return info;
}
@@ -357,6 +357,16 @@
return userMapper.getUserByRoleId(page,roleId,username);
}
+ /**
+ * 鏍规嵁璁惧杞﹂棿绠＄悊Id鏌ヨ
+ * @param page
+ * @param workShopDepartId 璁惧杞﹂棿绠＄悊Id
+ * @return
+ */
+ public IPage<SysUser> getUserByworkShopDepartId(Page<SysUser> page,String workShopDepartId){
+ return userMapper.getUserByWorkShopDepartId(page,workShopDepartId);
+ }
+
@Override
@CacheEvict(value= {CacheConstant.SYS_USERS_CACHE}, key="#username")
--
Gitblit v1.9.3