修复分页问题

baqing-admin/src/main/java/com/ruoyi/web/modules/diagnosis/controller/BizMedicalResourceController.java

@@ -86,6 +86,14 @@ public class BizMedicalResourceController extends BaseController
         return toAjax(bizMedicalResourceService.deleteBizMedicalResourceByIds(ids, getUsername()));
     }
 
+    @PreAuthorize("@ss.hasPermi('diseaseTreatment:medicalResource:publish')")
+    @Log(title = "畜牧医疗资源批量发布", businessType = BusinessType.UPDATE)
+    @PostMapping("/publish/batch")
+    public AjaxResult publishBatch(@RequestBody Long[] ids)
+    {
+        return toAjax(bizMedicalResourceService.publishByIds(ids));
+    }
+
     @PreAuthorize("@ss.hasPermi('diseaseTreatment:medicalResource:publish')")
     @Log(title = "畜牧医疗资源发布", businessType = BusinessType.UPDATE)
     @PostMapping("/publish/{id}")
@@ -94,6 +102,14 @@ public class BizMedicalResourceController extends BaseController
         return toAjax(bizMedicalResourceService.publish(id));
     }
 
+    @PreAuthorize("@ss.hasPermi('diseaseTreatment:medicalResource:offline')")
+    @Log(title = "畜牧医疗资源批量下架", businessType = BusinessType.UPDATE)
+    @PostMapping("/offline/batch")
+    public AjaxResult offlineBatch(@RequestBody Long[] ids)
+    {
+        return toAjax(bizMedicalResourceService.offlineByIds(ids));
+    }
+
     @PreAuthorize("@ss.hasPermi('diseaseTreatment:medicalResource:offline')")
     @Log(title = "畜牧医疗资源下架", businessType = BusinessType.UPDATE)
     @PostMapping("/offline/{id}")
@@ -102,6 +118,14 @@ public class BizMedicalResourceController extends BaseController
         return toAjax(bizMedicalResourceService.offline(id));
     }
 
+    @PreAuthorize("@ss.hasPermi('diseaseTreatment:medicalResource:assignAccount')")
+    @Log(title = "畜牧医疗资源批量分配账号", businessType = BusinessType.INSERT)
+    @PostMapping("/assignAccount/batch")
+    public AjaxResult assignAccountBatch(@RequestBody Long[] ids)
+    {
+        return toAjax(bizMedicalResourceService.assignAccountByIds(ids, getUsername()));
+    }
+
     @PreAuthorize("@ss.hasPermi('diseaseTreatment:medicalResource:assignAccount')")
     @Log(title = "畜牧医疗资源分配账号", businessType = BusinessType.INSERT)
     @PostMapping("/assignAccount/{id}")

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

@@ -22,5 +22,14 @@ public interface IBizMedicalResourceService
 
     int offline(Long id);
 
+    /** 批量发布；任一记录校验失败则整体回滚 */
+    int publishByIds(Long[] ids);
+
+    /** 批量下架；任一记录校验失败则整体回滚 */
+    int offlineByIds(Long[] ids);
+
     int assignAccount(Long id, String operator);
+
+    /** 批量分配账号；已分配账号的记录跳过，其余按单条规则处理 */
+    int assignAccountByIds(Long[] ids, String operator);
 }

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

@@ -183,11 +183,76 @@ public class BizMedicalResourceServiceImpl implements IBizMedicalResourceService
         return n;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int publishByIds(Long[] ids)
