feat:业务配置新增工种，手动同步利元亨用户按钮

outbridge/src/main/java/com/sdm/outbridge/service/lyric/LyricIntegrateService.java

@@ -503,6 +503,16 @@ public class LyricIntegrateService {
     }
 
     public SdmResponse queryUserList(String workType)
+    {
+        return queryUserList(workType, null);
+    }
+
+    public SdmResponse queryUserList(List<String> workTypeList)
+    {
+        return queryUserList(null, workTypeList);
+    }
+
+    private SdmResponse queryUserList(String workType, List<String> workTypeListParam)
     {
         SdmResponse response = SdmResponse.failed("获取用户列表失败");
         String url = USER_URL + USER_URL_SUFFIX;
@@ -514,6 +524,8 @@ public class LyricIntegrateService {
         GetUserListReq req = new GetUserListReq();
         if (StringUtils.isNotEmpty(workType)) {
             req.setWorkType(workType);
+        } else if (workTypeListParam != null && !workTypeListParam.isEmpty()) {
+            req.setWorkTypeList(workTypeListParam);
         } else {
             req.setWorkTypeList(workTypeList);
         }

outbridge/src/main/resources/common-dev-100.yml

@@ -49,6 +49,6 @@ FREELINK_PUSH_MSG_SUFFIX: /webchat/InformApi/FreelinkAndDingdingInform
 USER_URL: https://url.lyh.haikuicloud.com
 USER_URL_SUFFIX: /integrated/service/api/dynamic/auth/e906d13947944947921bb32c8fcffc6e/2014614168006742016/listPsnByWorkType
 user:
-  workType: 机械设计工种,电气设计工种,工模设计工种,动画设计工种,设计品质保证设计工种,仿真工种,产品工艺工种,PLC程序工种,研发质量管理（程序软控）工种,激光光学工种,激光工艺工种,激光程序工种,激光装调工种,研发质量管理（测试软控）工种
+  workType: 机械设计工种,电气设计工种,工模设计工种,动画设计工种,设计品质保证设计工种,仿真工种,产品工艺工种,PLC程序工种,研发质量管理（程序软控）工种,激光光学工种,激光工艺工种,激光程序工种,激光装调工种,研发质量管理（测试软控）工种,标准化管理工种（机械）
   account: lyric
   password: Lyric#$12389..@

outbridge/src/main/resources/common-dev-190.yml

@@ -50,6 +50,6 @@ FREELINK_PUSH_MSG_SUFFIX: /webchat/InformApi/FreelinkAndDingdingInform
 USER_URL: https://url.lyh.haikuicloud.com
 USER_URL_SUFFIX: /integrated/service/api/dynamic/auth/e906d13947944947921bb32c8fcffc6e/2014614168006742016/listPsnByWorkType
 user:
-  workType: 机械设计工种,电气设计工种,工模设计工种,动画设计工种,设计品质保证设计工种,仿真工种,产品工艺工种,PLC程序工种,研发质量管理（程序软控）工种,激光光学工种,激光工艺工种,激光程序工种,激光装调工种,研发质量管理（测试软控）工种
+  workType: 机械设计工种,电气设计工种,工模设计工种,动画设计工种,设计品质保证设计工种,仿真工种,产品工艺工种,PLC程序工种,研发质量管理（程序软控）工种,激光光学工种,激光工艺工种,激光程序工种,激光装调工种,研发质量管理（测试软控）工种,标准化管理工种（机械）
   account: lyric
   password: Lyric#$12389..@

outbridge/src/main/resources/common-dev-65.yml

@@ -49,6 +49,6 @@ FREELINK_PUSH_MSG_SUFFIX: /webchat/InformApi/FreelinkAndDingdingInform
 USER_URL: https://url.lyh.haikuicloud.com
 USER_URL_SUFFIX: /integrated/service/api/dynamic/auth/e906d13947944947921bb32c8fcffc6e/2014614168006742016/listPsnByWorkType
 user:
-  workType: 机械设计工种,电气设计工种,工模设计工种,动画设计工种,设计品质保证设计工种,仿真工种,产品工艺工种,PLC程序工种,研发质量管理（程序软控）工种,激光光学工种,激光工艺工种,激光程序工种,激光装调工种,研发质量管理（测试软控）工种
+  workType: 机械设计工种,电气设计工种,工模设计工种,动画设计工种,设计品质保证设计工种,仿真工种,产品工艺工种,PLC程序工种,研发质量管理（程序软控）工种,激光光学工种,激光工艺工种,激光程序工种,激光装调工种,研发质量管理（测试软控）工种,标准化管理工种（机械）
   account: lyric
   password: Lyric#$12389..@

outbridge/src/main/resources/common-local.yml

@@ -50,6 +50,6 @@ FREELINK_PUSH_MSG_SUFFIX: /webchat/InformApi/FreelinkAndDingdingInform
 USER_URL: https://url.lyh.haikuicloud.com
 USER_URL_SUFFIX: /integrated/service/api/dynamic/auth/e906d13947944947921bb32c8fcffc6e/2014614168006742016/listPsnByWorkType
 user:
-  workType: 机械设计工种,电气设计工种,工模设计工种,动画设计工种,设计品质保证设计工种,仿真工种,产品工艺工种,PLC程序工种,研发质量管理（程序软控）工种,激光光学工种,激光工艺工种,激光程序工种,激光装调工种,研发质量管理（测试软控）工种
+  workType: 机械设计工种,电气设计工种,工模设计工种,动画设计工种,设计品质保证设计工种,仿真工种,产品工艺工种,PLC程序工种,研发质量管理（程序软控）工种,激光光学工种,激光工艺工种,激光程序工种,激光装调工种,研发质量管理（测试软控）工种,标准化管理工种（机械）
   account: lyric
   password: Lyric#$12389..@

outbridge/src/main/resources/common-lyric.yml

@@ -63,6 +63,6 @@ FREELINK_PUSH_MSG_SUFFIX: /webchat/InformApi/FreelinkAndDingdingInform
 USER_URL: https://url.lyh.haikuicloud.com
 USER_URL_SUFFIX: /integrated/service/api/dynamic/auth/e906d13947944947921bb32c8fcffc6e/2014614168006742016/listPsnByWorkType
 user:
-  workType: 机械设计工种,电气设计工种,工模设计工种,动画设计工种,设计品质保证设计工种,仿真工种,产品工艺工种,PLC程序工种,研发质量管理（程序软控）工种,激光光学工种,激光工艺工种,激光程序工种,激光装调工种,研发质量管理（测试软控）工种
+  workType: 机械设计工种,电气设计工种,工模设计工种,动画设计工种,设计品质保证设计工种,仿真工种,产品工艺工种,PLC程序工种,研发质量管理（程序软控）工种,激光光学工种,激光工艺工种,激光程序工种,激光装调工种,研发质量管理（测试软控）工种,标准化管理工种（机械）
   account: lyric
   password: Lyric#$12389..@

system/src/main/java/com/sdm/system/controller/LyricUserController.java

@@ -1,13 +1,19 @@
 package com.sdm.system.controller;
 
-import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import com.sdm.common.common.SdmResponse;
+import com.sdm.common.common.ThreadLocalContext;
 import com.sdm.outbridge.entity.LyricVUserToDm;
 import com.sdm.outbridge.service.lyric.*;
+import com.sdm.system.model.entity.SystemParamConfigBean;
+import com.sdm.system.service.ISimulationSystemConfigService;
+import com.sdm.system.service.ISysTenantService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
@@ -24,11 +30,51 @@ public class LyricUserController  {
     @Autowired
     private LyricIntegrateService lyricIntegrateService;
 
+    @Autowired
+    private ISimulationSystemConfigService configService;
+
+    @Autowired
+    private ISysTenantService tenantService;
+
+    @Value("${defaultTenantId}")
+    private String defaultTenantId;
+
     @PostMapping("/queryUserList")
     @Operation(summary = "查询利元亨用户列表")
     public SdmResponse<List<LyricVUserToDm>> queryUserList(@RequestParam(required = false) String workType) {
-        SdmResponse sdmResponse = lyricIntegrateService.queryUserList(workType);
+        if (workType != null && !workType.isEmpty()) {
-        return sdmResponse;
+            return lyricIntegrateService.queryUserList(workType);
+        }
+        // 从系统参数配置获取工种列表
+        List<String> workTypeList = new ArrayList<>();
+        try {
+            SdmResponse configResponse = configService.querySystemParamConfig("WORKFORCE_ALLOCATION");
+            if (configResponse != null && configResponse.getData() != null) {
+                SystemParamConfigBean configBean = (SystemParamConfigBean) configResponse.getData();
+                List<String> values = configBean.values;
+                for (String value : values) {
+                    JSONObject jsonObj = JSONObject.parseObject(value);
+                    String wt = jsonObj.getString("workType");
+                    if (wt != null) {
+                        workTypeList.add(wt);
+                    }
+                }
+            }
+        } catch (Exception e) {
+            log.error("解析工种配置失败", e);
+        }
+        log.info("[queryUserList] workTypeList:{}", workTypeList);
+        return lyricIntegrateService.queryUserList(workTypeList);
+    }
+
+    @PostMapping("/syncLyricUsers")
+    @Operation(summary = "同步利元亨用户")
+    public SdmResponse syncLyricUsers() {
+        if (StringUtils.equals(defaultTenantId, String.valueOf(ThreadLocalContext.getTenantId()))) {
+            return SdmResponse.success();
+        }
+        log.info("[syncLyricUsers] start......");
+        return tenantService.allSyncLyricUsers();
     }
 
 }

system/src/main/java/com/sdm/system/service/ISysTenantService.java

@@ -63,4 +63,6 @@ public interface ISysTenantService extends IService<SysTenant> {
       */
      SdmResponse getTenantDetailById(Long tenantId);
 
+    SdmResponse allSyncLyricUsers();
+
 }

system/src/main/java/com/sdm/system/service/impl/CID/CIDtenantServiceImpl.java

@@ -39,6 +39,9 @@ public class CIDtenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
     @Value("${cid.tenant.listTenant}")
     private String listTenant;
 
+    @Value("${cid.tenant.allSyncLyricUsers}")
+    private String allSyncLyricUsers;
+
     @Override
     public String getType() {
         return type;
@@ -107,4 +110,16 @@ public class CIDtenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
             return SdmResponse.failed("查询失败");
         }
     }
+
+    @Override
+    public SdmResponse allSyncLyricUsers() {
+        try {
+            String resultJson = HttpUtil.get(cidUrl + allSyncLyricUsers);
+            log.info("allSyncLyricUsers url:{}, resp: {}", cidUrl + allSyncLyricUsers, resultJson);
+            return JSON.parseObject(resultJson, SdmResponse.class);
+        } catch (Exception e) {
+            log.error("同步用户失败", e);
+            return SdmResponse.failed("同步用户失败");
+        }
+    }
 }

