交易市场平台（供应商）

baqing-admin/src/main/java/com/ruoyi/web/modules/diagnosis/service/impl/BizMedicalResourceServiceImpl.java

@@ -194,6 +194,7 @@ public class BizMedicalResourceServiceImpl implements IBizMedicalResourceService
         row.setAccountAssigned(MedicalResourceRules.ACCOUNT_ASSIGNED_YES);
         row.setSysUserId(user.getUserId());
         row.setAssignedLoginName(user.getUserName());
+        row.setUpdateBy(operator);
         return bizMedicalResourceMapper.updateBizMedicalResource(row);
     }
 

baqing-admin/src/main/java/com/ruoyi/web/modules/diagnosis/support/MedicalResourceAccountAssigner.java

@@ -2,10 +2,12 @@ package com.ruoyi.web.modules.diagnosis.support;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.mapper.SysRoleMapper;
 import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.web.modules.diagnosis.domain.BizMedicalResource;
@@ -22,6 +24,9 @@ public class MedicalResourceAccountAssigner
     @Autowired
     private ISysConfigService configService;
 
+    @Autowired
+    private SysRoleMapper sysRoleMapper;
+
     public SysUser createAccount(BizMedicalResource resource, String operator)
     {
         String loginName = MedicalResourceLoginNameGenerator.generate(
@@ -44,7 +49,7 @@ public class MedicalResourceAccountAssigner
         user.setPassword(SecurityUtils.encryptPassword(initPwd));
         user.setStatus("0");
         user.setCreateBy(operator);
-        user.setRoleIds(new Long[] { MedicalResourceRules.defaultRoleId(resource.getResourceType()) });
+        user.setRoleIds(new Long[] { resolveRoleId(resource.getResourceType()) });
         int rows = sysUserService.insertUser(user);
         if (rows <= 0 || user.getUserId() == null)
         {
@@ -67,4 +72,15 @@ public class MedicalResourceAccountAssigner
         }
         sysUserService.deleteUserById(resource.getSysUserId());
     }
+
+    private long resolveRoleId(String resourceType)
+    {
+        String roleKey = MedicalResourceRules.roleKeyForAssign(resourceType);
+        SysRole role = sysRoleMapper.checkRoleKeyUnique(roleKey);
+        if (role == null || role.getRoleId() == null)
+        {
+            throw new ServiceException(String.format(MedicalResourceRules.MSG_ROLE_NOT_FOUND, roleKey));
+        }
+        return role.getRoleId();
+    }
 }

baqing-admin/src/main/java/com/ruoyi/web/modules/diagnosis/support/MedicalResourceLoginNameGenerator.java

@@ -1,88 +1,18 @@
 package com.ruoyi.web.modules.diagnosis.support;
 