+    {
+        List<Long> cleaned = cleanIds(ids);
+        if (cleaned.isEmpty())
+        {
+            return 0;
+        }
+        int count = 0;
+        for (Long id : cleaned)
+        {
+            count += publish(id);
+        }
+        return count;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int offlineByIds(Long[] ids)
+    {
+        List<Long> cleaned = cleanIds(ids);
+        if (cleaned.isEmpty())
+        {
+            return 0;
+        }
+        int count = 0;
+        for (Long id : cleaned)
+        {
+            count += offline(id);
+        }
+        return count;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int assignAccount(Long id, String operator)
     {
-        BizMedicalResource row = requireRow(id);
+        return doAssignAccount(requireRow(id), operator);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int assignAccountByIds(Long[] ids, String operator)
+    {
+        List<Long> cleaned = cleanIds(ids);
+        if (cleaned.isEmpty())
+        {
+            return 0;
+        }
+        int count = 0;
+        for (Long id : cleaned)
+        {
+            BizMedicalResource row = bizMedicalResourceMapper.selectBizMedicalResourceById(id);
+            if (row == null)
+            {
+                throw new ServiceException("记录不存在或已删除");
+            }
+            if (row.getAccountAssigned() != null
+                    && row.getAccountAssigned() == MedicalResourceRules.ACCOUNT_ASSIGNED_YES)
+            {
+                continue;
+            }
+            count += doAssignAccount(row, operator);
+        }
+        return count;
+    }
+
+    private int doAssignAccount(BizMedicalResource row, String operator)
+    {
         MedicalResourceValidation.validateForAssignAccount(row);
         SysUser user = accountAssigner.createAccount(row, operator);
         row.setAccountAssigned(MedicalResourceRules.ACCOUNT_ASSIGNED_YES);
@@ -207,6 +272,23 @@ public class BizMedicalResourceServiceImpl implements IBizMedicalResourceService
         return row;
     }
 
+    private static List<Long> cleanIds(Long[] ids)
+    {
+        List<Long> cleaned = new ArrayList<>();
+        if (ids == null)
+        {
+            return cleaned;
+        }
+        for (Long id : ids)
+        {
+            if (id != null)
+            {
+                cleaned.add(id);
+            }
+        }
+        return cleaned;
+    }
+
     private void enrichRow(BizMedicalResource row)
     {
         if (row != null)

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

@@ -159,6 +159,30 @@ class BizMedicalResourceControllerApiTest
                 .andExpect(jsonPath("$.code").value(200));
     }
 
+    @Test
+    @DisplayName("POST /publish/batch")
+    void publishBatch() throws Exception
+    {
+        when(bizMedicalResourceService.publishByIds(any())).thenReturn(2);
+        mockMvc.perform(post("/diseaseTreatment/medicalResource/publish/batch")
+                .contentType(MediaType.APPLICATION_JSON)
+                .content("[1,2]"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value(200));
+    }
+
+    @Test
+    @DisplayName("POST /offline/batch")
+    void offlineBatch() throws Exception
+    {
+        when(bizMedicalResourceService.offlineByIds(any())).thenReturn(2);
+        mockMvc.perform(post("/diseaseTreatment/medicalResource/offline/batch")
+                .contentType(MediaType.APPLICATION_JSON)
+                .content("[1,2]"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value(200));
+    }
+
     @Test
     @DisplayName("POST 发布")
     void publish() throws Exception
@@ -179,6 +203,18 @@ class BizMedicalResourceControllerApiTest
                 .andExpect(jsonPath("$.code").value(200));
     }
 
+    @Test
+    @DisplayName("POST /assignAccount/batch")
+    void assignAccountBatch() throws Exception
+    {
+        when(bizMedicalResourceService.assignAccountByIds(any(), eq("tester"))).thenReturn(1);
+        mockMvc.perform(post("/diseaseTreatment/medicalResource/assignAccount/batch")
+                .contentType(MediaType.APPLICATION_JSON)
+                .content("[1,2]"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value(200));
+    }
+
     @Test
     @DisplayName("POST 分配账号")
     void assignAccount() throws Exception

baqing-admin/src/test/java/com/ruoyi/web/modules/diagnosis/service/impl/BizMedicalResourceServiceImplTest.java

@@ -7,6 +7,7 @@ import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -132,6 +133,40 @@ class BizMedicalResourceServiceImplTest
         verify(mapper).logicDeleteBizMedicalResourceByIds(new Long[] { 6L }, "tester");
     }
 
+    @Test
+    @DisplayName("批量发布")
+    void publishByIds()
+    {
+        BizMedicalResource db1 = MedicalResourceTestSamples.sampleVetDraft();
+        db1.setId(1L);
+        db1.setConsultModes("1,2");
+        db1.setServiceWeekdays("1,2,3,4,5");
+        BizMedicalResource db2 = MedicalResourceTestSamples.sampleVetDraft();
+        db2.setId(2L);
+        db2.setConsultModes("1,2");
+        db2.setServiceWeekdays("1,2,3,4,5");
+        when(mapper.selectBizMedicalResourceById(1L)).thenReturn(db1);
+        when(mapper.selectBizMedicalResourceById(2L)).thenReturn(db2);
+        when(mapper.updateBizMedicalResource(any())).thenReturn(1);
+        assertEquals(2, service.publishByIds(new Long[] { 1L, 2L }));
+        verify(mapper, times(2)).updateBizMedicalResource(any());
+    }
+
+    @Test
+    @DisplayName("批量下架")
+    void offlineByIds()
+    {
+        BizMedicalResource db1 = MedicalResourceTestSamples.samplePublishedVet();
+        db1.setId(1L);
+        BizMedicalResource db2 = MedicalResourceTestSamples.samplePublishedVet();
+        db2.setId(2L);
+        when(mapper.selectBizMedicalResourceById(1L)).thenReturn(db1);
+        when(mapper.selectBizMedicalResourceById(2L)).thenReturn(db2);
+        when(mapper.updateBizMedicalResource(any())).thenReturn(1);
+        assertEquals(2, service.offlineByIds(new Long[] { 1L, 2L }));
+        verify(mapper, times(2)).updateBizMedicalResource(any());
+    }
+
     @Test
     @DisplayName("分配账号")
     void assignAccount()
@@ -149,4 +184,39 @@ class BizMedicalResourceServiceImplTest
                 MedicalResourceRules.ACCOUNT_ASSIGNED_YES == r.getAccountAssigned()
                         && Long.valueOf(100L).equals(r.getSysUserId())));
     }
+
+    @Test
+    @DisplayName("批量分配账号跳过已分配")
+    void assignAccountByIdsSkipsAssigned()
+    {
+        BizMedicalResource assigned = MedicalResourceTestSamples.sampleVetDraft();
+        assigned.setId(1L);
+        assigned.setAccountAssigned(MedicalResourceRules.ACCOUNT_ASSIGNED_YES);
+        assigned.setSysUserId(99L);
+        BizMedicalResource unassigned = MedicalResourceTestSamples.sampleVetDraft();
+        unassigned.setId(2L);
+        when(mapper.selectBizMedicalResourceById(1L)).thenReturn(assigned);
+        when(mapper.selectBizMedicalResourceById(2L)).thenReturn(unassigned);
+        SysUser user = new SysUser();
+        user.setUserId(100L);
+        user.setUserName("zhangshouyi2");
+        when(accountAssigner.createAccount(any(), any())).thenReturn(user);
+        when(mapper.updateBizMedicalResource(any())).thenReturn(1);
+        assertEquals(1, service.assignAccountByIds(new Long[] { 1L, 2L }, "admin"));
+        verify(accountAssigner, times(1)).createAccount(any(), any());
+        verify(mapper, times(1)).updateBizMedicalResource(any());
+    }
+
+    @Test
+    @DisplayName("批量分配账号全部已分配返回0")
+    void assignAccountByIdsAllSkipped()
+    {
+        BizMedicalResource assigned = MedicalResourceTestSamples.sampleVetDraft();
+        assigned.setId(1L);
+        assigned.setAccountAssigned(MedicalResourceRules.ACCOUNT_ASSIGNED_YES);
+        when(mapper.selectBizMedicalResourceById(1L)).thenReturn(assigned);
+        assertEquals(0, service.assignAccountByIds(new Long[] { 1L }, "admin"));
+        verify(accountAssigner, never()).createAccount(any(), any());
+        verify(mapper, never()).updateBizMedicalResource(any());
+    }
 }