liyudong/simulation-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改类型

Browse Source
This commit is contained in:
wangwenhua 2025-09-14 16:16:33 +08:00
parent 45007d9b8f
commit 5d1e4020f3
2 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/com/hivekion/scenario/entity/Resource.java
View File

@ -1,10 +1,14 @@
package com.hivekion.scenario.entity; package com.hivekion.scenario.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Map;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@ -33,13 +37,14 @@ public class Resource implements Serializable {
private String icon; private String icon;
@ApiModelProperty("纬度") @ApiModelProperty("纬度")
private BigDecimal lat; private String lat;
@ApiModelProperty("经度") @ApiModelProperty("经度")
private BigDecimal lng; private String lng;
@ApiModelProperty("设施属性") @ApiModelProperty("设施属性")
private byte[] resourceAttribut; @TableField(typeHandler = JacksonTypeHandler.class)
private Map<String,Object> resourceAttribut;
@ApiModelProperty("创建人") @ApiModelProperty("创建人")
private String createOper; private String createOper;
@ -74,27 +79,27 @@ public class Resource implements Serializable {
this.icon = icon; this.icon = icon;
} }
public BigDecimal getLat() { public String getLat() {
return lat; return lat;
} }
public void setLat(BigDecimal lat) { public void setLat(String lat) {
this.lat = lat; this.lat = lat;
} }
public BigDecimal getLng() { public String getLng() {
return lng; return lng;
} }
public void setLng(BigDecimal lng) { public void setLng(String lng) {
this.lng = lng; this.lng = lng;
} }
public byte[] getResourceAttribut() { public Map<String, Object> getResourceAttribut() {
return resourceAttribut; return resourceAttribut;
} }
public void setResourceAttribut(byte[] resourceAttribut) { public void setResourceAttribut(Map<String, Object> resourceAttribut) {
this.resourceAttribut = resourceAttribut; this.resourceAttribut = resourceAttribut;
} }

17
src/main/java/com/hivekion/scenario/service/impl/ScenarioTaskServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.hivekion.scenario.service.impl; package com.hivekion.scenario.service.impl;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject; import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@ -122,16 +123,20 @@ public class ScenarioTaskServiceImpl extends
try { try {
QueryWrapper<WeatherResource> weatherResourceQueryWrapper = new QueryWrapper<>(); QueryWrapper<WeatherResource> weatherResourceQueryWrapper = new QueryWrapper<>();
weatherResourceQueryWrapper.eq("scenario_id", currentScenario.getId()).eq("room_id", roomId); weatherResourceQueryWrapper.eq("scenario_id", currentScenario.getId()).eq("room_id", roomId);
WeatherResource weatherResource = this.weatherResourceService.getOne(weatherResourceQueryWrapper); List<WeatherResource> weatherResourceList = this.weatherResourceService.list();
ResponseCmdInfo<JSONObject> responseCmdInfo = new ResponseCmdInfo(); ResponseCmdInfo<JSONArray> responseCmdInfo = new ResponseCmdInfo();
responseCmdInfo.setScenarioId(currentScenario.getId()); responseCmdInfo.setScenarioId(currentScenario.getId());
responseCmdInfo.setRoom(roomId); responseCmdInfo.setRoom(roomId);
JSONObject weatherMsg = new JSONObject(); JSONArray weatherMsgArray = new JSONArray();
for(WeatherResource weatherResource: weatherResourceList) {
JSONObject jsonObject = new JSONObject();
DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
weatherMsg.putOnce("begTime", dtf.format(weatherResource.getLastBegTime())); jsonObject.putOnce("begTime", dtf.format(weatherResource.getLastBegTime()));
weatherMsg.putOnce("endTime", dtf.format(weatherResource.getLastEndTime())); jsonObject.putOnce("endTime", dtf.format(weatherResource.getLastEndTime()));
weatherMsgArray.add(jsonObject);
responseCmdInfo.setCmdType("66-" + weatherResource.getWeatherType()); responseCmdInfo.setCmdType("66-" + weatherResource.getWeatherType());
responseCmdInfo.setData(weatherMsg); }
responseCmdInfo.setData(weatherMsgArray);
Global.sendCmdInfoQueue.add(responseCmdInfo); Global.sendCmdInfoQueue.add(responseCmdInfo);
}catch (Exception ex){ }catch (Exception ex){
ex.printStackTrace(); ex.printStackTrace();