-import net.sourceforge.pinyin4j.PinyinHelper;
-import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType;
-import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat;
-import net.sourceforge.pinyin4j.format.HanyuPinyinToneType;
-import net.sourceforge.pinyin4j.format.HanyuPinyinVCharType;
-import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.web.modules.trading.support.TradingPartnerLoginNameGenerator;
 
 /**
- * 分配账号默认登录名：展示名称汉语拼音（小写、无空格）+ 资源 id。
+ * 分配账号默认登录名：兽医姓名/机构名称汉字拼音首字母（小写）+ 资源 id。
  */
 public final class MedicalResourceLoginNameGenerator
 {
-    private static final HanyuPinyinOutputFormat FORMAT = new HanyuPinyinOutputFormat();
-
-    static
-    {
-        FORMAT.setCaseType(HanyuPinyinCaseType.LOWERCASE);
-        FORMAT.setToneType(HanyuPinyinToneType.WITHOUT_TONE);
-        FORMAT.setVCharType(HanyuPinyinVCharType.WITH_V);
-    }
-
     private MedicalResourceLoginNameGenerator()
     {
     }
 
     public static String generate(String resourceName, Long id)
     {
-        if (id == null)
-        {
-            throw new IllegalArgumentException("id is required");
-        }
-        String base = toPinyinBase(StringUtils.nvl(resourceName, ""));
-        if (base.isEmpty())
-        {
-            base = "user";
-        }
-        return base + id;
-    }
-
-    static String toPinyinBase(String text)
-    {
-        if (StringUtils.isEmpty(text))
-        {
-            return "";
-        }
-        String trimmed = text.trim().replaceAll("\\s+", "");
-        StringBuilder sb = new StringBuilder();
-        for (int i = 0; i < trimmed.length(); i++)
-        {
-            char c = trimmed.charAt(i);
-            if (c <= 127 && Character.isLetterOrDigit(c))
-            {
-                sb.append(Character.toLowerCase(c));
-            }
-            else if (isChinese(c))
-            {
-                appendPinyin(sb, c);
-            }
-        }
-        return sb.toString();
-    }
-
-    private static void appendPinyin(StringBuilder sb, char c)
-    {
-        try
-        {
-            String[] arr = PinyinHelper.toHanyuPinyinStringArray(c, FORMAT);
-            if (arr != null && arr.length > 0 && StringUtils.isNotEmpty(arr[0]))
-            {
-                sb.append(arr[0]);
-            }
-        }
-        catch (Exception ex)
-        {
-            // skip unmapped char
-        }
-    }
-
-    private static boolean isChinese(char c)
-    {
-        Character.UnicodeBlock block = Character.UnicodeBlock.of(c);
-        return block == Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS
-                || block == Character.UnicodeBlock.CJK_COMPATIBILITY_IDEOGRAPHS
-                || block == Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A;
+        return TradingPartnerLoginNameGenerator.generate(resourceName, id);
     }
 }

baqing-admin/src/main/java/com/ruoyi/web/modules/diagnosis/support/MedicalResourceRules.java

@@ -40,8 +40,22 @@ public final class MedicalResourceRules
 
     public static final String DEL_FLAG_DELETED = "2";
 
+    /** 兽医人员平台角色权限字符（sys_role.role_key） */
+    public static final String ROLE_KEY_VET = "vet";
+
+    /** 诊疗机构平台角色权限字符（sys_role.role_key） */
+    public static final String ROLE_KEY_INS = "ins";
+
+    public static final String MSG_ROLE_NOT_FOUND = "未配置权限字符为「%s」的角色，无法分配账号";
+
+    /**
+     * 历史常量；分配账号请使用 {@link #ROLE_KEY_VET} 解析角色。
+     */
     public static final long ROLE_ID_VET = 100L;
 
+    /**
+     * 历史常量；分配账号请使用 {@link #ROLE_KEY_INS} 解析角色。
+     */
     public static final long ROLE_ID_ORG = 102L;
 
     public static final int MIN_NAME_LEN = 1;
@@ -128,15 +142,15 @@ public final class MedicalResourceRules
         return lower.endsWith(".jpg") || lower.endsWith(".jpeg") || lower.endsWith(".png");
     }
 
-    public static long defaultRoleId(String resourceType)
+    public static String roleKeyForAssign(String resourceType)
     {
         if (RESOURCE_TYPE_VET.equals(resourceType))
         {
-            return ROLE_ID_VET;
+            return ROLE_KEY_VET;
         }
         if (RESOURCE_TYPE_ORG.equals(resourceType))
         {
-            return ROLE_ID_ORG;
+            return ROLE_KEY_INS;
         }
         throw new IllegalArgumentException("resourceType cannot assign account");
     }

baqing-admin/src/test/java/com/ruoyi/web/modules/diagnosis/MedicalResourceTestSamples.java

@@ -65,4 +65,22 @@ public final class MedicalResourceTestSamples
         row.setPublishTime(new java.util.Date());
         return row;
     }
