2024-04-02 功能优化

src/main/java/com/jianteng/modules/pms/controller/EamController.java

@@ -8,6 +8,7 @@ import com.jianteng.modules.oss.entity.SysOssEntity;
 import com.jianteng.modules.pms.data.*;
 import com.jianteng.modules.pms.service.EamService;
 import com.jianteng.modules.pms.util.ResponseData;
+import com.jianteng.modules.sys.entity.SysRoleEntity;
 import com.jianteng.modules.sys.entity.SysUserEntity;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -2053,4 +2054,15 @@ public class EamController {
         return R.ok().put("rows", list);
     }
 
+
+    /**
+     * 获取用户角色列表
+     * @return
+     */
+    @PostMapping("/getUserRoleList")
+    public R getUserRoleList(){
+        List<SysRoleEntity> list = eamService.getUserRoleList();
+        return R.ok().put("rows", list);
+    }
+
 }

src/main/java/com/jianteng/modules/pms/mapper/EamMapper.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jianteng.modules.base.data.BuData;
 import com.jianteng.modules.oss.entity.SysOssEntity;
 import com.jianteng.modules.pms.data.*;
+import com.jianteng.modules.sys.entity.SysRoleEntity;
 import com.jianteng.modules.sys.entity.SysSceneDynamicControlModelEntity;
 import com.jianteng.modules.sys.entity.SysUserEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -1184,4 +1185,6 @@ public interface EamMapper {
     IPage<EamWorkOrderInData> eamCheckRecordSearch(Page<EamWorkOrderInData> eamWorkOrderInDataPage,@Param("query") EamWorkOrderInData data);
 
     IPage<EamWorkOrderInData> eamDefectRecordSearch(Page<EamWorkOrderInData> eamWorkOrderInDataPage,@Param("query") EamWorkOrderInData data);
+
+    List<SysRoleEntity> getUserRoleList();
 }

src/main/java/com/jianteng/modules/pms/service/EamService.java

@@ -6,6 +6,7 @@ import com.jianteng.modules.base.data.BuData;
 import com.jianteng.modules.pms.util.ResponseData;
 import com.jianteng.modules.oss.entity.SysOssEntity;
 import com.jianteng.modules.pms.data.*;
+import com.jianteng.modules.sys.entity.SysRoleEntity;
 import com.jianteng.modules.sys.entity.SysUserEntity;
 
 import java.util.List;
@@ -1109,4 +1110,6 @@ public interface EamService {
     PageUtils eamCheckRecordSearch(EamWorkOrderInData data);
 
     PageUtils eamDefectRecordSearch(EamWorkOrderInData data);
+
+    List<SysRoleEntity> getUserRoleList();
 }

src/main/java/com/jianteng/modules/pms/service/impl/EamServiceImpl.java

@@ -16,6 +16,7 @@ import com.jianteng.modules.pms.service.EamService;
 import com.jianteng.modules.pms.util.HolidayUtils;
 import com.jianteng.modules.pms.util.SendMessageUtils;
 import com.jianteng.modules.report.dao.ProcedureDao;
+import com.jianteng.modules.sys.entity.SysRoleEntity;
 import com.jianteng.modules.sys.entity.SysSceneDynamicControlModelEntity;
 import com.jianteng.modules.sys.entity.SysUserEntity;
 import org.apache.commons.lang3.StringUtils;
@@ -26,6 +27,10 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.io.IOException;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 @Service
 public class EamServiceImpl implements EamService {
@@ -2346,16 +2351,15 @@ public class EamServiceImpl implements EamService {
             throw new RuntimeException("工厂和部门有误!");
         }
         List<EamAdminData> list = eamMapper.getCheckerList(data);
-        // 如果查询条件有部门
-//        if (StringUtils.isNotBlank(data.getDepartmentName())) {
-//            // 过滤出含有条件的数据
-//            List<EamAdminData> collect = list.stream()
-//                    .filter(a -> StringUtils.isNotBlank(a.getDepartmentName()))
-//                    .filter(b -> b.getDepartmentName().contains(data.getDepartmentName()))
-//                    .collect(Collectors.toList());
-//            return collect;
-//        }
-        return list;
+        List<EamAdminData> returnList = list.stream()
+                .filter(distinctByKey(EamAdminData::getUserId))
+                .collect(Collectors.toList());
+        return returnList;
+    }
+
+    public static <T> Predicate<T> distinctByKey(Function<? super T, ?> keyExtractor) {
+        Map<Object, Boolean> seen = new ConcurrentHashMap<>();
+        return t -> seen.putIfAbsent(keyExtractor.apply(t), Boolean.TRUE) == null;
     }
 
     /**
@@ -2863,6 +2867,12 @@ public class EamServiceImpl implements EamService {
         return new PageUtils(resultList);
     }
 
+    @Override
+    public List<SysRoleEntity> getUserRoleList() {
+        List<SysRoleEntity> list = eamMapper.getUserRoleList();
+        return list;
+    }
+
 
     /**
      * @description: 排列树形集合

src/main/resources/mapper/pms/EamMapper.xml

@@ -699,7 +699,7 @@
             a.WorkTime,
             a.PlanOperatorName,
             a.checkerName,
-            dbo.eam_Get_eamAdminName(a.Site, a.ActualOperator) ActualOperatorName,
+            dbo.eam_Get_eamAdminName(a.Site, a.ActualOperator) actualOperatorName,
             dbo.eam_Get_eamObjectDesc(a.Site, a.bu_no, a.ObjectID) objectDesc,
             dbo.eam_Get_eam_properties_CodeDesc(a.site, a.bu_no, a.FunctionType, a.PropertiesCode) codeDesc,
             a.result,
@@ -1566,8 +1566,8 @@
             <if test = "buDesc != null and buDesc != ''">
                 AND dbo.get_bu_desc(a.site,c.bu_no) LIKE '%' + #{buDesc}+'%'
             </if>
-            <if test = "roleName != null and roleName != ''">
-                AND e.role_name LIKE '%' + #{roleName}+'%'
+            <if test = "roleId != null and roleId != ''">
+                AND d.role_id = #{roleId}
             </if>
         </where>
     </select>
@@ -2757,4 +2757,12 @@
         WHEN b.urgency = '一般' THEN 3
         END
     </select>
+
+    <!-- 获取用户角色列表 -->
+    <select id="getUserRoleList" resultType="SysRoleEntity">
+        SELECT
+            role_id,
+            role_name
+        FROM sys_role
+    </select>
 </mapper>