光电直读BUG

smart-city-platform/src/main/java/com/bz/smart_city/commom/security/WebSecurityConfig.java

@@ -101,7 +101,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 .antMatchers("/payFee/payFee")
                 .antMatchers("/printinvoice/InvoicePrintRequest")
                 .antMatchers("/waterMeter/getMeterByDeviceNo")
-                .antMatchers("/device/synArchies")
+                .antMatchers("/device/synArchies","/installPlan/syncPlan")
                 .antMatchers("/druid/**");
     }
 

smart-city-platform/src/main/java/com/bz/smart_city/controller/DeviceController.java

@@ -349,7 +349,8 @@ public class DeviceController {
     public AjaxMessage batchReleaseFiles(
             @ApiParam(value = "设备", required = true) @RequestBody(required = true) InputDeviceDto inputDeviceDto
     ) {
-        waterRelatedDeviceService.batchReleaseFiles(inputDeviceDto);
+        LoginUser loginUser = UserUtil.getCurrentUser();
+        waterRelatedDeviceService.batchReleaseFiles(loginUser,inputDeviceDto);
         return new AjaxMessage(ResultStatus.OK);
     }
 

smart-city-platform/src/main/java/com/bz/smart_city/controller/assistant/InstallPlanController.java

@@ -77,6 +77,15 @@ public class InstallPlanController {
         return new AjaxMessage(ResultStatus.OK);
     }
 
+    @PostMapping("syncPlan")
+    @ApiOperation(value = "同步计划")
+    public AjaxMessage syncPlan(
+            @ApiParam(value = "安装计划", required = true) @RequestBody(required = true) InstallPlanInputDTO installPlanInput
+    ) {
+        installPlanService.syncPlan(installPlanInput);
+        return new AjaxMessage(ResultStatus.OK);
+    }
+
     @PostMapping("addJF")
     //@PreAuthorize("hasAuthority('sys:installPlan:add')")
     @ApiOperation(value = "添加安装计划(计费管理)", notes = "权限：sys:installPlan:add")

smart-city-platform/src/main/java/com/bz/smart_city/controller/pay/archives/PayBaseCustomerandmeterrelaController.java

@@ -21,7 +21,6 @@ import org.springframework.stereotype.Controller;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import sun.rmi.runtime.Log;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

smart-city-platform/src/main/java/com/bz/smart_city/controller/system/ConcentratorController.java

@@ -3,8 +3,10 @@ package com.bz.smart_city.controller.system;
 import com.bz.smart_city.commom.model.AjaxMessage;
 import com.bz.smart_city.commom.model.Pagination;
 import com.bz.smart_city.commom.model.ResultStatus;
+import com.bz.smart_city.commom.util.UserUtil;
 import com.bz.smart_city.dto.BuildingSelectDto;
 import com.bz.smart_city.dto.ConcentratorDto;
+import com.bz.smart_city.dto.LoginUser;
 import com.bz.smart_city.entity.ChannelNumber;
 import com.bz.smart_city.entity.Concentrator;
 import com.bz.smart_city.entity.ConcentratorCheck;
@@ -187,7 +189,8 @@ public class ConcentratorController {
     public AjaxMessage archives(
             @ApiParam(value = "集中器id", required = false) @RequestParam(required = false) Integer concentratorId
     ) {
-        concentratorCheckService.archivesCheck(concentratorId);
+        LoginUser loginUser = UserUtil.getCurrentUser();
+        concentratorCheckService.archivesCheck(loginUser,concentratorId);
         return new AjaxMessage(ResultStatus.OK);
     }
 

smart-city-platform/src/main/java/com/bz/smart_city/entity/Import.java

@@ -18,7 +18,7 @@ public class Import {
     @ApiModelProperty(value="用户id")
     private Integer userId;
 
-    @ApiModelProperty(value="导入类型 1：新装水表 2:设备列表 3:建筑")
+    @ApiModelProperty(value="导入类型 1：新装水表 2:设备列表 3:建筑 4:批量开户 5:集中器 6:采集器")
     private Integer type;
 
     @ApiModelProperty(value="导入文件路径")

smart-city-platform/src/main/java/com/bz/smart_city/service/ConcentratorCheckService.java

@@ -3,6 +3,7 @@ package com.bz.smart_city.service;
 import java.util.List;
 
 import com.bz.smart_city.commom.model.Pagination;
+import com.bz.smart_city.dto.LoginUser;
 import com.bz.smart_city.entity.ConcentratorCheck;
 public interface ConcentratorCheckService{
 
@@ -13,7 +14,7 @@ public interface ConcentratorCheckService{
 
     int batchInsert(List<ConcentratorCheck> list);
 
-    void archivesCheck(Integer concentratorId);
+    void archivesCheck(LoginUser loginUser, Integer concentratorId);
 
     Pagination<ConcentratorCheck> getPage(Integer concentratorId, Integer checkResult, int pageNum, int pageSize);
 

smart-city-platform/src/main/java/com/bz/smart_city/service/WaterRelatedDeviceService.java

@@ -3,6 +3,7 @@ package com.bz.smart_city.service;
 import java.util.List;
 
 import com.bz.smart_city.dto.InputDeviceDto;
+import com.bz.smart_city.dto.LoginUser;
 import com.bz.smart_city.entity.WaterRelatedDevice;
 
 public interface WaterRelatedDeviceService {
@@ -16,7 +17,7 @@ public interface WaterRelatedDeviceService {
 
     void fileReset(InputDeviceDto inputDeviceDto);
 
-    void batchReleaseFiles(InputDeviceDto inputDeviceDto);
+    void batchReleaseFiles(LoginUser loginUser, InputDeviceDto inputDeviceDto);
 }
 
 

smart-city-platform/src/main/java/com/bz/smart_city/service/assistant/InstallPlanService.java

@@ -28,6 +28,8 @@ public interface InstallPlanService {
 
     void add(InstallPlanInputDTO installPlanInput);
 
+    void syncPlan(InstallPlanInputDTO installPlanInput);
+
     void addJF(InstallPlanInputDTO installPlanInput);
 
     void delete(Integer id);

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/CommunityServiceImpl.java

@@ -99,7 +99,7 @@ public class CommunityServiceImpl implements CommunityService{
 
     @Override
     public int updateByPrimaryKeySelective(Community community){
-        community.setUpdateBy(UserUtil.getCurrentUser().getUsername());
+        community.setUpdateBy("system");
         community.setDateUpdate(LocalDateTime.now());
         return communityMapper.updateByPrimaryKeySelective(community);
     }

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/ConcentratorCheckServiceImpl.java

@@ -1,9 +1,15 @@
 package com.bz.smart_city.service.impl;
 
 import com.bz.smart_city.commom.model.Pagination;
+import com.bz.smart_city.dao.ConcentratorMapper;
+import com.bz.smart_city.dto.LoginUser;
+import com.bz.smart_city.entity.Concentrator;
+import com.bz.smart_city.entity.Message;
+import com.bz.smart_city.service.MessageService;
 import com.bz.smart_city.service.udip.GdAgentUtils;
 import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.List;
@@ -17,6 +23,10 @@ public class ConcentratorCheckServiceImpl implements ConcentratorCheckService{
     private ConcentratorCheckMapper concentratorCheckMapper;
     @Autowired
     private GdAgentUtils gdAgentUtils;
+    @Resource
+    private ConcentratorMapper concentratorMapper;
+    @Autowired
+    private MessageService messageService;
 
     @Override
     public int insertSelective(ConcentratorCheck record) {
@@ -34,8 +44,23 @@ public class ConcentratorCheckServiceImpl implements ConcentratorCheckService{
     }
 
     @Override
-    public void archivesCheck(Integer concentratorId) {
-        gdAgentUtils.archivesCheck(concentratorId);
+    @Async
+    public void archivesCheck(LoginUser loginUser, Integer concentratorId) {
+        Boolean res = gdAgentUtils.archivesCheck(concentratorId);
+
+        String resultName = "失败";
+        if(res){
+            resultName = "成功";
+        }
+        Concentrator concentrator = concentratorMapper.findById(concentratorId);
+        Message message = new Message();
+        message.setSiteId(loginUser.getSiteId());
+        message.setUserId(loginUser.getId());
+        message.setMessageType(5);
+        message.setMessageTitle("光电直读表-集中器列表-档案校验");
+        message.setMessageContent("集中器"+concentrator.getSerialNumber()+"档案校验"+resultName+"。");
+        message.setRead(0);
+        messageService.insertSelective(message);
     }
 
     @Override

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/WaterRelatedDeviceServiceImpl.java

@@ -1,13 +1,20 @@
 package com.bz.smart_city.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.bz.smart_city.commom.util.UserUtil;
 import com.bz.smart_city.dto.InputDeviceDto;
+import com.bz.smart_city.dto.LoginUser;
+import com.bz.smart_city.entity.Message;
+import com.bz.smart_city.service.MessageService;
 import com.bz.smart_city.service.udip.GdAgentUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
 import com.bz.smart_city.dao.WaterRelatedDeviceMapper;
 import com.bz.smart_city.entity.WaterRelatedDevice;
 import com.bz.smart_city.service.WaterRelatedDeviceService;
@@ -22,6 +29,8 @@ public class WaterRelatedDeviceServiceImpl implements WaterRelatedDeviceService
     private WaterRelatedDeviceMapper waterRelatedDeviceMapper;
     @Autowired
     private GdAgentUtils gdAgentUtils;
+    @Autowired
+    private MessageService messageService;
 
     @Override
     public int insertSelective(WaterRelatedDevice record) {
@@ -39,25 +48,41 @@ public class WaterRelatedDeviceServiceImpl implements WaterRelatedDeviceService
     }
 
     @Override
+    @Async
     public void fileReset(InputDeviceDto inputDeviceDto) {
         log.info("begin fileReset inputDeviceDto:{}", JSON.toJSONString(inputDeviceDto));
+        LoginUser loginUser = UserUtil.getCurrentUser();
         waterRelatedDeviceMapper.updateIssueStatus(inputDeviceDto.getDeviceIds(),0);
+
+        Message message = new Message();
+        message.setSiteId(loginUser.getSiteId());
+        message.setUserId(loginUser.getId());
+        message.setMessageType(5);
+        message.setMessageTitle("光电直读表-设备列表-档案重置");
+        message.setMessageContent("光电直读表批量档案重置完成，成功"+inputDeviceDto.getDeviceIds().size()+"条，失败0条。");
+        message.setRead(0);
+        messageService.insertSelective(message);
         log.info("end fileReset");
     }
 
     @Override
-    public void batchReleaseFiles(InputDeviceDto inputDeviceDto) {
+    @Async
+    public void batchReleaseFiles(LoginUser loginUser, InputDeviceDto inputDeviceDto) {
         log.info("begin batchReleaseFiles inputDeviceDto:{}", JSON.toJSONString(inputDeviceDto));
+        AtomicInteger success = new AtomicInteger(0);
+        AtomicInteger fail = new AtomicInteger(0);
         if (inputDeviceDto.getDeviceIds() != null && inputDeviceDto.getDeviceIds().size() > 0) {
             for (Long deviceId : inputDeviceDto.getDeviceIds()) {
                 try {
                     Integer result = gdAgentUtils.setMeterInfo(deviceId);
                     if (result != null && result == 1) {
                         waterRelatedDeviceMapper.updateIssueStatus(newArrayList(deviceId),1);
+                        success.incrementAndGet();
                     }else {
-
+                        fail.incrementAndGet();
                     }
                 }catch (Exception e){
+                    fail.incrementAndGet();
                     log.error("batchReleaseFiles error {}",e.getMessage());
                 }
 
@@ -65,6 +90,15 @@ public class WaterRelatedDeviceServiceImpl implements WaterRelatedDeviceService
         }
 
         //waterRelatedDeviceMapper.updateIssueStatus(inputDeviceDto.getDeviceIds(),1);
+
+        Message message = new Message();
+        message.setSiteId(loginUser.getSiteId());
+        message.setUserId(loginUser.getId());
+        message.setMessageType(5);
+        message.setMessageTitle("光电直读表-设备列表-批量下发");
+        message.setMessageContent("光电直读表批量下发完成，成功"+success.get()+"条，失败"+fail.get()+"条。");
+        message.setRead(0);
+        messageService.insertSelective(message);
         log.info("end batchReleaseFiles");
     }
 }

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/assistant/InstallBatchServiceImpl.java

@@ -23,9 +23,9 @@ public class InstallBatchServiceImpl implements InstallBatchService {
     @Override
     public int insertSelective(InstallBatch record) {
         record.setStatus(1);
-        record.setCreateBy(UserUtil.getCurrentUser().getUsername());
+        record.setCreateBy("system");
         record.setDateCreate(LocalDateTime.now());
-        record.setUpdateBy(UserUtil.getCurrentUser().getUsername());
+        record.setUpdateBy("system");
         record.setDateUpdate(LocalDateTime.now());
         return installBatchMapper.insertSelective(record);
     }

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/assistant/InstallPlanServiceImpl.java

@@ -92,9 +92,9 @@ public class InstallPlanServiceImpl implements InstallPlanService {
     @Override
     public int insertSelective(InstallPlan record) {
         record.setStatus(1);
-        record.setCreateBy(UserUtil.getCurrentUser().getUsername());
+        record.setCreateBy("system");
         record.setDateCreate(LocalDateTime.now());
-        record.setUpdateBy(UserUtil.getCurrentUser().getUsername());
+        record.setUpdateBy("system");
         record.setDateUpdate(LocalDateTime.now());
         return installPlanMapper.insertSelective(record);
     }
@@ -102,7 +102,7 @@ public class InstallPlanServiceImpl implements InstallPlanService {
 
     @Override
     public int updateByPrimaryKeySelective(InstallPlan record) {
-        record.setUpdateBy(UserUtil.getCurrentUser().getUsername());
+        record.setUpdateBy("system");
         record.setDateUpdate(LocalDateTime.now());
         return installPlanMapper.updateByPrimaryKeySelective(record);
     }
@@ -342,6 +342,208 @@ public class InstallPlanServiceImpl implements InstallPlanService {
         log.info("end add InstallPlan");
 
     }
+
+
+    @Override
+    @Transactional
+    public void syncPlan(InstallPlanInputDTO installPlanInput) {
+        log.info("begin add InstallPlan : " + JSON.toJSONString(installPlanInput));
+
+        Integer siteId = 1;
+
+        //1、小区
+        if (installPlanInput.getCommunityId() == null) {
+            //Community community = communityService.findByName(siteId, installPlanInput.getCommunityName());
+            Community community = communityService.findByNameV2(siteId,installPlanInput.getProvince(),installPlanInput.getCity(),installPlanInput.getRegion(), installPlanInput.getCommunityName());
+            if (community != null) {
+                installPlanInput.setCommunityId(community.getId());
+                Community TempCommunity = new Community();
+                TempCommunity.setId(community.getId());
+                TempCommunity.setAddress(installPlanInput.getAdrress());
+                communityService.updateByPrimaryKeySelective(TempCommunity);
+            } else {
+
+                //获取小区最大值，然后加1
+                String code="001";
+                List<Community> communities = communityService.getMaxCodeBySiteId(siteId);
+                if(communities.size()==1)
+                {
+                    if (communities.get(0) != null) {
+                        code =String.format("%03d",Integer.valueOf(communities.get(0).getCode()));
+                    }else {
+                        code = String.format("%03d",Integer.valueOf("1"));
+                    }
+                }
+
+                Community newCommunity = new Community();
+                newCommunity.setCode(code);
+                newCommunity.setSiteId(siteId);
+                newCommunity.setName(installPlanInput.getCommunityName());
+                newCommunity.setProvince(installPlanInput.getProvince());
+                newCommunity.setCity(installPlanInput.getCity());
+                newCommunity.setRegion(installPlanInput.getRegion());
+                newCommunity.setAddress(installPlanInput.getAdrress());
+                newCommunity.setCustomerId(installPlanInput.getCustomerId());
+                newCommunity.setStatus(1);
+                communityService.insert(newCommunity);
+                installPlanInput.setCommunityId(newCommunity.getId());
+            }
+
+        }
+
+        installPlanInput.setSiteId(siteId);
+        installPlanInput.setEnableDownload(0);
+        this.insertSelective(installPlanInput);
+
+        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyyMMdd");
+        //3、添加批次
+        InstallBatch installBatch = new InstallBatch();
+        installBatch.setSiteId(siteId);
+        installBatch.setBatchName(LocalDate.now().format(df));
+        installBatch.setBatchDate(Integer.valueOf(LocalDate.now().format(df)));
+        installBatch.setRelatedPlanId(installPlanInput.getId());
+        installBatch.setBatchStatus(0);
+        installBatchService.insertSelective(installBatch);
+
+        //4、添加水表设备类型
+        List<InstallPlanDeviceType> installPlanDeviceTypeList = newArrayList();
+        if (installPlanInput.getDeviceTypeIds() != null && installPlanInput.getDeviceTypeIds().size() > 0) {
+            for (Integer deviceTypeId : installPlanInput.getDeviceTypeIds()) {
+                InstallPlanDeviceType planDeviceType = new InstallPlanDeviceType();
+                planDeviceType.setInstallPlanId(installPlanInput.getId());
+                planDeviceType.setDeviceTypeId(deviceTypeId);
+                planDeviceType.setStatus(1);
+                planDeviceType.setCreateBy("admin");
+                planDeviceType.setDateCreate(LocalDateTime.now());
+                planDeviceType.setUpdateBy("admin");
+                planDeviceType.setDateUpdate(LocalDateTime.now());
+                installPlanDeviceTypeList.add(planDeviceType);
+            }
+            installPlanDeviceTypeMapper.batchInsert(installPlanDeviceTypeList);
+        }
+
+        //5、添加计划清单列表
+        //楼栋
+        int installPlanBuildingNum = 0;
+        int installPlanUnitNum = 0;
+        if (installPlanInput.getInstallPlanDataList() != null && installPlanInput.getInstallPlanDataList().size() > 0) {
+            List<InstallList> installLists = newArrayList();
+            List<InstallPlanData> installPlanDataList = newArrayList();
+            for (InstallPlanDataDTO installPlanBuilding : installPlanInput.getInstallPlanDataList()) {
+                installPlanBuildingNum++;
+                InstallPlanData InstallPlanDataBuilding = new InstallPlanData();
+                InstallPlanDataBuilding.setId(idWorker.nextId());
+                InstallPlanDataBuilding.setName(installPlanBuilding.getName() + "栋");
+                InstallPlanDataBuilding.setParentId(0L);
+                InstallPlanDataBuilding.setInstallPlanId(installPlanInput.getId());
+                InstallPlanDataBuilding.setType(1);
+                InstallPlanDataBuilding.setStatus(1);
+                installPlanDataList.add(InstallPlanDataBuilding);
+                //单元
+                if (installPlanBuilding.getChildren() != null && installPlanBuilding.getChildren().size() > 0) {
+                    for (InstallPlanDataDTO installPlanUnit : installPlanBuilding.getChildren()) {
+
+                        //判断是否启动单元
+                        String buildingName = "";
+                        if (installPlanInput.getEnableUnit() == 1) {
+                            installPlanUnitNum++;
+                            buildingName = installPlanInput.getCommunityName() + installPlanBuilding.getName() + "栋" + installPlanUnit.getName() + "单元";
+                        } else {
+                            buildingName = installPlanInput.getCommunityName() + installPlanBuilding.getName() + "栋";
+                        }
+
+                        //判断建筑是否存在
+                        Building building = buildingService.findByName(siteId, buildingName);
+                        Integer buildingId = null;
+                        if (building != null) {
+                            buildingId = building.getId();
+                        } else {
+                            Building newBuilding = new Building();
+                            newBuilding.setSiteId(siteId);
+                            newBuilding.setName(buildingName);
+                            newBuilding.setProvince(installPlanInput.getProvince());
+                            newBuilding.setCity(installPlanInput.getCity());
+                            newBuilding.setRegion(installPlanInput.getRegion());
+                            newBuilding.setCommunity(installPlanInput.getCommunityId());
+                            newBuilding.setAddress(installPlanInput.getAdrress());
+                            newBuilding.setStatus(1);
+                            buildingService.insert(newBuilding);
+                            buildingId = newBuilding.getId();
+                        }
+
+                        InstallPlanData InstallPlanDataUnit = new InstallPlanData();
+                        InstallPlanDataUnit.setName(installPlanUnit.getName() != null ? installPlanUnit.getName() + "单元" : "");
+                        InstallPlanDataUnit.setId(idWorker.nextId());
+                        InstallPlanDataUnit.setParentId(InstallPlanDataBuilding.getId());
+                        InstallPlanDataUnit.setInstallPlanId(installPlanInput.getId());
+                        InstallPlanDataUnit.setType(2);
+                        InstallPlanDataUnit.setStatus(1);
+                        installPlanDataList.add(InstallPlanDataUnit);
+
+                        //安装楼层
+                        if (installPlanUnit.getChildren() != null && installPlanUnit.getChildren().size() > 0) {
+                            for (InstallPlanDataDTO installPlanFloor : installPlanUnit.getChildren()) {
+                                InstallPlanData InstallPlanDataFloor = new InstallPlanData();
+                                InstallPlanDataFloor.setName(installPlanFloor.getName() + "层");
+                                InstallPlanDataFloor.setId(idWorker.nextId());
+                                InstallPlanDataFloor.setParentId(InstallPlanDataUnit.getId());
+                                InstallPlanDataFloor.setInstallPlanId(installPlanInput.getId());
+                                InstallPlanDataFloor.setType(3);
+                                InstallPlanDataFloor.setStatus(1);
+                                installPlanDataList.add(InstallPlanDataFloor);
+                                //安装清单
+                                if (installPlanFloor.getChildren() != null && installPlanFloor.getChildren().size() > 0) {
+                                    for (InstallPlanDataDTO installPlanDoor : installPlanFloor.getChildren()) {
+                                        InstallList installList = new InstallList();
+                                        installList.setSiteId(siteId);
+                                        installList.setInstallPlanId(installPlanInput.getId());
+                                        installList.setInstallPlanDataId(InstallPlanDataFloor.getId());
+                                        installList.setBuildingId(buildingId);
+                                        installList.setDoorNo(installPlanDoor.getName());
+                                        installList.setDeviceTypeId(installPlanInput.getDeviceTypeId());
+                                        installList.setCustomerId(installPlanInput.getCustomerId());
+                                        installList.setIsInPlan(1);
+                                        installList.setIsInstalled(0);
+                                        installList.setIsAccepted(0);
+                                        installList.setIntallBatchId(installBatch.getId());
+                                        try {
+                                            installList.setFloor(Integer.valueOf(installPlanFloor.getName()));
+                                        } catch (Exception e) {
+                                            log.info(installPlanFloor.getName() + "楼层转换错误");
+                                        }
+                                        installList.setStatus(1);
+                                        installList.setCreateBy("admin");
+                                        installList.setDateCreate(LocalDateTime.now());
+                                        installList.setUpdateBy("admin");
+                                        installList.setDateUpdate(LocalDateTime.now());
+
+                                        installLists.add(installList);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            installListMapper.batchInsert(installLists);
+            installPlanDataMapper.batchInsert(installPlanDataList);
+        }
+
+        //更新数量
+        InstallPlan updateInstallPlan = new InstallPlan();
+        updateInstallPlan.setId(installPlanInput.getId());
+        updateInstallPlan.setBuildingNumber(installPlanBuildingNum);
+        updateInstallPlan.setUnitNumber(installPlanUnitNum);
+        this.updateByPrimaryKeySelective(updateInstallPlan);
+
+
+        //异步生成压缩文件
+        InstallPlanDTO installPlan = installPlanMapper.findById(installPlanInput.getId());
+        asyncInstallPlanDownloadTask.asyncTaskToZip(null, installPlan);
+        log.info("end add InstallPlan");
+
+    }
+
     @Override
     @Transactional
     public void addJF(InstallPlanInputDTO installPlanInput) {

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/pay/AmountSynByDayServiceImpl.java

@@ -19,7 +19,6 @@ import com.bz.smart_city.quartz.service.JobAndTriggerService;
 import com.bz.smart_city.service.pay.AmountSynByDayService;
 import com.bz.smart_city.service.pay.AmountSynService;
 import com.google.common.collect.Lists;
-import com.sun.org.apache.xpath.internal.operations.Bool;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Value;

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/pay/PayPayCheckbalanceServiceImpl.java

@@ -11,8 +11,6 @@ import com.bz.smart_city.entity.pay.PayPayAgentbranch;
 import com.bz.smart_city.service.pay.PayPayCheckbalanceService;
 import com.github.pagehelper.PageHelper;
 import com.mysql.jdbc.StringUtils;
-import com.sun.org.apache.xpath.internal.operations.Bool;
-import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.stereotype.Service;
 
 

smart-city-platform/src/main/java/com/bz/smart_city/service/udip/GdAgentUtils.java

@@ -45,8 +45,8 @@ public class GdAgentUtils {
     private ConcentratorCheckMapper concentratorCheckMapper;
 
     //读档案--按集中器读取档案信息
-    @Async
-    public void archivesCheck(Integer concentratorId){
+    public Boolean archivesCheck(Integer concentratorId){
+        Boolean result = false;
         log.info("begin archivesCheck concentratorId={}",concentratorId);
         String url = gdAgentUrl+"/api/readmeter/readMeterInfoByID?concentratorId={concentratorId}";
 
@@ -59,12 +59,19 @@ public class GdAgentUtils {
             if(jsonObject.getInteger("status")==1){
                 list = jsonObject.getJSONArray("data").toJavaList(MeterInfo.class);
                 log.info("成功 res="+list);
+                result = true;
             }else {
                 log.info("失败");
+                return result;
+
             }
+        }else {
+            return result;
         }
         this.comparison(concentratorId,list);
+
         log.info("end archivesCheck");
+        return result;
     }
 
     private void comparison(Integer concentratorId,List<MeterInfo> list){