修改bug

src/main/java/com/care/bms/controller/StationController.java

@@ -124,14 +124,16 @@ public class StationController {
     @GetMapping("/listStation")
     @ApiOperation(value = "服务站列表分页  --四期新增")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(paramType = "query", name = "name", value = "服务站名称")
+            @ApiImplicitParam(paramType = "query", name = "name", value = "服务站名称"),
+            @ApiImplicitParam(paramType = "query", name = "orgId", value = "机构ID")
     })
     public PageResult<List<StationVO>> listStation(HttpServletRequest request, @RequestHeader(value = "token") String token,
                                                        @RequestParam(value = "name", required = false) String name,
+                                                       @RequestParam(value = "orgId", required = false) Long orgId,
                                                        PageReqVO pageReqVo){
         try {
             UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            IPage<StationVO> pageResponse = this.stationService.listStation(name,loginUser ,pageReqVo);
+            IPage<StationVO> pageResponse = this.stationService.listStation(name,orgId,loginUser ,pageReqVo);
             return PageResult.success(pageResponse.getRecords(),pageResponse.getCurrent(),pageResponse.getSize(),pageResponse.getTotal());
         }catch (BDException e) {
             log.error("服务站列表查询-分页列表出现异常",e);

src/main/java/com/care/bms/service/OrganizationService.java

@@ -159,7 +159,7 @@ public class OrganizationService {
             if (code == 1) {
                 JSONArray data = jsonObject.getJSONArray("data");
                 Iterator it = data.iterator();
-
+                List<CareOrganization> list = new ArrayList<>();
                 while (it.hasNext()) {
                     JSONObject obj = (JSONObject) it.next();
                     CareOrganization careOrganization = new CareOrganization();
@@ -169,10 +169,16 @@ public class OrganizationService {
                     careOrganization.setCompanyId(obj.getStr("companyId"));
                     careOrganization.setOrgCode(obj.getStr("companyId"));
                     careOrganization.setCompanyKey(obj.getStr("companyKey"));
-                    careOrganizationService.synOrganization(careOrganization);
+                    list.add(careOrganization);
+
+                }
+                if(!list.isEmpty()){
+                    careOrganizationService.synOrganization(list);
+                    return true;
+                } else {
+                    return false;
                 }
 
-                return true;
             } else {
                 return false;
             }

src/main/java/com/care/bms/service/StationService.java

@@ -43,10 +43,11 @@ public class StationService {
      * 查询服务站列表
      * @return
      */
-    public IPage<StationVO> listStation(String name, UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
+    public IPage<StationVO> listStation(String name, Long orgId, UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
         IPage<CareStation> page = new Page<>(pageReqVo.getCurrent(), pageReqVo.getPageSize());
         QueryWrapper<CareStation> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().like(StrUtil.isNotEmpty(name),CareStation::getName,name)
+                .eq(orgId != null,CareStation::getOrgId,orgId)
                 .eq(CareStation::getOrgId,loginUser.getOrgId())
                 .orderByAsc(CareStation::getName);
 

src/main/java/com/care/common/mapper/CareOrganizationMapper.java

@@ -3,6 +3,8 @@ package com.care.common.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.care.common.entity.CareOrganization;
 
+import java.util.List;
+
 
 /**
  * 机构(CareOrganization)表数据库访问层
@@ -11,5 +13,5 @@ import com.care.common.entity.CareOrganization;
  * @since 2021-05-21 00:08:35
  */
 public interface CareOrganizationMapper extends BaseMapper<CareOrganization> {
-    void synOrganization(CareOrganization careOrganization);
+    void synOrganization(List<CareOrganization> list);
 }

src/main/java/com/care/common/service/CareOrganizationService.java

@@ -3,6 +3,8 @@ package com.care.common.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.care.common.entity.CareOrganization;
 
+import java.util.List;
+
 /**
  * 机构(CareOrganization)表服务接口
  *
@@ -10,5 +12,5 @@ import com.care.common.entity.CareOrganization;
  * @since 2021-05-21 00:08:36
  */
 public interface CareOrganizationService extends IService<CareOrganization> {
-    void synOrganization(CareOrganization careOrganization);
+    void synOrganization(List<CareOrganization> list);
 }

src/main/java/com/care/common/service/impl/CareOrganizationServiceImpl.java

@@ -6,6 +6,8 @@ import com.care.common.mapper.CareOrganizationMapper;
 import com.care.common.service.CareOrganizationService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 机构(CareOrganization)表服务实现类
  *
@@ -14,7 +16,8 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class CareOrganizationServiceImpl extends ServiceImpl<CareOrganizationMapper, CareOrganization> implements CareOrganizationService {
-    public void synOrganization(CareOrganization careOrganization) {
-        this.baseMapper.synOrganization(careOrganization);
+   @Override
+    public void synOrganization(List<CareOrganization> list) {
+        this.baseMapper.synOrganization(list);
     }
 }

src/main/resources/application-dev.properties

@@ -42,7 +42,7 @@ mqtt.username=shangxingkeji
 mqtt.password=sxkj@1234
 
 #是否开启mqtt消息接受服务，开启：1，不开启：0
-mqtt.on=1
+mqtt.on=0
 #设备激活返回消息超时(秒)
 mqtt.dev.jihuo.timeout=30
 

src/main/resources/mybatis/CareOrganizationMapper.xml

@@ -2,13 +2,18 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.care.common.mapper.CareOrganizationMapper">
 
-    <insert id = "synOrganization">
+    <insert id="synOrganization" parameterType="java.util.List">
         insert into care_organization(name,short_name,org_code,company_key,company_id,create_time)
-        values(#{name},#{shortName},#{orgCode},#{companyKey},#{companyId},now())
+        values
+        <foreach collection ="list" item="item" index= "index" separator =",">
+            (
+            #{item.name}, #{item.shortName}, #{item.orgCode},
+            #{item.companyKey},#{item.companyId},now()
+            )
+        </foreach>
         on duplicate key update
         name = values(name),
         short_name = values(short_name),
         company_key = values(company_key)
     </insert>
-
 </mapper>