system/src/main/java/com/sdm/system/service/impl/LocalSysTenantServiceImpl.java

@@ -121,4 +121,9 @@ public class LocalSysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysT
         BeanUtils.copyProperties(sysTenant, sysRoleResp);
         return SdmResponse.success(sysRoleResp);
     }
+
+    @Override
+    public SdmResponse allSyncLyricUsers() {
+        return null;
+    }
 }

system/src/main/resources/application-dev-100.yml

@@ -160,6 +160,7 @@ cid:
   tenant:
     getTenantDetailById: /spdm-tenant/getTenantDetailById
     listTenant: /spdm-tenant/listTenant
+    allSyncLyricUsers: /spdm-tenant/allSyncLyricUsers
   flow:
     launchApprove: /spdm-flow/startFlow
     queryFlowTemplate: /spdm-flow/listProcessByGroup

system/src/main/resources/application-dev-190.yml

@@ -160,6 +160,7 @@ cid:
   tenant:
     getTenantDetailById: /spdm-tenant/getTenantDetailById
     listTenant: /spdm-tenant/listTenant
+    allSyncLyricUsers: /spdm-tenant/allSyncLyricUsers
   flow:
     launchApprove: /spdm-flow/startFlow
     queryFlowTemplate: /spdm-flow/listProcessByGroup

