小区

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/CommunityMapper.xml

@@ -29,6 +29,7 @@
   </sql>
 
   <sql id="permissionCondition">
+    <if test="condition.tenantId != null">and sc.tenant_id = #{condition.tenantId}</if>
     <if test="condition.userType!=null and condition.userType!=-999 and condition.userType!=-9999 and  condition.programItems != null and condition.programItems.size() > 0">
       <if test="condition.permissionType == 5 or condition.permissionType == 2">
         and ( sc.dept_org_id in

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/SyncDataApi.java

@@ -7,20 +7,21 @@ import com.zcxk.rmcp.api.dto.install.InstallPlanDataDto;
 import com.zcxk.rmcp.api.dto.install.InstallPlanInputDto;
 import com.zcxk.rmcp.api.dto.install.MeterSyncDto;
 import com.zcxk.rmcp.api.dto.install.MeterSyncInputDto;
+import com.zcxk.rmcp.api.dto.meterreadrecord.MeterReadRecordSyncDto;
 import com.zcxk.rmcp.api.feign.SyncDataClient;
+import com.zcxk.rmcp.api.vo.MeterReadRecordVo;
 import com.zcxk.rmcp.core.dao.DeviceMapper;
 import com.zcxk.rmcp.web.logAdvice.LogAnnotation;
+import com.zcxk.rmcp.web.service.MeterReadRecordService;
 import com.zcxk.rmcp.web.service.install.InstallPlanService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.List;
 
@@ -41,6 +42,9 @@ public class SyncDataApi {
     @Autowired
     private SyncDataClient syncDataClient;
 
+    @Resource
+    private MeterReadRecordService meterReadRecordService;
+
     @ResponseBody
     @PostMapping("syncPlan")
     @ApiOperation(value = "同步计划")
@@ -60,6 +64,7 @@ public class SyncDataApi {
         return list;
     }
 
+
     @PostMapping("test")
     public void test(){
         InstallPlanInputDto dto = new InstallPlanInputDto();

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/service/impl/CommunityServiceImpl.java

@@ -63,7 +63,7 @@ public class CommunityServiceImpl implements CommunityService {
         LoginUser loginUser = UserUtil.getCurrentUser();
         // 获取小区最大值，然后加1
         String communityCode = communityMapper.getMaxCodeBySiteId(loginUser.getTenantId());
-        String code = StringUtils.isNotEmpty(communityCode) ? DEFAULT_CODE :String.format("%03d",Integer.valueOf(communityCode));
+        String code = StringUtils.isEmpty(communityCode) ? DEFAULT_CODE :String.format("%03d",Integer.valueOf(communityCode));
         community.setCode(code);
         community.setStatus(StatusEnum.OK.getCode());
         community.setTenantId(loginUser.getTenantId());