diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java index 6a6b41c..f0d6c3d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java @@ -10,6 +10,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.modular.device.dto.BusConfigDTO; +import com.casic.missiles.modular.device.dto.BusConfigOtherDTO; import com.casic.missiles.modular.device.dto.BusConfigRequestDTO; import com.casic.missiles.modular.device.entity.BusConfig; import com.casic.missiles.modular.device.service.IBusConfigService; @@ -19,6 +20,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Objects; /** @@ -73,5 +75,13 @@ return ReturnUtil.success(iBusConfigService.removeByIds(idsDTO.getIds())); } + @ApiOperation("第三方设备新增配置") + @PostMapping("/addOther") + @ResponseBody + public ReturnDTO addOther(@RequestBody BusConfigOtherDTO busConfigOtherDTO) { + + return ReturnUtil.success(iBusConfigService.saveConfigOther(busConfigOtherDTO)); + } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java index 6a6b41c..f0d6c3d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java @@ -10,6 +10,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.modular.device.dto.BusConfigDTO; +import com.casic.missiles.modular.device.dto.BusConfigOtherDTO; import com.casic.missiles.modular.device.dto.BusConfigRequestDTO; import com.casic.missiles.modular.device.entity.BusConfig; import com.casic.missiles.modular.device.service.IBusConfigService; @@ -19,6 +20,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Objects; /** @@ -73,5 +75,13 @@ return ReturnUtil.success(iBusConfigService.removeByIds(idsDTO.getIds())); } + @ApiOperation("第三方设备新增配置") + @PostMapping("/addOther") + @ResponseBody + public ReturnDTO addOther(@RequestBody BusConfigOtherDTO busConfigOtherDTO) { + + return ReturnUtil.success(iBusConfigService.saveConfigOther(busConfigOtherDTO)); + } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java index 4eda0fb..6b5791c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java @@ -20,6 +20,9 @@ import org.springframework.web.bind.annotation.*; import java.util.Objects; +import java.util.concurrent.LinkedBlockingDeque; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; /** *

@@ -36,6 +39,7 @@ public class BusLedgerController extends ExportController { private final IBusLedgerService iBusLedgerService; + private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(3, 6, 60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(10)); @ApiOperation("查询分页接口") @@ -97,7 +101,13 @@ @ResponseBody public ReturnDTO synAllDept() { - return ReturnUtil.success(iBusLedgerService.synAllDept()); + threadPoolExecutor.execute( + () -> { + iBusLedgerService.synAllDept(); + } + ); + return ReturnUtil.success(); + } @@ -111,8 +121,12 @@ @ResponseBody public ReturnDTO synAllLedger() { - return ReturnUtil.success(iBusLedgerService.synAllLedger()); + threadPoolExecutor.execute( + () -> { + iBusLedgerService.synAllLedger(); + } + ); + return ReturnUtil.success(); } - } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java index 6a6b41c..f0d6c3d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java @@ -10,6 +10,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.modular.device.dto.BusConfigDTO; +import com.casic.missiles.modular.device.dto.BusConfigOtherDTO; import com.casic.missiles.modular.device.dto.BusConfigRequestDTO; import com.casic.missiles.modular.device.entity.BusConfig; import com.casic.missiles.modular.device.service.IBusConfigService; @@ -19,6 +20,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Objects; /** @@ -73,5 +75,13 @@ return ReturnUtil.success(iBusConfigService.removeByIds(idsDTO.getIds())); } + @ApiOperation("第三方设备新增配置") + @PostMapping("/addOther") + @ResponseBody + public ReturnDTO addOther(@RequestBody BusConfigOtherDTO busConfigOtherDTO) { + + return ReturnUtil.success(iBusConfigService.saveConfigOther(busConfigOtherDTO)); + } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java index 4eda0fb..6b5791c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java @@ -20,6 +20,9 @@ import org.springframework.web.bind.annotation.*; import java.util.Objects; +import java.util.concurrent.LinkedBlockingDeque; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; /** *

@@ -36,6 +39,7 @@ public class BusLedgerController extends ExportController { private final IBusLedgerService iBusLedgerService; + private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(3, 6, 60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(10)); @ApiOperation("查询分页接口") @@ -97,7 +101,13 @@ @ResponseBody public ReturnDTO synAllDept() { - return ReturnUtil.success(iBusLedgerService.synAllDept()); + threadPoolExecutor.execute( + () -> { + iBusLedgerService.synAllDept(); + } + ); + return ReturnUtil.success(); + } @@ -111,8 +121,12 @@ @ResponseBody public ReturnDTO synAllLedger() { - return ReturnUtil.success(iBusLedgerService.synAllLedger()); + threadPoolExecutor.execute( + () -> { + iBusLedgerService.synAllLedger(); + } + ); + return ReturnUtil.success(); } - } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java index 4f5d9d3..d1e08a8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; @@ -63,5 +64,15 @@ return ReturnUtil.success(iSyncLogDetailService.getListBySyncId(idDTO.getId())); } + @ApiOperation("批量删除") + @PostMapping("/batchDelete") + @ResponseBody + public ReturnDTO batchDelete(@RequestBody IdsDTO idsDTO) { + Assert.isFalse(Objects.isNull(idsDTO.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iSyncLogService.batchDelete(idsDTO.getIds())); + } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java index 6a6b41c..f0d6c3d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java @@ -10,6 +10,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.modular.device.dto.BusConfigDTO; +import com.casic.missiles.modular.device.dto.BusConfigOtherDTO; import com.casic.missiles.modular.device.dto.BusConfigRequestDTO; import com.casic.missiles.modular.device.entity.BusConfig; import com.casic.missiles.modular.device.service.IBusConfigService; @@ -19,6 +20,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Objects; /** @@ -73,5 +75,13 @@ return ReturnUtil.success(iBusConfigService.removeByIds(idsDTO.getIds())); } + @ApiOperation("第三方设备新增配置") + @PostMapping("/addOther") + @ResponseBody + public ReturnDTO addOther(@RequestBody BusConfigOtherDTO busConfigOtherDTO) { + + return ReturnUtil.success(iBusConfigService.saveConfigOther(busConfigOtherDTO)); + } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java index 4eda0fb..6b5791c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java @@ -20,6 +20,9 @@ import org.springframework.web.bind.annotation.*; import java.util.Objects; +import java.util.concurrent.LinkedBlockingDeque; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; /** *

@@ -36,6 +39,7 @@ public class BusLedgerController extends ExportController { private final IBusLedgerService iBusLedgerService; + private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(3, 6, 60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(10)); @ApiOperation("查询分页接口") @@ -97,7 +101,13 @@ @ResponseBody public ReturnDTO synAllDept() { - return ReturnUtil.success(iBusLedgerService.synAllDept()); + threadPoolExecutor.execute( + () -> { + iBusLedgerService.synAllDept(); + } + ); + return ReturnUtil.success(); + } @@ -111,8 +121,12 @@ @ResponseBody public ReturnDTO synAllLedger() { - return ReturnUtil.success(iBusLedgerService.synAllLedger()); + threadPoolExecutor.execute( + () -> { + iBusLedgerService.synAllLedger(); + } + ); + return ReturnUtil.success(); } - } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java index 4f5d9d3..d1e08a8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; @@ -63,5 +64,15 @@ return ReturnUtil.success(iSyncLogDetailService.getListBySyncId(idDTO.getId())); } + @ApiOperation("批量删除") + @PostMapping("/batchDelete") + @ResponseBody + public ReturnDTO batchDelete(@RequestBody IdsDTO idsDTO) { + Assert.isFalse(Objects.isNull(idsDTO.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iSyncLogService.batchDelete(idsDTO.getIds())); + } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java index 86b2a19..e1d16c4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java @@ -45,4 +45,6 @@ @Select("SELECT PIPE_CODE FROM `bus_pipeline` WHERE VALID =1 ") List getPipeCodeList(); + + void updateIsBuried(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java index 6a6b41c..f0d6c3d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java @@ -10,6 +10,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.modular.device.dto.BusConfigDTO; +import com.casic.missiles.modular.device.dto.BusConfigOtherDTO; import com.casic.missiles.modular.device.dto.BusConfigRequestDTO; import com.casic.missiles.modular.device.entity.BusConfig; import com.casic.missiles.modular.device.service.IBusConfigService; @@ -19,6 +20,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Objects; /** @@ -73,5 +75,13 @@ return ReturnUtil.success(iBusConfigService.removeByIds(idsDTO.getIds())); } + @ApiOperation("第三方设备新增配置") + @PostMapping("/addOther") + @ResponseBody + public ReturnDTO addOther(@RequestBody BusConfigOtherDTO busConfigOtherDTO) { + + return ReturnUtil.success(iBusConfigService.saveConfigOther(busConfigOtherDTO)); + } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java index 4eda0fb..6b5791c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java @@ -20,6 +20,9 @@ import org.springframework.web.bind.annotation.*; import java.util.Objects; +import java.util.concurrent.LinkedBlockingDeque; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; /** *

@@ -36,6 +39,7 @@ public class BusLedgerController extends ExportController { private final IBusLedgerService iBusLedgerService; + private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(3, 6, 60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(10)); @ApiOperation("查询分页接口") @@ -97,7 +101,13 @@ @ResponseBody public ReturnDTO synAllDept() { - return ReturnUtil.success(iBusLedgerService.synAllDept()); + threadPoolExecutor.execute( + () -> { + iBusLedgerService.synAllDept(); + } + ); + return ReturnUtil.success(); + } @@ -111,8 +121,12 @@ @ResponseBody public ReturnDTO synAllLedger() { - return ReturnUtil.success(iBusLedgerService.synAllLedger()); + threadPoolExecutor.execute( + () -> { + iBusLedgerService.synAllLedger(); + } + ); + return ReturnUtil.success(); } - } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java index 4f5d9d3..d1e08a8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; @@ -63,5 +64,15 @@ return ReturnUtil.success(iSyncLogDetailService.getListBySyncId(idDTO.getId())); } + @ApiOperation("批量删除") + @PostMapping("/batchDelete") + @ResponseBody + public ReturnDTO batchDelete(@RequestBody IdsDTO idsDTO) { + Assert.isFalse(Objects.isNull(idsDTO.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iSyncLogService.batchDelete(idsDTO.getIds())); + } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java index 86b2a19..e1d16c4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java @@ -45,4 +45,6 @@ @Select("SELECT PIPE_CODE FROM `bus_pipeline` WHERE VALID =1 ") List getPipeCodeList(); + + void updateIsBuried(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml index 37d45fd..7cbdc10 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml @@ -101,4 +101,12 @@ WHERE bl.VALID = '1' and bl.id=${id} + + + UPDATE bus_ledger t + SET t.BURIED = 1 + WHERE + t.LEDGER_CODE IN ( SELECT DEVICE_CODE FROM `scyx_v_device_zj` WHERE is_direct_buried = '是' ) + AND t.TYPE =1 + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java index 6a6b41c..f0d6c3d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java @@ -10,6 +10,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.modular.device.dto.BusConfigDTO; +import com.casic.missiles.modular.device.dto.BusConfigOtherDTO; import com.casic.missiles.modular.device.dto.BusConfigRequestDTO; import com.casic.missiles.modular.device.entity.BusConfig; import com.casic.missiles.modular.device.service.IBusConfigService; @@ -19,6 +20,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Objects; /** @@ -73,5 +75,13 @@ return ReturnUtil.success(iBusConfigService.removeByIds(idsDTO.getIds())); } + @ApiOperation("第三方设备新增配置") + @PostMapping("/addOther") + @ResponseBody + public ReturnDTO addOther(@RequestBody BusConfigOtherDTO busConfigOtherDTO) { + + return ReturnUtil.success(iBusConfigService.saveConfigOther(busConfigOtherDTO)); + } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java index 4eda0fb..6b5791c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java @@ -20,6 +20,9 @@ import org.springframework.web.bind.annotation.*; import java.util.Objects; +import java.util.concurrent.LinkedBlockingDeque; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; /** *

@@ -36,6 +39,7 @@ public class BusLedgerController extends ExportController { private final IBusLedgerService iBusLedgerService; + private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(3, 6, 60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(10)); @ApiOperation("查询分页接口") @@ -97,7 +101,13 @@ @ResponseBody public ReturnDTO synAllDept() { - return ReturnUtil.success(iBusLedgerService.synAllDept()); + threadPoolExecutor.execute( + () -> { + iBusLedgerService.synAllDept(); + } + ); + return ReturnUtil.success(); + } @@ -111,8 +121,12 @@ @ResponseBody public ReturnDTO synAllLedger() { - return ReturnUtil.success(iBusLedgerService.synAllLedger()); + threadPoolExecutor.execute( + () -> { + iBusLedgerService.synAllLedger(); + } + ); + return ReturnUtil.success(); } - } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java index 4f5d9d3..d1e08a8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; @@ -63,5 +64,15 @@ return ReturnUtil.success(iSyncLogDetailService.getListBySyncId(idDTO.getId())); } + @ApiOperation("批量删除") + @PostMapping("/batchDelete") + @ResponseBody + public ReturnDTO batchDelete(@RequestBody IdsDTO idsDTO) { + Assert.isFalse(Objects.isNull(idsDTO.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iSyncLogService.batchDelete(idsDTO.getIds())); + } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java index 86b2a19..e1d16c4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java @@ -45,4 +45,6 @@ @Select("SELECT PIPE_CODE FROM `bus_pipeline` WHERE VALID =1 ") List getPipeCodeList(); + + void updateIsBuried(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml index 37d45fd..7cbdc10 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml @@ -101,4 +101,12 @@ WHERE bl.VALID = '1' and bl.id=${id} + + + UPDATE bus_ledger t + SET t.BURIED = 1 + WHERE + t.LEDGER_CODE IN ( SELECT DEVICE_CODE FROM `scyx_v_device_zj` WHERE is_direct_buried = '是' ) + AND t.TYPE =1 + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusConfigOtherDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusConfigOtherDTO.java new file mode 100644 index 0000000..cfde3a0 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusConfigOtherDTO.java @@ -0,0 +1,39 @@ +package com.casic.missiles.modular.device.dto; + + +import com.casic.missiles.modular.device.entity.BusConfig; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + + +@Data +public class BusConfigOtherDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + + @ApiModelProperty("设备编号list") + private List devCodeList; + + @ApiModelProperty("产品id") + private Long productId; + + @ApiModelProperty("设备类型id") + private Long typeId; + + @ApiModelProperty("指令集合") + private List commandConfigList; + + class CommandConfig { + + @ApiModelProperty("命令代号") + private String command; + + @ApiModelProperty("命令值") + private String value; + } + +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java index 6a6b41c..f0d6c3d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java @@ -10,6 +10,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.modular.device.dto.BusConfigDTO; +import com.casic.missiles.modular.device.dto.BusConfigOtherDTO; import com.casic.missiles.modular.device.dto.BusConfigRequestDTO; import com.casic.missiles.modular.device.entity.BusConfig; import com.casic.missiles.modular.device.service.IBusConfigService; @@ -19,6 +20,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Objects; /** @@ -73,5 +75,13 @@ return ReturnUtil.success(iBusConfigService.removeByIds(idsDTO.getIds())); } + @ApiOperation("第三方设备新增配置") + @PostMapping("/addOther") + @ResponseBody + public ReturnDTO addOther(@RequestBody BusConfigOtherDTO busConfigOtherDTO) { + + return ReturnUtil.success(iBusConfigService.saveConfigOther(busConfigOtherDTO)); + } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java index 4eda0fb..6b5791c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java @@ -20,6 +20,9 @@ import org.springframework.web.bind.annotation.*; import java.util.Objects; +import java.util.concurrent.LinkedBlockingDeque; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; /** *

@@ -36,6 +39,7 @@ public class BusLedgerController extends ExportController { private final IBusLedgerService iBusLedgerService; + private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(3, 6, 60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(10)); @ApiOperation("查询分页接口") @@ -97,7 +101,13 @@ @ResponseBody public ReturnDTO synAllDept() { - return ReturnUtil.success(iBusLedgerService.synAllDept()); + threadPoolExecutor.execute( + () -> { + iBusLedgerService.synAllDept(); + } + ); + return ReturnUtil.success(); + } @@ -111,8 +121,12 @@ @ResponseBody public ReturnDTO synAllLedger() { - return ReturnUtil.success(iBusLedgerService.synAllLedger()); + threadPoolExecutor.execute( + () -> { + iBusLedgerService.synAllLedger(); + } + ); + return ReturnUtil.success(); } - } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java index 4f5d9d3..d1e08a8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; @@ -63,5 +64,15 @@ return ReturnUtil.success(iSyncLogDetailService.getListBySyncId(idDTO.getId())); } + @ApiOperation("批量删除") + @PostMapping("/batchDelete") + @ResponseBody + public ReturnDTO batchDelete(@RequestBody IdsDTO idsDTO) { + Assert.isFalse(Objects.isNull(idsDTO.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iSyncLogService.batchDelete(idsDTO.getIds())); + } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java index 86b2a19..e1d16c4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java @@ -45,4 +45,6 @@ @Select("SELECT PIPE_CODE FROM `bus_pipeline` WHERE VALID =1 ") List getPipeCodeList(); + + void updateIsBuried(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml index 37d45fd..7cbdc10 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml @@ -101,4 +101,12 @@ WHERE bl.VALID = '1' and bl.id=${id} + + + UPDATE bus_ledger t + SET t.BURIED = 1 + WHERE + t.LEDGER_CODE IN ( SELECT DEVICE_CODE FROM `scyx_v_device_zj` WHERE is_direct_buried = '是' ) + AND t.TYPE =1 + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusConfigOtherDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusConfigOtherDTO.java new file mode 100644 index 0000000..cfde3a0 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusConfigOtherDTO.java @@ -0,0 +1,39 @@ +package com.casic.missiles.modular.device.dto; + + +import com.casic.missiles.modular.device.entity.BusConfig; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + + +@Data +public class BusConfigOtherDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + + @ApiModelProperty("设备编号list") + private List devCodeList; + + @ApiModelProperty("产品id") + private Long productId; + + @ApiModelProperty("设备类型id") + private Long typeId; + + @ApiModelProperty("指令集合") + private List commandConfigList; + + class CommandConfig { + + @ApiModelProperty("命令代号") + private String command; + + @ApiModelProperty("命令值") + private String value; + } + +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusConfigService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusConfigService.java index a7942d0..70f740f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusConfigService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusConfigService.java @@ -3,9 +3,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.modular.device.dto.BusConfigDTO; +import com.casic.missiles.modular.device.dto.BusConfigOtherDTO; import com.casic.missiles.modular.device.dto.BusConfigRequestDTO; import com.casic.missiles.modular.device.entity.BusConfig; +import java.util.List; + /** *

* 设备下发配置信息 服务类 @@ -18,6 +21,8 @@ boolean saveConfig(BusConfigDTO busConfigTO); + boolean saveConfigOther(BusConfigOtherDTO busConfigOtherDTO); + Page pageList(Page page, BusConfigRequestDTO requestDTO); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java index 6a6b41c..f0d6c3d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java @@ -10,6 +10,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.modular.device.dto.BusConfigDTO; +import com.casic.missiles.modular.device.dto.BusConfigOtherDTO; import com.casic.missiles.modular.device.dto.BusConfigRequestDTO; import com.casic.missiles.modular.device.entity.BusConfig; import com.casic.missiles.modular.device.service.IBusConfigService; @@ -19,6 +20,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Objects; /** @@ -73,5 +75,13 @@ return ReturnUtil.success(iBusConfigService.removeByIds(idsDTO.getIds())); } + @ApiOperation("第三方设备新增配置") + @PostMapping("/addOther") + @ResponseBody + public ReturnDTO addOther(@RequestBody BusConfigOtherDTO busConfigOtherDTO) { + + return ReturnUtil.success(iBusConfigService.saveConfigOther(busConfigOtherDTO)); + } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java index 4eda0fb..6b5791c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java @@ -20,6 +20,9 @@ import org.springframework.web.bind.annotation.*; import java.util.Objects; +import java.util.concurrent.LinkedBlockingDeque; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; /** *

@@ -36,6 +39,7 @@ public class BusLedgerController extends ExportController { private final IBusLedgerService iBusLedgerService; + private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(3, 6, 60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(10)); @ApiOperation("查询分页接口") @@ -97,7 +101,13 @@ @ResponseBody public ReturnDTO synAllDept() { - return ReturnUtil.success(iBusLedgerService.synAllDept()); + threadPoolExecutor.execute( + () -> { + iBusLedgerService.synAllDept(); + } + ); + return ReturnUtil.success(); + } @@ -111,8 +121,12 @@ @ResponseBody public ReturnDTO synAllLedger() { - return ReturnUtil.success(iBusLedgerService.synAllLedger()); + threadPoolExecutor.execute( + () -> { + iBusLedgerService.synAllLedger(); + } + ); + return ReturnUtil.success(); } - } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java index 4f5d9d3..d1e08a8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; @@ -63,5 +64,15 @@ return ReturnUtil.success(iSyncLogDetailService.getListBySyncId(idDTO.getId())); } + @ApiOperation("批量删除") + @PostMapping("/batchDelete") + @ResponseBody + public ReturnDTO batchDelete(@RequestBody IdsDTO idsDTO) { + Assert.isFalse(Objects.isNull(idsDTO.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iSyncLogService.batchDelete(idsDTO.getIds())); + } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java index 86b2a19..e1d16c4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java @@ -45,4 +45,6 @@ @Select("SELECT PIPE_CODE FROM `bus_pipeline` WHERE VALID =1 ") List getPipeCodeList(); + + void updateIsBuried(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml index 37d45fd..7cbdc10 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml @@ -101,4 +101,12 @@ WHERE bl.VALID = '1' and bl.id=${id} + + + UPDATE bus_ledger t + SET t.BURIED = 1 + WHERE + t.LEDGER_CODE IN ( SELECT DEVICE_CODE FROM `scyx_v_device_zj` WHERE is_direct_buried = '是' ) + AND t.TYPE =1 + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusConfigOtherDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusConfigOtherDTO.java new file mode 100644 index 0000000..cfde3a0 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusConfigOtherDTO.java @@ -0,0 +1,39 @@ +package com.casic.missiles.modular.device.dto; + + +import com.casic.missiles.modular.device.entity.BusConfig; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + + +@Data +public class BusConfigOtherDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + + @ApiModelProperty("设备编号list") + private List devCodeList; + + @ApiModelProperty("产品id") + private Long productId; + + @ApiModelProperty("设备类型id") + private Long typeId; + + @ApiModelProperty("指令集合") + private List commandConfigList; + + class CommandConfig { + + @ApiModelProperty("命令代号") + private String command; + + @ApiModelProperty("命令值") + private String value; + } + +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusConfigService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusConfigService.java index a7942d0..70f740f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusConfigService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusConfigService.java @@ -3,9 +3,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.modular.device.dto.BusConfigDTO; +import com.casic.missiles.modular.device.dto.BusConfigOtherDTO; import com.casic.missiles.modular.device.dto.BusConfigRequestDTO; import com.casic.missiles.modular.device.entity.BusConfig; +import java.util.List; + /** *

* 设备下发配置信息 服务类 @@ -18,6 +21,8 @@ boolean saveConfig(BusConfigDTO busConfigTO); + boolean saveConfigOther(BusConfigOtherDTO busConfigOtherDTO); + Page pageList(Page page, BusConfigRequestDTO requestDTO); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogDetailService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogDetailService.java index 580260b..280be18 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogDetailService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogDetailService.java @@ -18,4 +18,6 @@ boolean saveSyncLogs(Long syncId, String updateContent, String deleteContent, String addContent); List getListBySyncId(Long syncId); + + boolean deleteListBySyncId(List syncIds); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java index 6a6b41c..f0d6c3d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java @@ -10,6 +10,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.modular.device.dto.BusConfigDTO; +import com.casic.missiles.modular.device.dto.BusConfigOtherDTO; import com.casic.missiles.modular.device.dto.BusConfigRequestDTO; import com.casic.missiles.modular.device.entity.BusConfig; import com.casic.missiles.modular.device.service.IBusConfigService; @@ -19,6 +20,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Objects; /** @@ -73,5 +75,13 @@ return ReturnUtil.success(iBusConfigService.removeByIds(idsDTO.getIds())); } + @ApiOperation("第三方设备新增配置") + @PostMapping("/addOther") + @ResponseBody + public ReturnDTO addOther(@RequestBody BusConfigOtherDTO busConfigOtherDTO) { + + return ReturnUtil.success(iBusConfigService.saveConfigOther(busConfigOtherDTO)); + } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java index 4eda0fb..6b5791c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java @@ -20,6 +20,9 @@ import org.springframework.web.bind.annotation.*; import java.util.Objects; +import java.util.concurrent.LinkedBlockingDeque; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; /** *

@@ -36,6 +39,7 @@ public class BusLedgerController extends ExportController { private final IBusLedgerService iBusLedgerService; + private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(3, 6, 60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(10)); @ApiOperation("查询分页接口") @@ -97,7 +101,13 @@ @ResponseBody public ReturnDTO synAllDept() { - return ReturnUtil.success(iBusLedgerService.synAllDept()); + threadPoolExecutor.execute( + () -> { + iBusLedgerService.synAllDept(); + } + ); + return ReturnUtil.success(); + } @@ -111,8 +121,12 @@ @ResponseBody public ReturnDTO synAllLedger() { - return ReturnUtil.success(iBusLedgerService.synAllLedger()); + threadPoolExecutor.execute( + () -> { + iBusLedgerService.synAllLedger(); + } + ); + return ReturnUtil.success(); } - } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java index 4f5d9d3..d1e08a8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; @@ -63,5 +64,15 @@ return ReturnUtil.success(iSyncLogDetailService.getListBySyncId(idDTO.getId())); } + @ApiOperation("批量删除") + @PostMapping("/batchDelete") + @ResponseBody + public ReturnDTO batchDelete(@RequestBody IdsDTO idsDTO) { + Assert.isFalse(Objects.isNull(idsDTO.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iSyncLogService.batchDelete(idsDTO.getIds())); + } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java index 86b2a19..e1d16c4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java @@ -45,4 +45,6 @@ @Select("SELECT PIPE_CODE FROM `bus_pipeline` WHERE VALID =1 ") List getPipeCodeList(); + + void updateIsBuried(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml index 37d45fd..7cbdc10 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml @@ -101,4 +101,12 @@ WHERE bl.VALID = '1' and bl.id=${id} + + + UPDATE bus_ledger t + SET t.BURIED = 1 + WHERE + t.LEDGER_CODE IN ( SELECT DEVICE_CODE FROM `scyx_v_device_zj` WHERE is_direct_buried = '是' ) + AND t.TYPE =1 + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusConfigOtherDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusConfigOtherDTO.java new file mode 100644 index 0000000..cfde3a0 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusConfigOtherDTO.java @@ -0,0 +1,39 @@ +package com.casic.missiles.modular.device.dto; + + +import com.casic.missiles.modular.device.entity.BusConfig; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + + +@Data +public class BusConfigOtherDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + + @ApiModelProperty("设备编号list") + private List devCodeList; + + @ApiModelProperty("产品id") + private Long productId; + + @ApiModelProperty("设备类型id") + private Long typeId; + + @ApiModelProperty("指令集合") + private List commandConfigList; + + class CommandConfig { + + @ApiModelProperty("命令代号") + private String command; + + @ApiModelProperty("命令值") + private String value; + } + +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusConfigService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusConfigService.java index a7942d0..70f740f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusConfigService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusConfigService.java @@ -3,9 +3,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.modular.device.dto.BusConfigDTO; +import com.casic.missiles.modular.device.dto.BusConfigOtherDTO; import com.casic.missiles.modular.device.dto.BusConfigRequestDTO; import com.casic.missiles.modular.device.entity.BusConfig; +import java.util.List; + /** *

* 设备下发配置信息 服务类 @@ -18,6 +21,8 @@ boolean saveConfig(BusConfigDTO busConfigTO); + boolean saveConfigOther(BusConfigOtherDTO busConfigOtherDTO); + Page pageList(Page page, BusConfigRequestDTO requestDTO); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogDetailService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogDetailService.java index 580260b..280be18 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogDetailService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogDetailService.java @@ -18,4 +18,6 @@ boolean saveSyncLogs(Long syncId, String updateContent, String deleteContent, String addContent); List getListBySyncId(Long syncId); + + boolean deleteListBySyncId(List syncIds); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogService.java index c2de811..091855e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogService.java @@ -4,6 +4,7 @@ import com.casic.missiles.modular.device.entity.SyncLog; import java.util.Date; +import java.util.List; /** *

@@ -18,4 +19,6 @@ boolean saveSyncLogs(Long id,Date startTime,Date endTime,String syncType, String updateCount,String deleteCount, String addCount); + boolean batchDelete(List ids); + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java index 6a6b41c..f0d6c3d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java @@ -10,6 +10,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.modular.device.dto.BusConfigDTO; +import com.casic.missiles.modular.device.dto.BusConfigOtherDTO; import com.casic.missiles.modular.device.dto.BusConfigRequestDTO; import com.casic.missiles.modular.device.entity.BusConfig; import com.casic.missiles.modular.device.service.IBusConfigService; @@ -19,6 +20,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Objects; /** @@ -73,5 +75,13 @@ return ReturnUtil.success(iBusConfigService.removeByIds(idsDTO.getIds())); } + @ApiOperation("第三方设备新增配置") + @PostMapping("/addOther") + @ResponseBody + public ReturnDTO addOther(@RequestBody BusConfigOtherDTO busConfigOtherDTO) { + + return ReturnUtil.success(iBusConfigService.saveConfigOther(busConfigOtherDTO)); + } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java index 4eda0fb..6b5791c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java @@ -20,6 +20,9 @@ import org.springframework.web.bind.annotation.*; import java.util.Objects; +import java.util.concurrent.LinkedBlockingDeque; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; /** *

@@ -36,6 +39,7 @@ public class BusLedgerController extends ExportController { private final IBusLedgerService iBusLedgerService; + private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(3, 6, 60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(10)); @ApiOperation("查询分页接口") @@ -97,7 +101,13 @@ @ResponseBody public ReturnDTO synAllDept() { - return ReturnUtil.success(iBusLedgerService.synAllDept()); + threadPoolExecutor.execute( + () -> { + iBusLedgerService.synAllDept(); + } + ); + return ReturnUtil.success(); + } @@ -111,8 +121,12 @@ @ResponseBody public ReturnDTO synAllLedger() { - return ReturnUtil.success(iBusLedgerService.synAllLedger()); + threadPoolExecutor.execute( + () -> { + iBusLedgerService.synAllLedger(); + } + ); + return ReturnUtil.success(); } - } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java index 4f5d9d3..d1e08a8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; @@ -63,5 +64,15 @@ return ReturnUtil.success(iSyncLogDetailService.getListBySyncId(idDTO.getId())); } + @ApiOperation("批量删除") + @PostMapping("/batchDelete") + @ResponseBody + public ReturnDTO batchDelete(@RequestBody IdsDTO idsDTO) { + Assert.isFalse(Objects.isNull(idsDTO.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iSyncLogService.batchDelete(idsDTO.getIds())); + } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java index 86b2a19..e1d16c4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java @@ -45,4 +45,6 @@ @Select("SELECT PIPE_CODE FROM `bus_pipeline` WHERE VALID =1 ") List getPipeCodeList(); + + void updateIsBuried(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml index 37d45fd..7cbdc10 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml @@ -101,4 +101,12 @@ WHERE bl.VALID = '1' and bl.id=${id} + + + UPDATE bus_ledger t + SET t.BURIED = 1 + WHERE + t.LEDGER_CODE IN ( SELECT DEVICE_CODE FROM `scyx_v_device_zj` WHERE is_direct_buried = '是' ) + AND t.TYPE =1 + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusConfigOtherDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusConfigOtherDTO.java new file mode 100644 index 0000000..cfde3a0 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusConfigOtherDTO.java @@ -0,0 +1,39 @@ +package com.casic.missiles.modular.device.dto; + + +import com.casic.missiles.modular.device.entity.BusConfig; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + + +@Data +public class BusConfigOtherDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + + @ApiModelProperty("设备编号list") + private List devCodeList; + + @ApiModelProperty("产品id") + private Long productId; + + @ApiModelProperty("设备类型id") + private Long typeId; + + @ApiModelProperty("指令集合") + private List commandConfigList; + + class CommandConfig { + + @ApiModelProperty("命令代号") + private String command; + + @ApiModelProperty("命令值") + private String value; + } + +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusConfigService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusConfigService.java index a7942d0..70f740f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusConfigService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusConfigService.java @@ -3,9 +3,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.modular.device.dto.BusConfigDTO; +import com.casic.missiles.modular.device.dto.BusConfigOtherDTO; import com.casic.missiles.modular.device.dto.BusConfigRequestDTO; import com.casic.missiles.modular.device.entity.BusConfig; +import java.util.List; + /** *

* 设备下发配置信息 服务类 @@ -18,6 +21,8 @@ boolean saveConfig(BusConfigDTO busConfigTO); + boolean saveConfigOther(BusConfigOtherDTO busConfigOtherDTO); + Page pageList(Page page, BusConfigRequestDTO requestDTO); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogDetailService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogDetailService.java index 580260b..280be18 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogDetailService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogDetailService.java @@ -18,4 +18,6 @@ boolean saveSyncLogs(Long syncId, String updateContent, String deleteContent, String addContent); List getListBySyncId(Long syncId); + + boolean deleteListBySyncId(List syncIds); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogService.java index c2de811..091855e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogService.java @@ -4,6 +4,7 @@ import com.casic.missiles.modular.device.entity.SyncLog; import java.util.Date; +import java.util.List; /** *

@@ -18,4 +19,6 @@ boolean saveSyncLogs(Long id,Date startTime,Date endTime,String syncType, String updateCount,String deleteCount, String addCount); + boolean batchDelete(List ids); + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusConfigServiceImpl.java index 981fb27..9d4d545 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusConfigServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.device.service.impl; import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -8,15 +9,19 @@ import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.modular.device.dao.BusConfigMapper; import com.casic.missiles.modular.device.dto.BusConfigDTO; +import com.casic.missiles.modular.device.dto.BusConfigOtherDTO; import com.casic.missiles.modular.device.dto.BusConfigRequestDTO; import com.casic.missiles.modular.device.entity.BusConfig; import com.casic.missiles.modular.device.service.IBusConfigService; +import com.casic.missiles.util.HttpClientUtils; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** *

@@ -84,4 +89,39 @@ queryWrapper.le(ObjectUtil.isNotEmpty(requestDTO.getEndTime()), "WRITETIME", requestDTO.getEndTime()); return this.baseMapper.selectPage(page, queryWrapper); } + + @Override + public boolean saveConfigOther(BusConfigOtherDTO busConfigOtherDTO) { + + List devcodes = busConfigOtherDTO.getDevCodeList(); + List busConfigs = new ArrayList<>(); + //添加操作人 + AuthUser user = abstractPermissionContext.getAuthService().getLoginUser(); + devcodes.forEach(devcode -> { + busConfigs.add(BusConfig.builder().devcode(devcode) + .productId(busConfigOtherDTO.getProductId()) + .framecontent(JSON.toJSONString(busConfigOtherDTO.getCommandConfigList())) + .operator(user != null ? user.getId() : null) + .operatorName(user != null ? user.getName() : "").build()); + }); + return this.saveBatch(busConfigs); +// List> mapList = new ArrayList<>(); +// Map commandMap = new HashMap<>(); +// commandMap.put("command","11"); +// commandMap.put("value","1800"); +// mapList.add(commandMap); +// Map commandMap2 = new HashMap<>(); +// commandMap2.put("command","12"); +// commandMap2.put("value","6"); +// mapList.add(commandMap2); +// +// Map map = new HashMap<>(); +// map.put("deviceId","58bca85e6ccb4b0ebb34289e7207e1b3"); +// map.put("devCode","341524019833"); +// map.put("productId","15074311"); +// map.put("cmdList",mapList); +// +// HttpClientUtils.post("brAppUrl", JSON.toJSONString(map)); +// return true; + } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java index 6a6b41c..f0d6c3d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java @@ -10,6 +10,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.modular.device.dto.BusConfigDTO; +import com.casic.missiles.modular.device.dto.BusConfigOtherDTO; import com.casic.missiles.modular.device.dto.BusConfigRequestDTO; import com.casic.missiles.modular.device.entity.BusConfig; import com.casic.missiles.modular.device.service.IBusConfigService; @@ -19,6 +20,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Objects; /** @@ -73,5 +75,13 @@ return ReturnUtil.success(iBusConfigService.removeByIds(idsDTO.getIds())); } + @ApiOperation("第三方设备新增配置") + @PostMapping("/addOther") + @ResponseBody + public ReturnDTO addOther(@RequestBody BusConfigOtherDTO busConfigOtherDTO) { + + return ReturnUtil.success(iBusConfigService.saveConfigOther(busConfigOtherDTO)); + } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java index 4eda0fb..6b5791c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java @@ -20,6 +20,9 @@ import org.springframework.web.bind.annotation.*; import java.util.Objects; +import java.util.concurrent.LinkedBlockingDeque; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; /** *

@@ -36,6 +39,7 @@ public class BusLedgerController extends ExportController { private final IBusLedgerService iBusLedgerService; + private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(3, 6, 60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(10)); @ApiOperation("查询分页接口") @@ -97,7 +101,13 @@ @ResponseBody public ReturnDTO synAllDept() { - return ReturnUtil.success(iBusLedgerService.synAllDept()); + threadPoolExecutor.execute( + () -> { + iBusLedgerService.synAllDept(); + } + ); + return ReturnUtil.success(); + } @@ -111,8 +121,12 @@ @ResponseBody public ReturnDTO synAllLedger() { - return ReturnUtil.success(iBusLedgerService.synAllLedger()); + threadPoolExecutor.execute( + () -> { + iBusLedgerService.synAllLedger(); + } + ); + return ReturnUtil.success(); } - } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java index 4f5d9d3..d1e08a8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; @@ -63,5 +64,15 @@ return ReturnUtil.success(iSyncLogDetailService.getListBySyncId(idDTO.getId())); } + @ApiOperation("批量删除") + @PostMapping("/batchDelete") + @ResponseBody + public ReturnDTO batchDelete(@RequestBody IdsDTO idsDTO) { + Assert.isFalse(Objects.isNull(idsDTO.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iSyncLogService.batchDelete(idsDTO.getIds())); + } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java index 86b2a19..e1d16c4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java @@ -45,4 +45,6 @@ @Select("SELECT PIPE_CODE FROM `bus_pipeline` WHERE VALID =1 ") List getPipeCodeList(); + + void updateIsBuried(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml index 37d45fd..7cbdc10 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml @@ -101,4 +101,12 @@ WHERE bl.VALID = '1' and bl.id=${id} + + + UPDATE bus_ledger t + SET t.BURIED = 1 + WHERE + t.LEDGER_CODE IN ( SELECT DEVICE_CODE FROM `scyx_v_device_zj` WHERE is_direct_buried = '是' ) + AND t.TYPE =1 + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusConfigOtherDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusConfigOtherDTO.java new file mode 100644 index 0000000..cfde3a0 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusConfigOtherDTO.java @@ -0,0 +1,39 @@ +package com.casic.missiles.modular.device.dto; + + +import com.casic.missiles.modular.device.entity.BusConfig; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + + +@Data +public class BusConfigOtherDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + + @ApiModelProperty("设备编号list") + private List devCodeList; + + @ApiModelProperty("产品id") + private Long productId; + + @ApiModelProperty("设备类型id") + private Long typeId; + + @ApiModelProperty("指令集合") + private List commandConfigList; + + class CommandConfig { + + @ApiModelProperty("命令代号") + private String command; + + @ApiModelProperty("命令值") + private String value; + } + +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusConfigService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusConfigService.java index a7942d0..70f740f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusConfigService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusConfigService.java @@ -3,9 +3,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.modular.device.dto.BusConfigDTO; +import com.casic.missiles.modular.device.dto.BusConfigOtherDTO; import com.casic.missiles.modular.device.dto.BusConfigRequestDTO; import com.casic.missiles.modular.device.entity.BusConfig; +import java.util.List; + /** *

* 设备下发配置信息 服务类 @@ -18,6 +21,8 @@ boolean saveConfig(BusConfigDTO busConfigTO); + boolean saveConfigOther(BusConfigOtherDTO busConfigOtherDTO); + Page pageList(Page page, BusConfigRequestDTO requestDTO); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogDetailService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogDetailService.java index 580260b..280be18 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogDetailService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogDetailService.java @@ -18,4 +18,6 @@ boolean saveSyncLogs(Long syncId, String updateContent, String deleteContent, String addContent); List getListBySyncId(Long syncId); + + boolean deleteListBySyncId(List syncIds); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogService.java index c2de811..091855e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogService.java @@ -4,6 +4,7 @@ import com.casic.missiles.modular.device.entity.SyncLog; import java.util.Date; +import java.util.List; /** *

@@ -18,4 +19,6 @@ boolean saveSyncLogs(Long id,Date startTime,Date endTime,String syncType, String updateCount,String deleteCount, String addCount); + boolean batchDelete(List ids); + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusConfigServiceImpl.java index 981fb27..9d4d545 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusConfigServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.device.service.impl; import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -8,15 +9,19 @@ import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.modular.device.dao.BusConfigMapper; import com.casic.missiles.modular.device.dto.BusConfigDTO; +import com.casic.missiles.modular.device.dto.BusConfigOtherDTO; import com.casic.missiles.modular.device.dto.BusConfigRequestDTO; import com.casic.missiles.modular.device.entity.BusConfig; import com.casic.missiles.modular.device.service.IBusConfigService; +import com.casic.missiles.util.HttpClientUtils; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** *

@@ -84,4 +89,39 @@ queryWrapper.le(ObjectUtil.isNotEmpty(requestDTO.getEndTime()), "WRITETIME", requestDTO.getEndTime()); return this.baseMapper.selectPage(page, queryWrapper); } + + @Override + public boolean saveConfigOther(BusConfigOtherDTO busConfigOtherDTO) { + + List devcodes = busConfigOtherDTO.getDevCodeList(); + List busConfigs = new ArrayList<>(); + //添加操作人 + AuthUser user = abstractPermissionContext.getAuthService().getLoginUser(); + devcodes.forEach(devcode -> { + busConfigs.add(BusConfig.builder().devcode(devcode) + .productId(busConfigOtherDTO.getProductId()) + .framecontent(JSON.toJSONString(busConfigOtherDTO.getCommandConfigList())) + .operator(user != null ? user.getId() : null) + .operatorName(user != null ? user.getName() : "").build()); + }); + return this.saveBatch(busConfigs); +// List> mapList = new ArrayList<>(); +// Map commandMap = new HashMap<>(); +// commandMap.put("command","11"); +// commandMap.put("value","1800"); +// mapList.add(commandMap); +// Map commandMap2 = new HashMap<>(); +// commandMap2.put("command","12"); +// commandMap2.put("value","6"); +// mapList.add(commandMap2); +// +// Map map = new HashMap<>(); +// map.put("deviceId","58bca85e6ccb4b0ebb34289e7207e1b3"); +// map.put("devCode","341524019833"); +// map.put("productId","15074311"); +// map.put("cmdList",mapList); +// +// HttpClientUtils.post("brAppUrl", JSON.toJSONString(map)); +// return true; + } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java index 8096a4c..8c4dd73 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java @@ -161,53 +161,58 @@ @Transactional @Override public boolean synAllDept() { - Date startTime = new Date(); - int addCount = 0, upDateCount = 0; - String addContent = "", upDateContent = ""; - //获取同步表分公司及以下有效部门 - List ctOrganizationList = iCtOrganizationService.getCtOrganizationList(); - //获取闸井系统已存在的部门 - List deptList = abstractDeptService.getListByTips(""); - for (CtOrganization ctOrganization : ctOrganizationList) { - Dept dept1 = new Dept(); - Optional firstDept = deptList.stream().filter(dept -> Objects.equals(dept.getSyncId(), ctOrganization.getOrgId())).findFirst(); - Dept deptOld = null; - if (firstDept.isPresent()) { - deptOld = firstDept.get(); - dept1.setId(deptOld.getId()); + try { + Date startTime = new Date(); + int addCount = 0, upDateCount = 0; + String addContent = "", upDateContent = ""; + //获取同步表分公司及以下有效部门 + List ctOrganizationList = iCtOrganizationService.getCtOrganizationList(); + //获取闸井系统已存在的部门 + List deptList = abstractDeptService.getListByTips(""); + for (CtOrganization ctOrganization : ctOrganizationList) { + Dept dept1 = new Dept(); + Optional firstDept = deptList.stream().filter(dept -> Objects.equals(dept.getSyncId(), ctOrganization.getOrgId())).findFirst(); + Dept deptOld = null; + if (firstDept.isPresent()) { + deptOld = firstDept.get(); + dept1.setId(deptOld.getId()); + } + dept1.setDelFlag("0"); + dept1.setPid(getPid(ctOrganization, deptList)); + dept1.setNum(99); + dept1.setSimpleName(ctOrganization.getOrgName()); + dept1.setFullName(ctOrganization.getOrgName()); + dept1.setTips(getTips(ctOrganization.getOrgType() + "")); + dept1.setSyncId(ctOrganization.getOrgId()); + dept1.setSyncPid(ctOrganization.getParentId()); + dept1.setTenantId(ctOrganization.getOrgCode()); + dept1.setIsSync(1); + dept1.setIsParent(DictEnum.SYNC_GRID.equals(ctOrganization.getOrgType() + "") ? "1" : "0"); + dept1.setDeptType(DictEnum.SYNC_COMPANY.equals(ctOrganization.getOrgType() + "") ? "03" : "04"); + dept1.setPids(getPids(ctOrganization, deptList)); + dept1.setCreateTime(new Date()); + if (deptOld != null && StrUtil.equals(deptOld.getFullName(), dept1.getFullName()) && ObjectUtil.equals(deptOld.getPid(), dept1.getPid()) + && StrUtil.equals(deptOld.getSyncId(), dept1.getSyncId()) && StrUtil.equals(deptOld.getSyncPid(), dept1.getSyncPid()) + && StrUtil.equals(deptOld.getPids(), dept1.getPids()) && StrUtil.equals(deptOld.getDeptType(), dept1.getDeptType())) + continue; + if (deptOld == null) { + addCount++; + addContent += ctOrganization.getOrgName() + ","; + } else { + upDateCount++; + upDateContent += ctOrganization.getOrgName() + ","; + } + abstractDeptService.saveOrUpdate(dept1); + deptList.add(dept1); } - dept1.setDelFlag("0"); - dept1.setPid(getPid(ctOrganization, deptList)); - dept1.setNum(99); - dept1.setSimpleName(ctOrganization.getOrgName()); - dept1.setFullName(ctOrganization.getOrgName()); - dept1.setTips(getTips(ctOrganization.getOrgType() + "")); - dept1.setSyncId(ctOrganization.getOrgId()); - dept1.setSyncPid(ctOrganization.getParentId()); - dept1.setTenantId(ctOrganization.getOrgCode()); - dept1.setIsSync(1); - dept1.setIsParent(DictEnum.SYNC_GRID.equals(ctOrganization.getOrgType() + "") ? "1" : "0"); - dept1.setDeptType(DictEnum.SYNC_COMPANY.equals(ctOrganization.getOrgType() + "") ? "03" : "04"); - dept1.setPids(getPids(ctOrganization, deptList)); - dept1.setCreateTime(new Date()); - if (deptOld != null && StrUtil.equals(deptOld.getFullName(), dept1.getFullName()) && ObjectUtil.equals(deptOld.getPid(), dept1.getPid()) - && StrUtil.equals(deptOld.getSyncId(), dept1.getSyncId()) && StrUtil.equals(deptOld.getSyncPid(), dept1.getSyncPid()) - && StrUtil.equals(deptOld.getPids(), dept1.getPids()) && StrUtil.equals(deptOld.getDeptType(), dept1.getDeptType())) - continue; - if (deptOld == null) { - addCount++; - addContent += ctOrganization.getOrgName() + ","; - } else { - upDateCount++; - upDateContent += ctOrganization.getOrgName() + ","; - } - abstractDeptService.saveOrUpdate(dept1); - deptList.add(dept1); + Date endTime = new Date(); + Long syncId = SnowFlakeUtil.getId(); + iSyncLogService.saveSyncLogs(syncId, startTime, endTime, "1", upDateCount + "", "0", addCount + ""); + return iSyncLogDetailService.saveSyncLogs(syncId, upDateContent, "", addContent); + } catch (Exception e) { + e.printStackTrace(); + return false; } - Date endTime = new Date(); - Long syncId = SnowFlakeUtil.getId(); - iSyncLogService.saveSyncLogs(syncId, startTime, endTime, "1", upDateCount + "", "0", addCount + ""); - return iSyncLogDetailService.saveSyncLogs(syncId, upDateContent, "", addContent); } public String getPids(CtOrganization ctOrganization, List deptList) { @@ -265,72 +270,80 @@ @Transactional @Override public boolean synAllLedger() { - Date startTime = new Date(); - int addCount = 0, upDateCount = 0; - String addContent = "", upDateContent = ""; - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("valid", "1"); - List busLedgerList = this.baseMapper.selectList(queryWrapper); - List wellList = iEqEquipRqService.getWellList(); - wellList = wellList.stream().filter(CommonUtil.distinctByProperty(SyncTagDTO::getLedgerCode)).collect(Collectors.toList()); - List deptList = abstractDeptService.getListByTips(""); - List busLedgers = new ArrayList<>(); - for (SyncTagDTO syncTagDTO : wellList) { - BusLedger busLedger = new BusLedger(); - Optional firstBusLedger = busLedgerList.stream().filter(busLedger1 -> Objects.equals(busLedger1.getLedgerCode(), syncTagDTO.getLedgerCode())).findFirst(); - BusLedger busLedgerOld = null; - if (firstBusLedger.isPresent()) { - busLedgerOld = firstBusLedger.get(); - busLedger.setId(busLedgerOld.getId()); - } + try { + Date startTime = new Date(); + int addCount = 0, upDateCount = 0; + String addContent = "", upDateContent = ""; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("valid", "1"); + List busLedgerList = this.baseMapper.selectList(queryWrapper); + List wellList = iEqEquipRqService.getWellList(); + wellList = wellList.stream().filter(CommonUtil.distinctByProperty(SyncTagDTO::getLedgerCode)).collect(Collectors.toList()); + List deptList = abstractDeptService.getListByTips(""); + List busLedgers = new ArrayList<>(); + for (SyncTagDTO syncTagDTO : wellList) { + BusLedger busLedger = new BusLedger(); + Optional firstBusLedger = busLedgerList.stream().filter(busLedger1 -> Objects.equals(busLedger1.getLedgerCode(), syncTagDTO.getLedgerCode())).findFirst(); + BusLedger busLedgerOld = null; + if (firstBusLedger.isPresent()) { + busLedgerOld = firstBusLedger.get(); + busLedger.setId(busLedgerOld.getId()); + } // if (!ledgerCodeList.contains(syncTagDTO.getLedgerCode())) { - busLedger.setLedgerCode(syncTagDTO.getLedgerCode()); - busLedger.setLedgerName(syncTagDTO.getLedgerName()); - busLedger.setTagNumber(syncTagDTO.getTagNumber()); - busLedger.setLatGaode(syncTagDTO.getLatGaode()); - busLedger.setLngGaode(syncTagDTO.getLngGaode()); - busLedger.setPosition(syncTagDTO.getPosition()); - if (ObjectUtil.isNotEmpty(syncTagDTO.getOrgCode())) { - for (Dept dept : deptList) { - if (syncTagDTO.getOrgCode().equals(dept.getTenantId())) { - busLedger.setDeptid(dept.getId()); - break; + busLedger.setLedgerCode(syncTagDTO.getLedgerCode()); + busLedger.setLedgerName(syncTagDTO.getLedgerName()); + busLedger.setTagNumber(syncTagDTO.getTagNumber()); + busLedger.setLatGaode(syncTagDTO.getLatGaode()); + busLedger.setLngGaode(syncTagDTO.getLngGaode()); + busLedger.setPosition(syncTagDTO.getPosition()); + if (ObjectUtil.isNotEmpty(syncTagDTO.getOrgCode())) { + for (Dept dept : deptList) { + if (syncTagDTO.getOrgCode().equals(dept.getTenantId())) { + busLedger.setDeptid(dept.getId()); + break; + } } } + busLedger.setManageType(manageTypeList.contains(syncTagDTO.getManageType()) ? "1" : "0"); + busLedger.setOnState(DictEnum.IS_USED.equals(syncTagDTO.getOnState()) ? DictEnum.IS_USED : "0"); + busLedger.setLocationState("1"); + busLedger.setWellType("3"); + busLedger.setTargetId(syncTagDTO.getTargetId()); + busLedger.setTargetCode(syncTagDTO.getOrgCode()); + busLedger.setPropertyOwner(syncTagDTO.getPropertyOwner()); + busLedger.setPropertyPerson(syncTagDTO.getPropertyPerson()); + busLedger.setPropertyPhone(syncTagDTO.getPropertyPhone()); + busLedger.setOpenDate(syncTagDTO.getOpenDate()); + busLedger.setArea(syncTagDTO.getArea()); + busLedger.setValid("1"); + busLedger.setType("3".equals(syncTagDTO.getType()) ? "1" : "2"); + if (busLedgerOld != null && StrUtil.equals(busLedgerOld.getLedgerCode(), busLedger.getLedgerCode()) && StrUtil.equals(busLedgerOld.getLedgerName(), busLedger.getLedgerName()) + && StrUtil.equals(busLedgerOld.getTagNumber(), busLedger.getTagNumber()) && StrUtil.equals(busLedgerOld.getLatGaode(), busLedger.getLatGaode()) + && StrUtil.equals(busLedgerOld.getLngGaode(), busLedger.getLngGaode()) && StrUtil.equals(busLedgerOld.getPosition(), busLedger.getPosition()) + && StrUtil.equals(busLedgerOld.getTargetId(), busLedger.getTargetId()) && StrUtil.equals(busLedgerOld.getTargetCode(), busLedger.getTargetCode())) + continue; + if (busLedgerOld == null) { + addCount++; + addContent += busLedger.getLedgerCode() + ","; + } else { + upDateCount++; + upDateContent += busLedger.getLedgerCode() + ","; + } + busLedgers.add(busLedger); } - busLedger.setManageType(manageTypeList.contains(syncTagDTO.getManageType()) ? "1" : "0"); - busLedger.setOnState(DictEnum.IS_USED.equals(syncTagDTO.getOnState()) ? DictEnum.IS_USED : "0"); - busLedger.setLocationState("1"); - busLedger.setWellType("3"); - busLedger.setTargetId(syncTagDTO.getTargetId()); - busLedger.setTargetCode(syncTagDTO.getOrgCode()); - busLedger.setPropertyOwner(syncTagDTO.getPropertyOwner()); - busLedger.setPropertyPerson(syncTagDTO.getPropertyPerson()); - busLedger.setPropertyPhone(syncTagDTO.getPropertyPhone()); - busLedger.setOpenDate(syncTagDTO.getOpenDate()); - busLedger.setArea(syncTagDTO.getArea()); - busLedger.setValid("1"); - busLedger.setType("3".equals(syncTagDTO.getType()) ? "1" : "2"); - if (busLedgerOld != null && StrUtil.equals(busLedgerOld.getLedgerCode(), busLedger.getLedgerCode()) && StrUtil.equals(busLedgerOld.getLedgerName(), busLedger.getLedgerName()) - && StrUtil.equals(busLedgerOld.getTagNumber(), busLedger.getTagNumber()) && StrUtil.equals(busLedgerOld.getLatGaode(), busLedger.getLatGaode()) - && StrUtil.equals(busLedgerOld.getLngGaode(), busLedger.getLngGaode()) && StrUtil.equals(busLedgerOld.getPosition(), busLedger.getPosition()) - && StrUtil.equals(busLedgerOld.getTargetId(), busLedger.getTargetId()) && StrUtil.equals(busLedgerOld.getTargetCode(), busLedger.getTargetCode())) - continue; - if (busLedgerOld == null) { - addCount++; - addContent += busLedger.getLedgerCode() + ","; - } else { - upDateCount++; - upDateContent += busLedger.getLedgerCode() + ","; - } - busLedgers.add(busLedger); - } // } - this.saveOrUpdateBatch(busLedgers); - Date endTime = new Date(); - Long syncId = SnowFlakeUtil.getId(); - iSyncLogService.saveSyncLogs(syncId, startTime, endTime, "1", upDateCount + "", "0", addCount + ""); - return iSyncLogDetailService.saveSyncLogs(syncId, upDateContent, "", addContent); + this.saveOrUpdateBatch(busLedgers); + Date endTime = new Date(); + Long syncId = SnowFlakeUtil.getId(); + iSyncLogService.saveSyncLogs(syncId, startTime, endTime, "1", upDateCount + "", "0", addCount + ""); + iSyncLogDetailService.saveSyncLogs(syncId, upDateContent, "", addContent); + //同步是否直埋 + this.baseMapper.updateIsBuried(); + } catch (Exception e) { + e.printStackTrace(); + return false; + } + return true; } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java index 6a6b41c..f0d6c3d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java @@ -10,6 +10,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.modular.device.dto.BusConfigDTO; +import com.casic.missiles.modular.device.dto.BusConfigOtherDTO; import com.casic.missiles.modular.device.dto.BusConfigRequestDTO; import com.casic.missiles.modular.device.entity.BusConfig; import com.casic.missiles.modular.device.service.IBusConfigService; @@ -19,6 +20,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Objects; /** @@ -73,5 +75,13 @@ return ReturnUtil.success(iBusConfigService.removeByIds(idsDTO.getIds())); } + @ApiOperation("第三方设备新增配置") + @PostMapping("/addOther") + @ResponseBody + public ReturnDTO addOther(@RequestBody BusConfigOtherDTO busConfigOtherDTO) { + + return ReturnUtil.success(iBusConfigService.saveConfigOther(busConfigOtherDTO)); + } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java index 4eda0fb..6b5791c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java @@ -20,6 +20,9 @@ import org.springframework.web.bind.annotation.*; import java.util.Objects; +import java.util.concurrent.LinkedBlockingDeque; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; /** *

@@ -36,6 +39,7 @@ public class BusLedgerController extends ExportController { private final IBusLedgerService iBusLedgerService; + private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(3, 6, 60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(10)); @ApiOperation("查询分页接口") @@ -97,7 +101,13 @@ @ResponseBody public ReturnDTO synAllDept() { - return ReturnUtil.success(iBusLedgerService.synAllDept()); + threadPoolExecutor.execute( + () -> { + iBusLedgerService.synAllDept(); + } + ); + return ReturnUtil.success(); + } @@ -111,8 +121,12 @@ @ResponseBody public ReturnDTO synAllLedger() { - return ReturnUtil.success(iBusLedgerService.synAllLedger()); + threadPoolExecutor.execute( + () -> { + iBusLedgerService.synAllLedger(); + } + ); + return ReturnUtil.success(); } - } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java index 4f5d9d3..d1e08a8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; @@ -63,5 +64,15 @@ return ReturnUtil.success(iSyncLogDetailService.getListBySyncId(idDTO.getId())); } + @ApiOperation("批量删除") + @PostMapping("/batchDelete") + @ResponseBody + public ReturnDTO batchDelete(@RequestBody IdsDTO idsDTO) { + Assert.isFalse(Objects.isNull(idsDTO.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iSyncLogService.batchDelete(idsDTO.getIds())); + } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java index 86b2a19..e1d16c4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java @@ -45,4 +45,6 @@ @Select("SELECT PIPE_CODE FROM `bus_pipeline` WHERE VALID =1 ") List getPipeCodeList(); + + void updateIsBuried(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml index 37d45fd..7cbdc10 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml @@ -101,4 +101,12 @@ WHERE bl.VALID = '1' and bl.id=${id} + + + UPDATE bus_ledger t + SET t.BURIED = 1 + WHERE + t.LEDGER_CODE IN ( SELECT DEVICE_CODE FROM `scyx_v_device_zj` WHERE is_direct_buried = '是' ) + AND t.TYPE =1 + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusConfigOtherDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusConfigOtherDTO.java new file mode 100644 index 0000000..cfde3a0 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusConfigOtherDTO.java @@ -0,0 +1,39 @@ +package com.casic.missiles.modular.device.dto; + + +import com.casic.missiles.modular.device.entity.BusConfig; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + + +@Data +public class BusConfigOtherDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + + @ApiModelProperty("设备编号list") + private List devCodeList; + + @ApiModelProperty("产品id") + private Long productId; + + @ApiModelProperty("设备类型id") + private Long typeId; + + @ApiModelProperty("指令集合") + private List commandConfigList; + + class CommandConfig { + + @ApiModelProperty("命令代号") + private String command; + + @ApiModelProperty("命令值") + private String value; + } + +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusConfigService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusConfigService.java index a7942d0..70f740f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusConfigService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusConfigService.java @@ -3,9 +3,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.modular.device.dto.BusConfigDTO; +import com.casic.missiles.modular.device.dto.BusConfigOtherDTO; import com.casic.missiles.modular.device.dto.BusConfigRequestDTO; import com.casic.missiles.modular.device.entity.BusConfig; +import java.util.List; + /** *

* 设备下发配置信息 服务类 @@ -18,6 +21,8 @@ boolean saveConfig(BusConfigDTO busConfigTO); + boolean saveConfigOther(BusConfigOtherDTO busConfigOtherDTO); + Page pageList(Page page, BusConfigRequestDTO requestDTO); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogDetailService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogDetailService.java index 580260b..280be18 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogDetailService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogDetailService.java @@ -18,4 +18,6 @@ boolean saveSyncLogs(Long syncId, String updateContent, String deleteContent, String addContent); List getListBySyncId(Long syncId); + + boolean deleteListBySyncId(List syncIds); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogService.java index c2de811..091855e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogService.java @@ -4,6 +4,7 @@ import com.casic.missiles.modular.device.entity.SyncLog; import java.util.Date; +import java.util.List; /** *

@@ -18,4 +19,6 @@ boolean saveSyncLogs(Long id,Date startTime,Date endTime,String syncType, String updateCount,String deleteCount, String addCount); + boolean batchDelete(List ids); + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusConfigServiceImpl.java index 981fb27..9d4d545 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusConfigServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.device.service.impl; import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -8,15 +9,19 @@ import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.modular.device.dao.BusConfigMapper; import com.casic.missiles.modular.device.dto.BusConfigDTO; +import com.casic.missiles.modular.device.dto.BusConfigOtherDTO; import com.casic.missiles.modular.device.dto.BusConfigRequestDTO; import com.casic.missiles.modular.device.entity.BusConfig; import com.casic.missiles.modular.device.service.IBusConfigService; +import com.casic.missiles.util.HttpClientUtils; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** *

@@ -84,4 +89,39 @@ queryWrapper.le(ObjectUtil.isNotEmpty(requestDTO.getEndTime()), "WRITETIME", requestDTO.getEndTime()); return this.baseMapper.selectPage(page, queryWrapper); } + + @Override + public boolean saveConfigOther(BusConfigOtherDTO busConfigOtherDTO) { + + List devcodes = busConfigOtherDTO.getDevCodeList(); + List busConfigs = new ArrayList<>(); + //添加操作人 + AuthUser user = abstractPermissionContext.getAuthService().getLoginUser(); + devcodes.forEach(devcode -> { + busConfigs.add(BusConfig.builder().devcode(devcode) + .productId(busConfigOtherDTO.getProductId()) + .framecontent(JSON.toJSONString(busConfigOtherDTO.getCommandConfigList())) + .operator(user != null ? user.getId() : null) + .operatorName(user != null ? user.getName() : "").build()); + }); + return this.saveBatch(busConfigs); +// List> mapList = new ArrayList<>(); +// Map commandMap = new HashMap<>(); +// commandMap.put("command","11"); +// commandMap.put("value","1800"); +// mapList.add(commandMap); +// Map commandMap2 = new HashMap<>(); +// commandMap2.put("command","12"); +// commandMap2.put("value","6"); +// mapList.add(commandMap2); +// +// Map map = new HashMap<>(); +// map.put("deviceId","58bca85e6ccb4b0ebb34289e7207e1b3"); +// map.put("devCode","341524019833"); +// map.put("productId","15074311"); +// map.put("cmdList",mapList); +// +// HttpClientUtils.post("brAppUrl", JSON.toJSONString(map)); +// return true; + } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java index 8096a4c..8c4dd73 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java @@ -161,53 +161,58 @@ @Transactional @Override public boolean synAllDept() { - Date startTime = new Date(); - int addCount = 0, upDateCount = 0; - String addContent = "", upDateContent = ""; - //获取同步表分公司及以下有效部门 - List ctOrganizationList = iCtOrganizationService.getCtOrganizationList(); - //获取闸井系统已存在的部门 - List deptList = abstractDeptService.getListByTips(""); - for (CtOrganization ctOrganization : ctOrganizationList) { - Dept dept1 = new Dept(); - Optional firstDept = deptList.stream().filter(dept -> Objects.equals(dept.getSyncId(), ctOrganization.getOrgId())).findFirst(); - Dept deptOld = null; - if (firstDept.isPresent()) { - deptOld = firstDept.get(); - dept1.setId(deptOld.getId()); + try { + Date startTime = new Date(); + int addCount = 0, upDateCount = 0; + String addContent = "", upDateContent = ""; + //获取同步表分公司及以下有效部门 + List ctOrganizationList = iCtOrganizationService.getCtOrganizationList(); + //获取闸井系统已存在的部门 + List deptList = abstractDeptService.getListByTips(""); + for (CtOrganization ctOrganization : ctOrganizationList) { + Dept dept1 = new Dept(); + Optional firstDept = deptList.stream().filter(dept -> Objects.equals(dept.getSyncId(), ctOrganization.getOrgId())).findFirst(); + Dept deptOld = null; + if (firstDept.isPresent()) { + deptOld = firstDept.get(); + dept1.setId(deptOld.getId()); + } + dept1.setDelFlag("0"); + dept1.setPid(getPid(ctOrganization, deptList)); + dept1.setNum(99); + dept1.setSimpleName(ctOrganization.getOrgName()); + dept1.setFullName(ctOrganization.getOrgName()); + dept1.setTips(getTips(ctOrganization.getOrgType() + "")); + dept1.setSyncId(ctOrganization.getOrgId()); + dept1.setSyncPid(ctOrganization.getParentId()); + dept1.setTenantId(ctOrganization.getOrgCode()); + dept1.setIsSync(1); + dept1.setIsParent(DictEnum.SYNC_GRID.equals(ctOrganization.getOrgType() + "") ? "1" : "0"); + dept1.setDeptType(DictEnum.SYNC_COMPANY.equals(ctOrganization.getOrgType() + "") ? "03" : "04"); + dept1.setPids(getPids(ctOrganization, deptList)); + dept1.setCreateTime(new Date()); + if (deptOld != null && StrUtil.equals(deptOld.getFullName(), dept1.getFullName()) && ObjectUtil.equals(deptOld.getPid(), dept1.getPid()) + && StrUtil.equals(deptOld.getSyncId(), dept1.getSyncId()) && StrUtil.equals(deptOld.getSyncPid(), dept1.getSyncPid()) + && StrUtil.equals(deptOld.getPids(), dept1.getPids()) && StrUtil.equals(deptOld.getDeptType(), dept1.getDeptType())) + continue; + if (deptOld == null) { + addCount++; + addContent += ctOrganization.getOrgName() + ","; + } else { + upDateCount++; + upDateContent += ctOrganization.getOrgName() + ","; + } + abstractDeptService.saveOrUpdate(dept1); + deptList.add(dept1); } - dept1.setDelFlag("0"); - dept1.setPid(getPid(ctOrganization, deptList)); - dept1.setNum(99); - dept1.setSimpleName(ctOrganization.getOrgName()); - dept1.setFullName(ctOrganization.getOrgName()); - dept1.setTips(getTips(ctOrganization.getOrgType() + "")); - dept1.setSyncId(ctOrganization.getOrgId()); - dept1.setSyncPid(ctOrganization.getParentId()); - dept1.setTenantId(ctOrganization.getOrgCode()); - dept1.setIsSync(1); - dept1.setIsParent(DictEnum.SYNC_GRID.equals(ctOrganization.getOrgType() + "") ? "1" : "0"); - dept1.setDeptType(DictEnum.SYNC_COMPANY.equals(ctOrganization.getOrgType() + "") ? "03" : "04"); - dept1.setPids(getPids(ctOrganization, deptList)); - dept1.setCreateTime(new Date()); - if (deptOld != null && StrUtil.equals(deptOld.getFullName(), dept1.getFullName()) && ObjectUtil.equals(deptOld.getPid(), dept1.getPid()) - && StrUtil.equals(deptOld.getSyncId(), dept1.getSyncId()) && StrUtil.equals(deptOld.getSyncPid(), dept1.getSyncPid()) - && StrUtil.equals(deptOld.getPids(), dept1.getPids()) && StrUtil.equals(deptOld.getDeptType(), dept1.getDeptType())) - continue; - if (deptOld == null) { - addCount++; - addContent += ctOrganization.getOrgName() + ","; - } else { - upDateCount++; - upDateContent += ctOrganization.getOrgName() + ","; - } - abstractDeptService.saveOrUpdate(dept1); - deptList.add(dept1); + Date endTime = new Date(); + Long syncId = SnowFlakeUtil.getId(); + iSyncLogService.saveSyncLogs(syncId, startTime, endTime, "1", upDateCount + "", "0", addCount + ""); + return iSyncLogDetailService.saveSyncLogs(syncId, upDateContent, "", addContent); + } catch (Exception e) { + e.printStackTrace(); + return false; } - Date endTime = new Date(); - Long syncId = SnowFlakeUtil.getId(); - iSyncLogService.saveSyncLogs(syncId, startTime, endTime, "1", upDateCount + "", "0", addCount + ""); - return iSyncLogDetailService.saveSyncLogs(syncId, upDateContent, "", addContent); } public String getPids(CtOrganization ctOrganization, List deptList) { @@ -265,72 +270,80 @@ @Transactional @Override public boolean synAllLedger() { - Date startTime = new Date(); - int addCount = 0, upDateCount = 0; - String addContent = "", upDateContent = ""; - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("valid", "1"); - List busLedgerList = this.baseMapper.selectList(queryWrapper); - List wellList = iEqEquipRqService.getWellList(); - wellList = wellList.stream().filter(CommonUtil.distinctByProperty(SyncTagDTO::getLedgerCode)).collect(Collectors.toList()); - List deptList = abstractDeptService.getListByTips(""); - List busLedgers = new ArrayList<>(); - for (SyncTagDTO syncTagDTO : wellList) { - BusLedger busLedger = new BusLedger(); - Optional firstBusLedger = busLedgerList.stream().filter(busLedger1 -> Objects.equals(busLedger1.getLedgerCode(), syncTagDTO.getLedgerCode())).findFirst(); - BusLedger busLedgerOld = null; - if (firstBusLedger.isPresent()) { - busLedgerOld = firstBusLedger.get(); - busLedger.setId(busLedgerOld.getId()); - } + try { + Date startTime = new Date(); + int addCount = 0, upDateCount = 0; + String addContent = "", upDateContent = ""; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("valid", "1"); + List busLedgerList = this.baseMapper.selectList(queryWrapper); + List wellList = iEqEquipRqService.getWellList(); + wellList = wellList.stream().filter(CommonUtil.distinctByProperty(SyncTagDTO::getLedgerCode)).collect(Collectors.toList()); + List deptList = abstractDeptService.getListByTips(""); + List busLedgers = new ArrayList<>(); + for (SyncTagDTO syncTagDTO : wellList) { + BusLedger busLedger = new BusLedger(); + Optional firstBusLedger = busLedgerList.stream().filter(busLedger1 -> Objects.equals(busLedger1.getLedgerCode(), syncTagDTO.getLedgerCode())).findFirst(); + BusLedger busLedgerOld = null; + if (firstBusLedger.isPresent()) { + busLedgerOld = firstBusLedger.get(); + busLedger.setId(busLedgerOld.getId()); + } // if (!ledgerCodeList.contains(syncTagDTO.getLedgerCode())) { - busLedger.setLedgerCode(syncTagDTO.getLedgerCode()); - busLedger.setLedgerName(syncTagDTO.getLedgerName()); - busLedger.setTagNumber(syncTagDTO.getTagNumber()); - busLedger.setLatGaode(syncTagDTO.getLatGaode()); - busLedger.setLngGaode(syncTagDTO.getLngGaode()); - busLedger.setPosition(syncTagDTO.getPosition()); - if (ObjectUtil.isNotEmpty(syncTagDTO.getOrgCode())) { - for (Dept dept : deptList) { - if (syncTagDTO.getOrgCode().equals(dept.getTenantId())) { - busLedger.setDeptid(dept.getId()); - break; + busLedger.setLedgerCode(syncTagDTO.getLedgerCode()); + busLedger.setLedgerName(syncTagDTO.getLedgerName()); + busLedger.setTagNumber(syncTagDTO.getTagNumber()); + busLedger.setLatGaode(syncTagDTO.getLatGaode()); + busLedger.setLngGaode(syncTagDTO.getLngGaode()); + busLedger.setPosition(syncTagDTO.getPosition()); + if (ObjectUtil.isNotEmpty(syncTagDTO.getOrgCode())) { + for (Dept dept : deptList) { + if (syncTagDTO.getOrgCode().equals(dept.getTenantId())) { + busLedger.setDeptid(dept.getId()); + break; + } } } + busLedger.setManageType(manageTypeList.contains(syncTagDTO.getManageType()) ? "1" : "0"); + busLedger.setOnState(DictEnum.IS_USED.equals(syncTagDTO.getOnState()) ? DictEnum.IS_USED : "0"); + busLedger.setLocationState("1"); + busLedger.setWellType("3"); + busLedger.setTargetId(syncTagDTO.getTargetId()); + busLedger.setTargetCode(syncTagDTO.getOrgCode()); + busLedger.setPropertyOwner(syncTagDTO.getPropertyOwner()); + busLedger.setPropertyPerson(syncTagDTO.getPropertyPerson()); + busLedger.setPropertyPhone(syncTagDTO.getPropertyPhone()); + busLedger.setOpenDate(syncTagDTO.getOpenDate()); + busLedger.setArea(syncTagDTO.getArea()); + busLedger.setValid("1"); + busLedger.setType("3".equals(syncTagDTO.getType()) ? "1" : "2"); + if (busLedgerOld != null && StrUtil.equals(busLedgerOld.getLedgerCode(), busLedger.getLedgerCode()) && StrUtil.equals(busLedgerOld.getLedgerName(), busLedger.getLedgerName()) + && StrUtil.equals(busLedgerOld.getTagNumber(), busLedger.getTagNumber()) && StrUtil.equals(busLedgerOld.getLatGaode(), busLedger.getLatGaode()) + && StrUtil.equals(busLedgerOld.getLngGaode(), busLedger.getLngGaode()) && StrUtil.equals(busLedgerOld.getPosition(), busLedger.getPosition()) + && StrUtil.equals(busLedgerOld.getTargetId(), busLedger.getTargetId()) && StrUtil.equals(busLedgerOld.getTargetCode(), busLedger.getTargetCode())) + continue; + if (busLedgerOld == null) { + addCount++; + addContent += busLedger.getLedgerCode() + ","; + } else { + upDateCount++; + upDateContent += busLedger.getLedgerCode() + ","; + } + busLedgers.add(busLedger); } - busLedger.setManageType(manageTypeList.contains(syncTagDTO.getManageType()) ? "1" : "0"); - busLedger.setOnState(DictEnum.IS_USED.equals(syncTagDTO.getOnState()) ? DictEnum.IS_USED : "0"); - busLedger.setLocationState("1"); - busLedger.setWellType("3"); - busLedger.setTargetId(syncTagDTO.getTargetId()); - busLedger.setTargetCode(syncTagDTO.getOrgCode()); - busLedger.setPropertyOwner(syncTagDTO.getPropertyOwner()); - busLedger.setPropertyPerson(syncTagDTO.getPropertyPerson()); - busLedger.setPropertyPhone(syncTagDTO.getPropertyPhone()); - busLedger.setOpenDate(syncTagDTO.getOpenDate()); - busLedger.setArea(syncTagDTO.getArea()); - busLedger.setValid("1"); - busLedger.setType("3".equals(syncTagDTO.getType()) ? "1" : "2"); - if (busLedgerOld != null && StrUtil.equals(busLedgerOld.getLedgerCode(), busLedger.getLedgerCode()) && StrUtil.equals(busLedgerOld.getLedgerName(), busLedger.getLedgerName()) - && StrUtil.equals(busLedgerOld.getTagNumber(), busLedger.getTagNumber()) && StrUtil.equals(busLedgerOld.getLatGaode(), busLedger.getLatGaode()) - && StrUtil.equals(busLedgerOld.getLngGaode(), busLedger.getLngGaode()) && StrUtil.equals(busLedgerOld.getPosition(), busLedger.getPosition()) - && StrUtil.equals(busLedgerOld.getTargetId(), busLedger.getTargetId()) && StrUtil.equals(busLedgerOld.getTargetCode(), busLedger.getTargetCode())) - continue; - if (busLedgerOld == null) { - addCount++; - addContent += busLedger.getLedgerCode() + ","; - } else { - upDateCount++; - upDateContent += busLedger.getLedgerCode() + ","; - } - busLedgers.add(busLedger); - } // } - this.saveOrUpdateBatch(busLedgers); - Date endTime = new Date(); - Long syncId = SnowFlakeUtil.getId(); - iSyncLogService.saveSyncLogs(syncId, startTime, endTime, "1", upDateCount + "", "0", addCount + ""); - return iSyncLogDetailService.saveSyncLogs(syncId, upDateContent, "", addContent); + this.saveOrUpdateBatch(busLedgers); + Date endTime = new Date(); + Long syncId = SnowFlakeUtil.getId(); + iSyncLogService.saveSyncLogs(syncId, startTime, endTime, "1", upDateCount + "", "0", addCount + ""); + iSyncLogDetailService.saveSyncLogs(syncId, upDateContent, "", addContent); + //同步是否直埋 + this.baseMapper.updateIsBuried(); + } catch (Exception e) { + e.printStackTrace(); + return false; + } + return true; } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/SyncLogDetailServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/SyncLogDetailServiceImpl.java index d2242c6..7ad578e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/SyncLogDetailServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/SyncLogDetailServiceImpl.java @@ -37,4 +37,11 @@ queryWrapper.eq("SYNC_LOG_ID", syncId); return this.list(queryWrapper); } + + @Override + public boolean deleteListBySyncId(List syncIds) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("SYNC_LOG_ID", syncIds); + return this.baseMapper.delete(queryWrapper) > 0 ? true : false; + } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java index 6a6b41c..f0d6c3d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusConfigController.java @@ -10,6 +10,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.modular.device.dto.BusConfigDTO; +import com.casic.missiles.modular.device.dto.BusConfigOtherDTO; import com.casic.missiles.modular.device.dto.BusConfigRequestDTO; import com.casic.missiles.modular.device.entity.BusConfig; import com.casic.missiles.modular.device.service.IBusConfigService; @@ -19,6 +20,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Objects; /** @@ -73,5 +75,13 @@ return ReturnUtil.success(iBusConfigService.removeByIds(idsDTO.getIds())); } + @ApiOperation("第三方设备新增配置") + @PostMapping("/addOther") + @ResponseBody + public ReturnDTO addOther(@RequestBody BusConfigOtherDTO busConfigOtherDTO) { + + return ReturnUtil.success(iBusConfigService.saveConfigOther(busConfigOtherDTO)); + } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java index 4eda0fb..6b5791c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java @@ -20,6 +20,9 @@ import org.springframework.web.bind.annotation.*; import java.util.Objects; +import java.util.concurrent.LinkedBlockingDeque; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; /** *

@@ -36,6 +39,7 @@ public class BusLedgerController extends ExportController { private final IBusLedgerService iBusLedgerService; + private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(3, 6, 60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(10)); @ApiOperation("查询分页接口") @@ -97,7 +101,13 @@ @ResponseBody public ReturnDTO synAllDept() { - return ReturnUtil.success(iBusLedgerService.synAllDept()); + threadPoolExecutor.execute( + () -> { + iBusLedgerService.synAllDept(); + } + ); + return ReturnUtil.success(); + } @@ -111,8 +121,12 @@ @ResponseBody public ReturnDTO synAllLedger() { - return ReturnUtil.success(iBusLedgerService.synAllLedger()); + threadPoolExecutor.execute( + () -> { + iBusLedgerService.synAllLedger(); + } + ); + return ReturnUtil.success(); } - } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java index 4f5d9d3..d1e08a8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/SyncLogController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; @@ -63,5 +64,15 @@ return ReturnUtil.success(iSyncLogDetailService.getListBySyncId(idDTO.getId())); } + @ApiOperation("批量删除") + @PostMapping("/batchDelete") + @ResponseBody + public ReturnDTO batchDelete(@RequestBody IdsDTO idsDTO) { + Assert.isFalse(Objects.isNull(idsDTO.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iSyncLogService.batchDelete(idsDTO.getIds())); + } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java index 86b2a19..e1d16c4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java @@ -45,4 +45,6 @@ @Select("SELECT PIPE_CODE FROM `bus_pipeline` WHERE VALID =1 ") List getPipeCodeList(); + + void updateIsBuried(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml index 37d45fd..7cbdc10 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml @@ -101,4 +101,12 @@ WHERE bl.VALID = '1' and bl.id=${id} + + + UPDATE bus_ledger t + SET t.BURIED = 1 + WHERE + t.LEDGER_CODE IN ( SELECT DEVICE_CODE FROM `scyx_v_device_zj` WHERE is_direct_buried = '是' ) + AND t.TYPE =1 + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusConfigOtherDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusConfigOtherDTO.java new file mode 100644 index 0000000..cfde3a0 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusConfigOtherDTO.java @@ -0,0 +1,39 @@ +package com.casic.missiles.modular.device.dto; + + +import com.casic.missiles.modular.device.entity.BusConfig; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + + +@Data +public class BusConfigOtherDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + + @ApiModelProperty("设备编号list") + private List devCodeList; + + @ApiModelProperty("产品id") + private Long productId; + + @ApiModelProperty("设备类型id") + private Long typeId; + + @ApiModelProperty("指令集合") + private List commandConfigList; + + class CommandConfig { + + @ApiModelProperty("命令代号") + private String command; + + @ApiModelProperty("命令值") + private String value; + } + +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusConfigService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusConfigService.java index a7942d0..70f740f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusConfigService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusConfigService.java @@ -3,9 +3,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.modular.device.dto.BusConfigDTO; +import com.casic.missiles.modular.device.dto.BusConfigOtherDTO; import com.casic.missiles.modular.device.dto.BusConfigRequestDTO; import com.casic.missiles.modular.device.entity.BusConfig; +import java.util.List; + /** *

* 设备下发配置信息 服务类 @@ -18,6 +21,8 @@ boolean saveConfig(BusConfigDTO busConfigTO); + boolean saveConfigOther(BusConfigOtherDTO busConfigOtherDTO); + Page pageList(Page page, BusConfigRequestDTO requestDTO); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogDetailService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogDetailService.java index 580260b..280be18 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogDetailService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogDetailService.java @@ -18,4 +18,6 @@ boolean saveSyncLogs(Long syncId, String updateContent, String deleteContent, String addContent); List getListBySyncId(Long syncId); + + boolean deleteListBySyncId(List syncIds); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogService.java index c2de811..091855e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/ISyncLogService.java @@ -4,6 +4,7 @@ import com.casic.missiles.modular.device.entity.SyncLog; import java.util.Date; +import java.util.List; /** *

@@ -18,4 +19,6 @@ boolean saveSyncLogs(Long id,Date startTime,Date endTime,String syncType, String updateCount,String deleteCount, String addCount); + boolean batchDelete(List ids); + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusConfigServiceImpl.java index 981fb27..9d4d545 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusConfigServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.device.service.impl; import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -8,15 +9,19 @@ import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.modular.device.dao.BusConfigMapper; import com.casic.missiles.modular.device.dto.BusConfigDTO; +import com.casic.missiles.modular.device.dto.BusConfigOtherDTO; import com.casic.missiles.modular.device.dto.BusConfigRequestDTO; import com.casic.missiles.modular.device.entity.BusConfig; import com.casic.missiles.modular.device.service.IBusConfigService; +import com.casic.missiles.util.HttpClientUtils; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** *

@@ -84,4 +89,39 @@ queryWrapper.le(ObjectUtil.isNotEmpty(requestDTO.getEndTime()), "WRITETIME", requestDTO.getEndTime()); return this.baseMapper.selectPage(page, queryWrapper); } + + @Override + public boolean saveConfigOther(BusConfigOtherDTO busConfigOtherDTO) { + + List devcodes = busConfigOtherDTO.getDevCodeList(); + List busConfigs = new ArrayList<>(); + //添加操作人 + AuthUser user = abstractPermissionContext.getAuthService().getLoginUser(); + devcodes.forEach(devcode -> { + busConfigs.add(BusConfig.builder().devcode(devcode) + .productId(busConfigOtherDTO.getProductId()) + .framecontent(JSON.toJSONString(busConfigOtherDTO.getCommandConfigList())) + .operator(user != null ? user.getId() : null) + .operatorName(user != null ? user.getName() : "").build()); + }); + return this.saveBatch(busConfigs); +// List> mapList = new ArrayList<>(); +// Map commandMap = new HashMap<>(); +// commandMap.put("command","11"); +// commandMap.put("value","1800"); +// mapList.add(commandMap); +// Map commandMap2 = new HashMap<>(); +// commandMap2.put("command","12"); +// commandMap2.put("value","6"); +// mapList.add(commandMap2); +// +// Map map = new HashMap<>(); +// map.put("deviceId","58bca85e6ccb4b0ebb34289e7207e1b3"); +// map.put("devCode","341524019833"); +// map.put("productId","15074311"); +// map.put("cmdList",mapList); +// +// HttpClientUtils.post("brAppUrl", JSON.toJSONString(map)); +// return true; + } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java index 8096a4c..8c4dd73 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java @@ -161,53 +161,58 @@ @Transactional @Override public boolean synAllDept() { - Date startTime = new Date(); - int addCount = 0, upDateCount = 0; - String addContent = "", upDateContent = ""; - //获取同步表分公司及以下有效部门 - List ctOrganizationList = iCtOrganizationService.getCtOrganizationList(); - //获取闸井系统已存在的部门 - List deptList = abstractDeptService.getListByTips(""); - for (CtOrganization ctOrganization : ctOrganizationList) { - Dept dept1 = new Dept(); - Optional firstDept = deptList.stream().filter(dept -> Objects.equals(dept.getSyncId(), ctOrganization.getOrgId())).findFirst(); - Dept deptOld = null; - if (firstDept.isPresent()) { - deptOld = firstDept.get(); - dept1.setId(deptOld.getId()); + try { + Date startTime = new Date(); + int addCount = 0, upDateCount = 0; + String addContent = "", upDateContent = ""; + //获取同步表分公司及以下有效部门 + List ctOrganizationList = iCtOrganizationService.getCtOrganizationList(); + //获取闸井系统已存在的部门 + List deptList = abstractDeptService.getListByTips(""); + for (CtOrganization ctOrganization : ctOrganizationList) { + Dept dept1 = new Dept(); + Optional firstDept = deptList.stream().filter(dept -> Objects.equals(dept.getSyncId(), ctOrganization.getOrgId())).findFirst(); + Dept deptOld = null; + if (firstDept.isPresent()) { + deptOld = firstDept.get(); + dept1.setId(deptOld.getId()); + } + dept1.setDelFlag("0"); + dept1.setPid(getPid(ctOrganization, deptList)); + dept1.setNum(99); + dept1.setSimpleName(ctOrganization.getOrgName()); + dept1.setFullName(ctOrganization.getOrgName()); + dept1.setTips(getTips(ctOrganization.getOrgType() + "")); + dept1.setSyncId(ctOrganization.getOrgId()); + dept1.setSyncPid(ctOrganization.getParentId()); + dept1.setTenantId(ctOrganization.getOrgCode()); + dept1.setIsSync(1); + dept1.setIsParent(DictEnum.SYNC_GRID.equals(ctOrganization.getOrgType() + "") ? "1" : "0"); + dept1.setDeptType(DictEnum.SYNC_COMPANY.equals(ctOrganization.getOrgType() + "") ? "03" : "04"); + dept1.setPids(getPids(ctOrganization, deptList)); + dept1.setCreateTime(new Date()); + if (deptOld != null && StrUtil.equals(deptOld.getFullName(), dept1.getFullName()) && ObjectUtil.equals(deptOld.getPid(), dept1.getPid()) + && StrUtil.equals(deptOld.getSyncId(), dept1.getSyncId()) && StrUtil.equals(deptOld.getSyncPid(), dept1.getSyncPid()) + && StrUtil.equals(deptOld.getPids(), dept1.getPids()) && StrUtil.equals(deptOld.getDeptType(), dept1.getDeptType())) + continue; + if (deptOld == null) { + addCount++; + addContent += ctOrganization.getOrgName() + ","; + } else { + upDateCount++; + upDateContent += ctOrganization.getOrgName() + ","; + } + abstractDeptService.saveOrUpdate(dept1); + deptList.add(dept1); } - dept1.setDelFlag("0"); - dept1.setPid(getPid(ctOrganization, deptList)); - dept1.setNum(99); - dept1.setSimpleName(ctOrganization.getOrgName()); - dept1.setFullName(ctOrganization.getOrgName()); - dept1.setTips(getTips(ctOrganization.getOrgType() + "")); - dept1.setSyncId(ctOrganization.getOrgId()); - dept1.setSyncPid(ctOrganization.getParentId()); - dept1.setTenantId(ctOrganization.getOrgCode()); - dept1.setIsSync(1); - dept1.setIsParent(DictEnum.SYNC_GRID.equals(ctOrganization.getOrgType() + "") ? "1" : "0"); - dept1.setDeptType(DictEnum.SYNC_COMPANY.equals(ctOrganization.getOrgType() + "") ? "03" : "04"); - dept1.setPids(getPids(ctOrganization, deptList)); - dept1.setCreateTime(new Date()); - if (deptOld != null && StrUtil.equals(deptOld.getFullName(), dept1.getFullName()) && ObjectUtil.equals(deptOld.getPid(), dept1.getPid()) - && StrUtil.equals(deptOld.getSyncId(), dept1.getSyncId()) && StrUtil.equals(deptOld.getSyncPid(), dept1.getSyncPid()) - && StrUtil.equals(deptOld.getPids(), dept1.getPids()) && StrUtil.equals(deptOld.getDeptType(), dept1.getDeptType())) - continue; - if (deptOld == null) { - addCount++; - addContent += ctOrganization.getOrgName() + ","; - } else { - upDateCount++; - upDateContent += ctOrganization.getOrgName() + ","; - } - abstractDeptService.saveOrUpdate(dept1); - deptList.add(dept1); + Date endTime = new Date(); + Long syncId = SnowFlakeUtil.getId(); + iSyncLogService.saveSyncLogs(syncId, startTime, endTime, "1", upDateCount + "", "0", addCount + ""); + return iSyncLogDetailService.saveSyncLogs(syncId, upDateContent, "", addContent); + } catch (Exception e) { + e.printStackTrace(); + return false; } - Date endTime = new Date(); - Long syncId = SnowFlakeUtil.getId(); - iSyncLogService.saveSyncLogs(syncId, startTime, endTime, "1", upDateCount + "", "0", addCount + ""); - return iSyncLogDetailService.saveSyncLogs(syncId, upDateContent, "", addContent); } public String getPids(CtOrganization ctOrganization, List deptList) { @@ -265,72 +270,80 @@ @Transactional @Override public boolean synAllLedger() { - Date startTime = new Date(); - int addCount = 0, upDateCount = 0; - String addContent = "", upDateContent = ""; - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("valid", "1"); - List busLedgerList = this.baseMapper.selectList(queryWrapper); - List wellList = iEqEquipRqService.getWellList(); - wellList = wellList.stream().filter(CommonUtil.distinctByProperty(SyncTagDTO::getLedgerCode)).collect(Collectors.toList()); - List deptList = abstractDeptService.getListByTips(""); - List busLedgers = new ArrayList<>(); - for (SyncTagDTO syncTagDTO : wellList) { - BusLedger busLedger = new BusLedger(); - Optional firstBusLedger = busLedgerList.stream().filter(busLedger1 -> Objects.equals(busLedger1.getLedgerCode(), syncTagDTO.getLedgerCode())).findFirst(); - BusLedger busLedgerOld = null; - if (firstBusLedger.isPresent()) { - busLedgerOld = firstBusLedger.get(); - busLedger.setId(busLedgerOld.getId()); - } + try { + Date startTime = new Date(); + int addCount = 0, upDateCount = 0; + String addContent = "", upDateContent = ""; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("valid", "1"); + List busLedgerList = this.baseMapper.selectList(queryWrapper); + List wellList = iEqEquipRqService.getWellList(); + wellList = wellList.stream().filter(CommonUtil.distinctByProperty(SyncTagDTO::getLedgerCode)).collect(Collectors.toList()); + List deptList = abstractDeptService.getListByTips(""); + List busLedgers = new ArrayList<>(); + for (SyncTagDTO syncTagDTO : wellList) { + BusLedger busLedger = new BusLedger(); + Optional firstBusLedger = busLedgerList.stream().filter(busLedger1 -> Objects.equals(busLedger1.getLedgerCode(), syncTagDTO.getLedgerCode())).findFirst(); + BusLedger busLedgerOld = null; + if (firstBusLedger.isPresent()) { + busLedgerOld = firstBusLedger.get(); + busLedger.setId(busLedgerOld.getId()); + } // if (!ledgerCodeList.contains(syncTagDTO.getLedgerCode())) { - busLedger.setLedgerCode(syncTagDTO.getLedgerCode()); - busLedger.setLedgerName(syncTagDTO.getLedgerName()); - busLedger.setTagNumber(syncTagDTO.getTagNumber()); - busLedger.setLatGaode(syncTagDTO.getLatGaode()); - busLedger.setLngGaode(syncTagDTO.getLngGaode()); - busLedger.setPosition(syncTagDTO.getPosition()); - if (ObjectUtil.isNotEmpty(syncTagDTO.getOrgCode())) { - for (Dept dept : deptList) { - if (syncTagDTO.getOrgCode().equals(dept.getTenantId())) { - busLedger.setDeptid(dept.getId()); - break; + busLedger.setLedgerCode(syncTagDTO.getLedgerCode()); + busLedger.setLedgerName(syncTagDTO.getLedgerName()); + busLedger.setTagNumber(syncTagDTO.getTagNumber()); + busLedger.setLatGaode(syncTagDTO.getLatGaode()); + busLedger.setLngGaode(syncTagDTO.getLngGaode()); + busLedger.setPosition(syncTagDTO.getPosition()); + if (ObjectUtil.isNotEmpty(syncTagDTO.getOrgCode())) { + for (Dept dept : deptList) { + if (syncTagDTO.getOrgCode().equals(dept.getTenantId())) { + busLedger.setDeptid(dept.getId()); + break; + } } } + busLedger.setManageType(manageTypeList.contains(syncTagDTO.getManageType()) ? "1" : "0"); + busLedger.setOnState(DictEnum.IS_USED.equals(syncTagDTO.getOnState()) ? DictEnum.IS_USED : "0"); + busLedger.setLocationState("1"); + busLedger.setWellType("3"); + busLedger.setTargetId(syncTagDTO.getTargetId()); + busLedger.setTargetCode(syncTagDTO.getOrgCode()); + busLedger.setPropertyOwner(syncTagDTO.getPropertyOwner()); + busLedger.setPropertyPerson(syncTagDTO.getPropertyPerson()); + busLedger.setPropertyPhone(syncTagDTO.getPropertyPhone()); + busLedger.setOpenDate(syncTagDTO.getOpenDate()); + busLedger.setArea(syncTagDTO.getArea()); + busLedger.setValid("1"); + busLedger.setType("3".equals(syncTagDTO.getType()) ? "1" : "2"); + if (busLedgerOld != null && StrUtil.equals(busLedgerOld.getLedgerCode(), busLedger.getLedgerCode()) && StrUtil.equals(busLedgerOld.getLedgerName(), busLedger.getLedgerName()) + && StrUtil.equals(busLedgerOld.getTagNumber(), busLedger.getTagNumber()) && StrUtil.equals(busLedgerOld.getLatGaode(), busLedger.getLatGaode()) + && StrUtil.equals(busLedgerOld.getLngGaode(), busLedger.getLngGaode()) && StrUtil.equals(busLedgerOld.getPosition(), busLedger.getPosition()) + && StrUtil.equals(busLedgerOld.getTargetId(), busLedger.getTargetId()) && StrUtil.equals(busLedgerOld.getTargetCode(), busLedger.getTargetCode())) + continue; + if (busLedgerOld == null) { + addCount++; + addContent += busLedger.getLedgerCode() + ","; + } else { + upDateCount++; + upDateContent += busLedger.getLedgerCode() + ","; + } + busLedgers.add(busLedger); } - busLedger.setManageType(manageTypeList.contains(syncTagDTO.getManageType()) ? "1" : "0"); - busLedger.setOnState(DictEnum.IS_USED.equals(syncTagDTO.getOnState()) ? DictEnum.IS_USED : "0"); - busLedger.setLocationState("1"); - busLedger.setWellType("3"); - busLedger.setTargetId(syncTagDTO.getTargetId()); - busLedger.setTargetCode(syncTagDTO.getOrgCode()); - busLedger.setPropertyOwner(syncTagDTO.getPropertyOwner()); - busLedger.setPropertyPerson(syncTagDTO.getPropertyPerson()); - busLedger.setPropertyPhone(syncTagDTO.getPropertyPhone()); - busLedger.setOpenDate(syncTagDTO.getOpenDate()); - busLedger.setArea(syncTagDTO.getArea()); - busLedger.setValid("1"); - busLedger.setType("3".equals(syncTagDTO.getType()) ? "1" : "2"); - if (busLedgerOld != null && StrUtil.equals(busLedgerOld.getLedgerCode(), busLedger.getLedgerCode()) && StrUtil.equals(busLedgerOld.getLedgerName(), busLedger.getLedgerName()) - && StrUtil.equals(busLedgerOld.getTagNumber(), busLedger.getTagNumber()) && StrUtil.equals(busLedgerOld.getLatGaode(), busLedger.getLatGaode()) - && StrUtil.equals(busLedgerOld.getLngGaode(), busLedger.getLngGaode()) && StrUtil.equals(busLedgerOld.getPosition(), busLedger.getPosition()) - && StrUtil.equals(busLedgerOld.getTargetId(), busLedger.getTargetId()) && StrUtil.equals(busLedgerOld.getTargetCode(), busLedger.getTargetCode())) - continue; - if (busLedgerOld == null) { - addCount++; - addContent += busLedger.getLedgerCode() + ","; - } else { - upDateCount++; - upDateContent += busLedger.getLedgerCode() + ","; - } - busLedgers.add(busLedger); - } // } - this.saveOrUpdateBatch(busLedgers); - Date endTime = new Date(); - Long syncId = SnowFlakeUtil.getId(); - iSyncLogService.saveSyncLogs(syncId, startTime, endTime, "1", upDateCount + "", "0", addCount + ""); - return iSyncLogDetailService.saveSyncLogs(syncId, upDateContent, "", addContent); + this.saveOrUpdateBatch(busLedgers); + Date endTime = new Date(); + Long syncId = SnowFlakeUtil.getId(); + iSyncLogService.saveSyncLogs(syncId, startTime, endTime, "1", upDateCount + "", "0", addCount + ""); + iSyncLogDetailService.saveSyncLogs(syncId, upDateContent, "", addContent); + //同步是否直埋 + this.baseMapper.updateIsBuried(); + } catch (Exception e) { + e.printStackTrace(); + return false; + } + return true; } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/SyncLogDetailServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/SyncLogDetailServiceImpl.java index d2242c6..7ad578e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/SyncLogDetailServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/SyncLogDetailServiceImpl.java @@ -37,4 +37,11 @@ queryWrapper.eq("SYNC_LOG_ID", syncId); return this.list(queryWrapper); } + + @Override + public boolean deleteListBySyncId(List syncIds) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("SYNC_LOG_ID", syncIds); + return this.baseMapper.delete(queryWrapper) > 0 ? true : false; + } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/SyncLogServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/SyncLogServiceImpl.java index 24afe4e..5798675 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/SyncLogServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/SyncLogServiceImpl.java @@ -1,14 +1,18 @@ package com.casic.missiles.modular.device.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.modular.device.dao.SyncLogMapper; import com.casic.missiles.modular.device.entity.SyncLog; +import com.casic.missiles.modular.device.service.ISyncLogDetailService; import com.casic.missiles.modular.device.service.ISyncLogService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.Date; +import java.util.List; /** *

@@ -22,6 +26,7 @@ @Service public class SyncLogServiceImpl extends ServiceImpl implements ISyncLogService { private final AbstractPermissionContext permissionContext; + private final ISyncLogDetailService iSyncLogDetailService; @Override public boolean saveSyncLogs(Long id, Date startTime, Date endTime, String syncType, String updateCount, String deleteCount, String addCount) { @@ -38,4 +43,13 @@ return this.baseMapper.insert(syncLog) > 0 ? true : false; } + + @Transactional + @Override + public boolean batchDelete(List ids) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("ID", ids); + this.baseMapper.delete(queryWrapper); + return iSyncLogDetailService.deleteListBySyncId(ids); + } }