system/src/main/resources/application-dev-65.yml

@@ -160,6 +160,7 @@ cid:
   tenant:
     getTenantDetailById: /spdm-tenant/getTenantDetailById
     listTenant: /spdm-tenant/listTenant
+    allSyncLyricUsers: /spdm-tenant/allSyncLyricUsers
   flow:
     launchApprove: /spdm-flow/startFlow
     queryFlowTemplate: /spdm-flow/listProcessByGroup

system/src/main/resources/application-local.yml

@@ -160,6 +160,7 @@ cid:
   tenant:
     getTenantDetailById: /spdm-tenant/getTenantDetailById
     listTenant: /spdm-tenant/listTenant
+    allSyncLyricUsers: /spdm-tenant/allSyncLyricUsers
   flow:
     launchApprove: /spdm-flow/startFlow
     queryFlowTemplate: /spdm-flow/listProcessByGroup

system/src/main/resources/application-lyric.yml

@@ -160,6 +160,7 @@ cid:
   tenant:
     getTenantDetailById: /spdm-tenant/getTenantDetailById
     listTenant: /spdm-tenant/listTenant
+    allSyncLyricUsers: /spdm-tenant/allSyncLyricUsers
   flow:
     launchApprove: /spdm-flow/startFlow
     queryFlowTemplate: /spdm-flow/listProcessByGroup

system/src/main/resources/application-test.yml

@@ -166,6 +166,7 @@ cid:
   tenant:
     getTenantDetailById: /spdm-tenant/getTenantDetailById
     listTenant: /spdm-tenant/listTenant
+    allSyncLyricUsers: /spdm-tenant/allSyncLyricUsers
   flow:
     # 单次批量查询cid审批流详情的条数
     batchCount: 500

system/src/main/resources/application-yian.yml

@@ -161,6 +161,7 @@ cid:
   tenant:
     getTenantDetailById: /spdm-tenant/getTenantDetailById
     listTenant: /spdm-tenant/listTenant
+    allSyncLyricUsers: /spdm-tenant/allSyncLyricUsers
   flow:
     launchApprove: /spdm-flow/startFlow
     queryFlowTemplate: /spdm-flow/listProcessByGroup