From 04131d8524ce0d1b163b2bed2261b5218c8be135 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Tue, 27 Aug 2024 15:31:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E8=AE=A1=E4=BB=A3=E7=A0=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java | 1 - .../bonus/sgzb/base/controller/BmProjectInfoController.java | 5 ++--- .../bonus/sgzb/base/controller/BmProjectLotController.java | 4 ++-- .../com/bonus/sgzb/base/controller/BmUnitInfoController.java | 4 ++-- .../sgzb/material/service/impl/IotMachineServiceImpl.java | 3 +++ .../src/main/resources/bootstrap-sgzb_nw_local.yml | 4 ++-- sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml | 2 +- 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java index af654f8..b52742a 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java @@ -190,7 +190,6 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { return AjaxResult.error("已领数量大于预领数量或该机具未在库"); } } catch (Exception e) { - e.printStackTrace(); return AjaxResult.error("出库失败"); } return AjaxResult.success("出库成功"); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/BmProjectInfoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/BmProjectInfoController.java index 01e8704..ce5da41 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/BmProjectInfoController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/BmProjectInfoController.java @@ -125,7 +125,7 @@ public class BmProjectInfoController extends BaseController{ util.exportExcel(response, list, "往来单位"); } - @Log(title = "项目管理导入", businessType = BusinessType.IMPORT) +/* @Log(title = "项目管理导入", businessType = BusinessType.IMPORT) @RequiresPermissions("system:user:import") @PostMapping("/importData") public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception @@ -134,6 +134,5 @@ public class BmProjectInfoController extends BaseController{ List bmProjectInfoList = util.importExcel(file.getInputStream()); String message = bmProjectInfoService.importBmProjectInfo(bmProjectInfoList, updateSupport); return success(message); - } - + }*/ } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/BmProjectLotController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/BmProjectLotController.java index b7339ce..fedb140 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/BmProjectLotController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/BmProjectLotController.java @@ -90,7 +90,7 @@ public class BmProjectLotController extends BaseController { return bmProjectLotService.updateBmProjectLot(bmProjectLot); } - @Log(title = "项目管理导入", businessType = BusinessType.IMPORT) +/* @Log(title = "项目管理导入", businessType = BusinessType.IMPORT) @RequiresPermissions("system:user:import") @PostMapping("/importData") public AjaxResult importData(MultipartFile file) throws Exception @@ -99,6 +99,6 @@ public class BmProjectLotController extends BaseController { List bmProjectLotList = util.importExcel(file.getInputStream()); String message = bmProjectLotService.importBmProjectLot(bmProjectLotList); return success(message); - } + }*/ } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/BmUnitInfoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/BmUnitInfoController.java index e79a71a..e7d2c9d 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/BmUnitInfoController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/BmUnitInfoController.java @@ -162,7 +162,7 @@ public class BmUnitInfoController extends BaseController{ ExcelUtil util = new ExcelUtil(BmUnitInfo.class); util.exportExcel(response, list, "往来单位"); } - @ApiOperation(value = "往来单位导入") +/* @ApiOperation(value = "往来单位导入") @Log(title = "往来单位导入", businessType = BusinessType.IMPORT) @RequiresPermissions("system:user:import") @PostMapping("/importData") @@ -173,6 +173,6 @@ public class BmUnitInfoController extends BaseController{ Long userId = SecurityUtils.getLoginUser().getUserid(); String message = bmUnitInfoService.importUser(bmUnitInfoList, updateSupport, userId); return success(message); - } + }*/ } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/IotMachineServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/IotMachineServiceImpl.java index c387427..5a5125d 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/IotMachineServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/IotMachineServiceImpl.java @@ -30,6 +30,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; import javax.annotation.Resource; +import java.math.BigDecimal; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; @@ -407,6 +408,8 @@ public class IotMachineServiceImpl implements IotMachineService { iotLocationVo.setBeginTime(jsonObject.getString("starttime")); iotLocationVo.setEndTime(jsonObject.getString("endtime")); iotLocationVo.setAddress(jsonObject.getString("address")); + iotLocationVo.setCallat(new BigDecimal(jsonObject.getString("callat"))); + iotLocationVo.setCallon(new BigDecimal(jsonObject.getString("callon"))); iotLocationVoList.add(iotLocationVo); } } diff --git a/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_nw_local.yml b/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_nw_local.yml index 2c378f0..d0474fe 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_nw_local.yml +++ b/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_nw_local.yml @@ -16,11 +16,11 @@ spring: discovery: # 服务注册地址 server-addr: 127.0.0.1:8848 - namespace: sgzb_nwjj + namespace: sgzb_cloud_dev_nw config: # 配置中心地址 server-addr: 127.0.0.1:8848 - namespace: sgzb_nwjj + namespace: sgzb_cloud_dev_nw # 配置文件格式 file-extension: yml # 共享配置 diff --git a/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml index d0a0f1e..1846508 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml +++ b/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml @@ -5,4 +5,4 @@ spring: name: sgzb-material profiles: # 环境配置 - active: sgzb_cloud_local \ No newline at end of file + active: sgzb_nw_local \ No newline at end of file