+
+    public static BizMedicalResource sampleOrgDraft()
+    {
+        BizMedicalResource row = new BizMedicalResource();
+        row.setResourceType(MedicalResourceRules.RESOURCE_TYPE_ORG);
+        row.setResourceName("巴青动物医院");
+        row.setPhotoFileUrl(PHOTO_URL);
+        row.setPhotoFilePath(PHOTO_PATH);
+        row.setIntroduction("机构简介");
+        row.setContactPhone("13800138002");
+        row.setAffiliatedUnit("巴青县畜牧局");
+        row.setDetailAddress("中心街10号");
+        row.setOrgLevel(MedicalResourceRules.ORG_LEVEL_CLINIC);
+        row.setMaxDailyAppointments(50);
+        row.setPublishStatus(MedicalResourceRules.PUBLISH_STATUS_DRAFT);
+        row.setAccountAssigned(MedicalResourceRules.ACCOUNT_ASSIGNED_NO);
+        return row;
+    }
 }

baqing-admin/src/test/java/com/ruoyi/web/modules/diagnosis/support/MedicalResourceAccountAssignerTest.java

@@ -0,0 +1,95 @@
+package com.ruoyi.web.modules.diagnosis.support;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.system.mapper.SysRoleMapper;
+import com.ruoyi.system.service.ISysConfigService;
+import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.web.modules.diagnosis.MedicalResourceTestSamples;
+import com.ruoyi.web.modules.diagnosis.domain.BizMedicalResource;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+@DisplayName("MedicalResourceAccountAssigner")
+class MedicalResourceAccountAssignerTest
+{
+    @Mock
+    private ISysUserService sysUserService;
+
+    @Mock
+    private ISysConfigService configService;
+
+    @Mock
+    private SysRoleMapper sysRoleMapper;
+
+    @InjectMocks
+    private MedicalResourceAccountAssigner assigner;
+
+    @Test
+    @DisplayName("兽医绑定 vet 角色")
+    void createAccountVet()
+    {
+        BizMedicalResource resource = MedicalResourceTestSamples.sampleVetDraft();
+        resource.setId(12L);
+        resource.setResourceName("张兽医");
+        SysRole role = new SysRole();
+        role.setRoleId(100L);
+        when(sysRoleMapper.checkRoleKeyUnique(MedicalResourceRules.ROLE_KEY_VET)).thenReturn(role);
+        when(sysUserService.checkUserNameUnique(any())).thenReturn(true);
+        when(configService.selectConfigByKey("sys.user.initPassword")).thenReturn("123456");
+        when(sysUserService.insertUser(any())).thenAnswer(inv -> {
+            SysUser u = inv.getArgument(0);
+            u.setUserId(1L);
+            return 1;
+        });
+
+        SysUser user = assigner.createAccount(resource, "admin");
+        assertEquals("zsy12", user.getUserName());
+        verify(sysRoleMapper).checkRoleKeyUnique(MedicalResourceRules.ROLE_KEY_VET);
+    }
+
+    @Test
+    @DisplayName("机构绑定 ins 角色")
+    void createAccountOrg()
+    {
+        BizMedicalResource resource = MedicalResourceTestSamples.sampleOrgDraft();
+        resource.setId(8L);
+        resource.setResourceName("巴青县动物医院");
+        SysRole role = new SysRole();
+        role.setRoleId(102L);
+        when(sysRoleMapper.checkRoleKeyUnique(MedicalResourceRules.ROLE_KEY_INS)).thenReturn(role);
+        when(sysUserService.checkUserNameUnique(any())).thenReturn(true);
+        when(configService.selectConfigByKey("sys.user.initPassword")).thenReturn("123456");
+        when(sysUserService.insertUser(any())).thenAnswer(inv -> {
+            SysUser u = inv.getArgument(0);
+            u.setUserId(2L);
+            return 1;
+        });
+
+        assigner.createAccount(resource, "admin");
+        verify(sysRoleMapper).checkRoleKeyUnique(MedicalResourceRules.ROLE_KEY_INS);
+    }
+
+    @Test
+    @DisplayName("角色不存在")
+    void roleMissing()
+    {
+        BizMedicalResource resource = MedicalResourceTestSamples.sampleVetDraft();
+        resource.setId(1L);
+        when(sysUserService.checkUserNameUnique(any())).thenReturn(true);
+        when(sysRoleMapper.checkRoleKeyUnique(MedicalResourceRules.ROLE_KEY_VET)).thenReturn(null);
+        assertThrows(ServiceException.class, () -> assigner.createAccount(resource, "admin"));
+    }
+}

