From 6de2c8b5c384b5c53e7b3e013e153f0bbfe97355 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Mon, 26 Aug 2024 20:25:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E4=BA=8C=E7=BA=A7?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/common/core/constant/HttpStatus.java | 4 + .../bonus/sgzb/base/domain/BmProjectLot.java | 2 + .../controller/LargeScreenController.java | 46 +++- .../sgzb/largeScreen/domain/BackRecord.java | 185 ++++++++++++++++ .../sgzb/largeScreen/domain/EquipmentDis.java | 22 ++ .../largeScreen/domain/EquipmentDisVo.java | 36 ++- .../largeScreen/domain/IotMaCodeMachine.java | 9 + .../sgzb/largeScreen/domain/LeaseRecord.java | 205 ++++++++++++++++++ .../sgzb/largeScreen/domain/ParamsDto.java | 1 + .../largeScreen/mapper/LargeScreenMapper.java | 14 +- .../service/ILargeScreenService.java | 10 +- .../service/impl/LargeScreenServiceImpl.java | 76 ++++++- .../src/main/resources/bootstrap.yml | 33 ++- .../mapper/app/BackReceiveMapper.xml | 5 +- .../resources/mapper/app/TmTaskMapper.xml | 2 + .../mapper/base/BmProjectLotMapper.xml | 6 +- .../mapper/largeScreen/LargeScreenMapper.xml | 145 ++++++++++++- 17 files changed, 772 insertions(+), 29 deletions(-) create mode 100644 sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/BackRecord.java create mode 100644 sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/EquipmentDis.java create mode 100644 sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/LeaseRecord.java diff --git a/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/constant/HttpStatus.java b/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/constant/HttpStatus.java index 4d047578..2aaee42d 100644 --- a/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/constant/HttpStatus.java +++ b/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/constant/HttpStatus.java @@ -101,6 +101,10 @@ public class HttpStatus *iot设备定位地址 */ public static final String LAST_POSITION_URL = "http://gps51.com/webapi?action=lastposition&token="; + /** + *iot设备获取地址 + */ + public static final String REPORT_OF_FLINE = "http://gps51.com/webapi?action=reportoffline&token="; /** *iot查询行程地址 diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmProjectLot.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmProjectLot.java index 4182db30..00d0961f 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmProjectLot.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmProjectLot.java @@ -147,6 +147,8 @@ public class BmProjectLot { private String latitude; @ApiModelProperty(value = "地址") private String address; + @ApiModelProperty(value = "省份") + private String province; /** 导出选中列表 */ private List dataCondition; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/controller/LargeScreenController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/controller/LargeScreenController.java index 155414fd..ce2a2b3f 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/controller/LargeScreenController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/controller/LargeScreenController.java @@ -6,6 +6,7 @@ import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; import com.bonus.sgzb.largeScreen.domain.*; import com.bonus.sgzb.largeScreen.service.ILargeScreenService; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; @@ -68,11 +69,16 @@ public class LargeScreenController extends BaseController { } } - @Log(title = "设备分布图",businessType = BusinessType.QUERY) - @PostMapping("getEquipmentDisByMap") + @Log(title = "获取省份信息",businessType = BusinessType.QUERY) + @GetMapping("getEquipmentDisByMap") public AjaxResult getEquipmentDisByMap(ParamsDto dto) { return service.getEquipmentDisByMap(dto); } + @Log(title = "获取工程经纬度、地址",businessType = BusinessType.QUERY) + @GetMapping("getEquipmentDis") + public AjaxResult getEquipmentDis(ParamsDto dto) { + return service.getEquipmentDis(dto); + } @Log(title = "施工机具/安全工器具总保有量",businessType = BusinessType.QUERY) @PostMapping("getTotalOwnership") @@ -233,8 +239,40 @@ public class LargeScreenController extends BaseController { @Log(title = "获取iot编码绑定设备", businessType = BusinessType.QUERY) @GetMapping("getIotMaCodeMachine") - public AjaxResult getIotMaCodeMachine() { - List iotMaCodeMachine = service.getIotMaCodeMachine(); + public AjaxResult getIotMaCodeMachine(String province) { + List iotMaCodeMachine = service.getIotMaCodeMachine(province); return AjaxResult.success(iotMaCodeMachine); } + + /** + * 领料记录列表 + */ + @ApiOperation(value = "大屏二级页面--领料记录列表") + @GetMapping("/getLeaseRecordListByLotId") + public AjaxResult getLeaseRecordListByLotId(LeaseRecord leaseRecord) { + startPage(); + List list = service.getLeaseRecordList(leaseRecord); + return AjaxResult.success(getDataTable(list)); + } + + /** + * 领料记录列表 + */ + @ApiOperation(value = "大屏二级页面--退料记录列表") + @GetMapping("/getBackRecordListByLotId") + public AjaxResult getBackRecordListByLotId(BackRecord backRecord) { + startPage(); + List list = service.getBackRecordListByLotId(backRecord); + return AjaxResult.success(getDataTable(list)); + } + + /** + * 领料记录列表 + */ + @ApiOperation(value = "大屏二级页面--查询工程在用设备数量") + @GetMapping("/getUseNumByLotId") + public AjaxResult getUseNumByLotId(LeaseRecord leaseRecord) { + LeaseRecord leaseRecords = service.getUseNumByLotId(leaseRecord); + return AjaxResult.success(leaseRecords); + } } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/BackRecord.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/BackRecord.java new file mode 100644 index 00000000..2aa1bf28 --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/BackRecord.java @@ -0,0 +1,185 @@ +package com.bonus.sgzb.largeScreen.domain; + +import com.bonus.sgzb.common.core.annotation.Excel; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** +* @description 综合查询--退料查询 +* @author hay +* @date 2024/2/26 14:51 +*/ +@Data +public class BackRecord { + + private static final long serialVersionUID = 2227217051604273598L; + + @ApiModelProperty(value = "") + private Integer id; + + /** + * 类型名称 + */ + @ApiModelProperty(value = "类型名称") + @Excel(name = "机具名称") + private String typeName; + + /** + * 规格ID + */ + @ApiModelProperty(value = "规格ID") + private Integer typeId; + + /** + * 规格型号 + */ + @ApiModelProperty(value = "规格型号") + @Excel(name = "机具规格") + private String typeModelName; + + /** + * 退料单号 + */ + @ApiModelProperty(value = "退料单号") + @Excel(name = "退料单号") + private String code; + + /** + * 协议号 + */ + @ApiModelProperty(value = "协议号") + private String agreementCode; + + /** + * 设备编码 + */ + @ApiModelProperty(value = "设备编码") + @Excel(name = "设备编码") + private String maCode; + + /** + * 计量单位 + */ + @ApiModelProperty(value = "计量单位") + private String unit; + + /** + * 退料数量 + */ + @ApiModelProperty(value = "退料数量") + @Excel(name = "退料数量",cellType = Excel.ColumnType.NUMERIC) + private Double backNum; + + /** + * 退料人 + */ + @ApiModelProperty(value = "退料人") + @Excel(name = "退料人") + private String backPerson; + + + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者") + private String createBy; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "退料日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + /** + * 更新者 + */ + @ApiModelProperty(value = "更新者") + private String updateBy; + + /** + * 更新时间 + */ + @ApiModelProperty(value = "更新时间 ") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; + + /** + * 退料单位Id + */ + @ApiModelProperty(value = "退料单位Id") + private Integer unitId; + + /** + * 退料单位 + */ + @ApiModelProperty(value = "退料单位") + @Excel(name = "退料单位") + private String unitName; + + /** + * 退料工程Id + */ + @ApiModelProperty(value = "退料工程Id") + private Integer lotId; + + /** + * 退料工程 + */ + @ApiModelProperty(value = "退料工程") + @Excel(name = "退料工程") + private String proName; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; + + /** + * 关键字 + */ + @ApiModelProperty(value = "关键字") + private String keyWord; + + @ApiModelProperty(value="开始时间") + private String startTime; + + @ApiModelProperty(value="结束时间") + private String endTime; + + + /** + * 设备所属类型 + */ + @ApiModelProperty(value = "数据所属组织") + private Integer companyId; + + /** + * 装备管理方式(0编号 1计数) + */ + @ApiModelProperty(value = "装备管理方式") + private int manageType; + + /** + * 装备管理方式(0编号 1计数) + */ + @ApiModelProperty(value = "装备管理方式名称") + private String manageTypeName; + + /** + * 实时库存 + */ + @ApiModelProperty(value = "实时库存") + private Double num; + +} \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/EquipmentDis.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/EquipmentDis.java new file mode 100644 index 00000000..8c82a437 --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/EquipmentDis.java @@ -0,0 +1,22 @@ +package com.bonus.sgzb.largeScreen.domain; + +import lombok.Data; + +import java.util.List; + +/** + * @author 10488 + * 设备分布-VO + */ +@Data +public class EquipmentDis { + /** + * 省份 + */ + private String province; + /** + * 工程数量 + */ + private Integer num; + +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/EquipmentDisVo.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/EquipmentDisVo.java index 2f1017b5..fc9a9650 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/EquipmentDisVo.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/EquipmentDisVo.java @@ -2,6 +2,8 @@ package com.bonus.sgzb.largeScreen.domain; import lombok.Data; +import java.util.List; + /** * @author 10488 * 设备分布-VO @@ -9,15 +11,41 @@ import lombok.Data; @Data public class EquipmentDisVo { - /** 经度*/ + /** + * 经度 + */ private String lon; - /** 维度*/ + /** + * 维度 + */ private String lat; - /** 工程名称*/ + /** + * 工程名称 + */ private String lotName; + /** + * 工程id + */ + private Integer lotId; - /** 机具类型名称*/ + /** + * 机具类型名称 + */ private String typeName; + /** + * 省份 + */ + private String province; + /** + * 工程数量 + */ + private Integer num; + + private String longitude; + private String latitude; + private String address; + + List EquipmentDisList; } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/IotMaCodeMachine.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/IotMaCodeMachine.java index 30e2c16e..242bc6a8 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/IotMaCodeMachine.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/IotMaCodeMachine.java @@ -45,8 +45,17 @@ public class IotMaCodeMachine { * 绑定状态 */ private String bindStatus; + /** + * 省份 + */ + private String province; + /** + * 协议id + */ + private String agreementId; /** * 当前位置 */ private IotLocationVo iotLocationVo; + private IotLocationVo iotLocationVo1; } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/LeaseRecord.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/LeaseRecord.java new file mode 100644 index 00000000..6715692c --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/LeaseRecord.java @@ -0,0 +1,205 @@ +package com.bonus.sgzb.largeScreen.domain; + +import com.bonus.sgzb.common.core.annotation.Excel; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * @author hay + * @date 2024/2/26 14:51 + */ +@Data +public class LeaseRecord { + + private static final long serialVersionUID = 2227217051604273598L; + + @ApiModelProperty(value = "") + private Integer id; + + /** + * 类型名称 + */ + @ApiModelProperty(value = "类型名称") + @Excel(name = "机具名称") + private String typeName; + + /** + * 规格ID + */ + @ApiModelProperty(value = "规格ID") + private Integer typeId; + + /** + * 规格型号 + */ + @ApiModelProperty(value = "规格型号") + @Excel(name = "机具规格") + private String typeModelName; + + /** + * 协议号 + */ + @ApiModelProperty(value = "协议号") + @Excel(name = "协议号") + private String agreementCode; + + /** + * 设备编码 + */ + @ApiModelProperty(value = "设备编码") + @Excel(name = "设备编码") + private String maCode; + /** + * 领料单号 + */ + @ApiModelProperty(value = "领料单号") + @Excel(name = "领料单号") + private String code; + /** + * 车牌号 + */ + @ApiModelProperty(value = "车牌号") + @Excel(name = "车牌号") + private String carCode; + + /** + * 计量单位 + */ + @ApiModelProperty(value = "计量单位") + @Excel(name = "单位") + private String unit; + + /** + * 预领料数 + */ + @ApiModelProperty(value = "预领料数") + @Excel(name = "领料数量", cellType = Excel.ColumnType.NUMERIC) + private Double preNum; + + /** + * 领料人 + */ + @ApiModelProperty(value = "领料人") + @Excel(name = "领料人") + private String leasePerson; + + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者") + private String createBy; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "领料日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + /** + * 更新者 + */ + @ApiModelProperty(value = "更新者") + private String updateBy; + + /** + * 更新时间 + */ + @ApiModelProperty(value = "更新时间 ") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; + + /** + * 领料单位Id + */ + @ApiModelProperty(value = "领料单位Id") + private Integer unitId; + + /** + * 领料单位 + */ + @ApiModelProperty(value = "领料单位") + @Excel(name = "领料单位") + private String unitName; + + /** + * 领料工程Id + */ + @ApiModelProperty(value = "领料工程Id") + private Integer lotId; + + /** + * 领料工程 + */ + @ApiModelProperty(value = "领料工程") + @Excel(name = "领料工程") + private String proName; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; + + /** + * 关键字 + */ + @ApiModelProperty(value = "关键字") + private String keyWord; + + @ApiModelProperty(value = "开始时间") + private String startTime; + + @ApiModelProperty(value = "结束时间") + private String endTime; + + + /** + * 设备所属类型 + */ + @ApiModelProperty(value = "数据所属组织") + private Integer companyId; + + /** + * 装备管理方式(0编号 1计数) + */ + @ApiModelProperty(value = "装备管理方式") + private int manageType; + + /** + * 装备管理方式(0编号 1计数) + */ + @ApiModelProperty(value = "装备管理方式名称") + private String manageTypeName; + + /** + * 实时库存 + */ + @ApiModelProperty(value = "实时库存") + private Double num; + /** + * 机具在用数量 + */ + @ApiModelProperty(value = "机具在用数量") + private Integer useNumJj; + /** + * 调试在用数量 + */ + @ApiModelProperty(value = "调试在用数量") + private Integer useNumTs; + /** + * 设备负责人 + */ + @ApiModelProperty(value = "设备负责人") + private String typeKeepName; + +} \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/ParamsDto.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/ParamsDto.java index 082e7f8e..faca7174 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/ParamsDto.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/ParamsDto.java @@ -27,6 +27,7 @@ public class ParamsDto { * 类型 验收1 入库2 * */ private String type; + private String province; /** * 公司id diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/mapper/LargeScreenMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/mapper/LargeScreenMapper.java index 0cf5c587..a42833db 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/mapper/LargeScreenMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/mapper/LargeScreenMapper.java @@ -47,7 +47,7 @@ public interface LargeScreenMapper { * @author cwchen * @date 2023/12/13 15:04 */ - List getEquipmentDisByMap(ParamsDto dto); + List getEquipmentDisByMap(ParamsDto dto); /** * @param dto @@ -172,5 +172,15 @@ public interface LargeScreenMapper { */ List getRepairList(ParamsDto dto); - List getIotMaCodeMachine(); + List getIotMaCodeMachine(String province); + + List getEquipmentDis(ParamsDto dto); + + List getLeaseRecordList(LeaseRecord leaseRecord); + + String getTypeKeepName(LeaseRecord record); + + Double getUseNumByLotId(LeaseRecord leaseRecord); + + List getBackRecordList(BackRecord backRecord); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/ILargeScreenService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/ILargeScreenService.java index 5d36b5fd..1b3f0b69 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/ILargeScreenService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/ILargeScreenService.java @@ -169,5 +169,13 @@ public interface ILargeScreenService { */ AjaxResult getMaintenanceChartByMonth(ParamsDto dto); - List getIotMaCodeMachine(); + List getIotMaCodeMachine(String province); + + AjaxResult getEquipmentDis(ParamsDto dto); + + List getLeaseRecordList(LeaseRecord lotId); + + LeaseRecord getUseNumByLotId(LeaseRecord leaseRecord); + + List getBackRecordListByLotId(BackRecord backRecord); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java index 8cf04438..5bea8374 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java @@ -81,13 +81,8 @@ public class LargeScreenServiceImpl implements ILargeScreenService { @Override public AjaxResult getEquipmentDisByMap(ParamsDto dto) { - List list = new ArrayList<>(); - try { - - } catch (Exception e) { - log.error("设备分布", e); - } - return AjaxResult.success(list); + List equipmentDisByMap = mapper.getEquipmentDisByMap(dto); + return AjaxResult.success(equipmentDisByMap); } @Override @@ -365,14 +360,54 @@ public class LargeScreenServiceImpl implements ILargeScreenService { } @Override - public List getIotMaCodeMachine() { - List iotMaCodeMachine = mapper.getIotMaCodeMachine(); + public List getIotMaCodeMachine(String province) { + List iotMaCodeMachine = mapper.getIotMaCodeMachine(province); for (IotMaCodeMachine maCodeMachine : iotMaCodeMachine) { - getLocation(maCodeMachine); + getLocation(maCodeMachine); } return iotMaCodeMachine; } + @Override + public AjaxResult getEquipmentDis(ParamsDto dto) { + List equipmentDis = mapper.getEquipmentDis(dto); + return AjaxResult.success(equipmentDis); + } + + @Override + public List getLeaseRecordList(LeaseRecord leaseRecord) { + List leaseRecordList = mapper.getLeaseRecordList(leaseRecord); + for (LeaseRecord record : leaseRecordList) { + String typeKeepName = mapper.getTypeKeepName(record); + record.setTypeKeepName(typeKeepName); + } + return leaseRecordList; + } + + @Override + public LeaseRecord getUseNumByLotId(LeaseRecord leaseRecord) { + LeaseRecord leaseRecord1 = new LeaseRecord(); + leaseRecord.setCompanyId(101); + Double useNumCom1 = mapper.getUseNumByLotId(leaseRecord); + if (useNumCom1 == null){ + useNumCom1 = 0.00; + } + leaseRecord.setCompanyId(102); + Double useNumCom2 = mapper.getUseNumByLotId(leaseRecord); + if (useNumCom2 == null){ + useNumCom2 = 0.00; + } + leaseRecord1.setUseNumJj(useNumCom1.intValue()); + leaseRecord1.setUseNumTs(useNumCom2.intValue()); + return leaseRecord1; + } + + @Override + public List getBackRecordListByLotId(BackRecord backRecord) { + List leaseRecordList = mapper.getBackRecordList(backRecord); + return leaseRecordList; + } + public void getLocation(IotMaCodeMachine iotMaCodeMachine) { log.info("getLocation:{}", iotMaCodeMachine); if (iotMaCodeMachine == null || iotMaCodeMachine.getIotCode() == null) { @@ -392,8 +427,11 @@ public class LargeScreenServiceImpl implements ILargeScreenService { map.put("deviceids", list); String param = JSON.toJSONString(map); String res = HttpHelper.doPost(HttpStatus.LAST_POSITION_URL + redisCode, param); + String res1 = HttpHelper.doPost(HttpStatus.REPORT_OF_FLINE + redisCode, param); //对返回的结果进行解析 IotLocationVo iotLocationVo = resultDataHandler(res); + String address = resultDataHandler1(res1); + iotLocationVo.setAddress(address); iotMaCodeMachine.setIotLocationVo(iotLocationVo); } @@ -408,7 +446,7 @@ public class LargeScreenServiceImpl implements ILargeScreenService { if ("0".equals(status) && "OK".equals(cause)) { String records = object.getString("records"); //判断返回结果是否为空 - if (records != null){ + if (records != null) { JSONArray jsonArray = JSON.parseArray(records); for (int i = 0; i < jsonArray.size(); i++) { JSONObject jsonObject = JSONObject.from(jsonArray.getJSONObject(i)); @@ -421,6 +459,22 @@ public class LargeScreenServiceImpl implements ILargeScreenService { } return iotLocationVo; } + private String resultDataHandler1(String res) { + if (res == null) { + throw new RuntimeException(ExceptionEnum.RETURN_DATA_IS_EMPTY.getMsg()); + } + String address = ""; + JSONObject object = JSONObject.parseObject(res); + String status = object.getString("status"); + String cause = object.getString("cause"); + if ("0".equals(status) && "OK".equals(cause)) { + JSONObject addressmap = object.getJSONObject("addressmap"); + for (String s : addressmap.keySet()) { + address = addressmap.get(s).toString(); + } + } + return address; + } @Override public AjaxResult getTotalOwnership() { diff --git a/sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml index 786585cc..6d001dd9 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml +++ b/sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml @@ -2,11 +2,40 @@ server: port: 29301 + +# Spring Boot Actuator V2中风险漏洞处理，禁止远程端口访问 +management: + endpoint: + env: + enabled: false + # Spring -spring: +spring: application: # 应用名称 name: sgzb-base profiles: # 环境配置 - active: sgzb_cloud_local \ No newline at end of file + active: sgzb_cloud_local + cloud: + loadbalancer: + # 关闭Ribbon的负载均衡器 + ribbon: + enabled: false + # 开启Nacos的负载均衡器 + nacos: + enabled: true + nacos: + discovery: + # 服务注册地址 + server-addr: 127.0.0.1:8848 + namespace: sgzb_cloud_dev_nxjj + config: + # 配置中心地址 + server-addr: 127.0.0.1:8848 + namespace: sgzb_cloud_dev_nxjj + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml index 51d3c00e..d0bc4741 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml @@ -321,7 +321,7 @@ file_url, - + company_id, create_time @@ -361,7 +361,7 @@ #{fileUrl}, - + #{companyId}, NOW() @@ -718,6 +718,7 @@ IFNULL(bad.audit_num,0)-IFNULL(aa.back_num,0) as num, bb.finished_back_num, mt.manage_type as manageType, + mt.company_id as companyId, CONCAT('NSJJ',mt.`code`,mt.model_code) as `code` FROM back_apply_details bad diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml index 87b78a25..cdac1bb0 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml @@ -1129,6 +1129,7 @@ mt2.type_name as typeName, mt.type_name as typeModelName, mt.manage_type as manageType, + mt.company_id as companyId, GROUP_CONCAT(su.user_id) as userId, GROUP_CONCAT(su.nick_name) as userName, lad.status as status, @@ -1312,6 +1313,7 @@ ifnull(lad.al_num,0) as alNum, mt2.type_name as typeName, mt.type_name as typeModelName, + mt.company_id as companyId, mt.manage_type as manageType, GROUP_CONCAT(su.nick_name) as userName, GROUP_CONCAT(su.user_id) as userId, diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectLotMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectLotMapper.xml index f70840f9..4d382220 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectLotMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectLotMapper.xml @@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select a.lot_id, a.pro_id, a.lot_name, a.status, a.type_id, a.link_man, a.telphone, a.own_pro, a.dept_id, a.is_share, a.lon, a.lat, a.del_flag, a.create_by, a.create_time,a.remark,a.company_id ,b.dept_name, c.name,a.start_date,a.completion_date, - a.longitude,a.latitude,a.address + a.longitude,a.latitude,a.address,a.province from bm_project_lot a left join sys_dept b on a.dept_id = b.dept_id left join sys_dic c on a.type_id = c.id @@ -121,6 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" longitude, latitude, address, + province, create_time )values( #{lotName}, @@ -141,6 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{longitude}, #{latitude}, #{address}, + #{province}, sysdate() ) @@ -162,6 +164,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" company_id = #{companyId}, start_date = #{startDate}, completion_date = #{completionDate}, + longitude = #{longitude}, + latitude = #{latitude}, address = #{address}, update_time = sysdate() diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml index d168ef75..9f635889 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml @@ -41,7 +41,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + + + + + + \ No newline at end of file From 1ee2760a7cba47414b6600a8a91ad805671c9efe Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Mon, 26 Aug 2024 20:27:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/bootstrap.yml | 31 +------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml index 6d001dd9..ad4fa1b2 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml +++ b/sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml @@ -2,13 +2,6 @@ server: port: 29301 - -# Spring Boot Actuator V2中风险漏洞处理，禁止远程端口访问 -management: - endpoint: - env: - enabled: false - # Spring spring: application: @@ -16,26 +9,4 @@ spring: name: sgzb-base profiles: # 环境配置 - active: sgzb_cloud_local - cloud: - loadbalancer: - # 关闭Ribbon的负载均衡器 - ribbon: - enabled: false - # 开启Nacos的负载均衡器 - nacos: - enabled: true - nacos: - discovery: - # 服务注册地址 - server-addr: 127.0.0.1:8848 - namespace: sgzb_cloud_dev_nxjj - config: - # 配置中心地址 - server-addr: 127.0.0.1:8848 - namespace: sgzb_cloud_dev_nxjj - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + active: sgzb_cloud_local \ No newline at end of file