baqing-admin/src/test/java/com/ruoyi/web/modules/diagnosis/support/MedicalResourceLoginNameGeneratorTest.java

@@ -11,12 +11,10 @@ class MedicalResourceLoginNameGeneratorTest
 {
 
     @Test
-    @DisplayName("拼音+id")
+    @DisplayName("拼音首字母+id")
     void generate()
     {
-        String login = MedicalResourceLoginNameGenerator.generate("张兽医", 12L);
-        assertTrue(login.endsWith("12"));
-        assertTrue(login.length() > 2);
+        assertEquals("zsy12", MedicalResourceLoginNameGenerator.generate("张兽医", 12L));
     }
 
     @Test

baqing-admin/src/test/java/com/ruoyi/web/modules/diagnosis/support/MedicalResourceRulesTest.java

@@ -11,12 +11,14 @@ class MedicalResourceRulesTest
 {
 
     @Test
-    @DisplayName("分配账号默认角色 100/102")
-    void defaultRoleId()
+    @DisplayName("分配账号角色权限字符")
+    void roleKeyForAssign()
     {
-        assertEquals(100L, MedicalResourceRules.defaultRoleId(MedicalResourceRules.RESOURCE_TYPE_VET));
-        assertEquals(102L, MedicalResourceRules.defaultRoleId(MedicalResourceRules.RESOURCE_TYPE_ORG));
+        assertEquals(MedicalResourceRules.ROLE_KEY_VET,
+                MedicalResourceRules.roleKeyForAssign(MedicalResourceRules.RESOURCE_TYPE_VET));
+        assertEquals(MedicalResourceRules.ROLE_KEY_INS,
+                MedicalResourceRules.roleKeyForAssign(MedicalResourceRules.RESOURCE_TYPE_ORG));
         assertThrows(IllegalArgumentException.class,
-                () -> MedicalResourceRules.defaultRoleId(MedicalResourceRules.RESOURCE_TYPE_TEAM));
+                () -> MedicalResourceRules.roleKeyForAssign(MedicalResourceRules.RESOURCE_TYPE_TEAM));
     }
 }

doc/牧业疫病诊疗服务/畜牧医疗资源管理/畜牧医疗资源管理功能需求-草稿.md

@@ -12,7 +12,7 @@
 8. 发布后不允许编辑、删除；下架后可以再次编辑、删除。
 9. 支持查看对应资源类型的表单数据。
 10. 支持逻辑删除对应资源类型的兽医资源；如该兽医资源已分配账号，同时删除账号。
-11. 兽医人员库、诊疗机构库列表有“分配账号”操作，账号名称默认为兽医姓名、机构名称的拼音+该条记录的数据库Id，角色分别默认为编号为100、102对应的角色；分配账号只允许操作一次。
+11. 兽医人员库、诊疗机构库列表有“分配账号”操作，账号名称默认为兽医姓名、机构名称的拼音+该条记录的数据库Id，角色分别默认为权限字符为vet、ins对应的角色；分配账号只允许操作一次。
 12. 诊疗机构库、医疗设备库列表有“地图标点”操作。
 13. 地图标点：暂不实现。
 14. 异常返回：统一格式 code、msg、data。