boor/wanmao-map-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix (farm): 大屏

Browse Source 
- 大屏模拟数据维护
This commit is contained in:
达富斌
2025-11-21 00:06:16 +08:00
parent c99967d0b9
commit e430062aa5
14 changed files with 320 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/digitalcockpit/DigitalCockpitController.java
View File

@@ -24,6 +24,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.error;
@@ -137,6 +138,10 @@ public class DigitalCockpitController {
public CommonResult<List<YieldStatisticsRespVO>> getYieldStatisticsInfo(@RequestParam("baseId") String baseId,
@RequestParam("year") String year) {
List<YieldStatisticsRespVO> res = productionPlanService.getCultivatingYieldInfo(baseId, year);
res = Arrays.asList(
new YieldStatisticsRespVO("红玫瑰",10000,20000),
new YieldStatisticsRespVO("褚橙",25000,50000)
);
return success(res);
}

20
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/foundationinfo/FoundationInfoController.java
View File

@@ -6,10 +6,9 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.foundationinfo.vo.FoundationInfoPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.foundationinfo.vo.FoundationInfoRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.foundationinfo.vo.FoundationInfoSaveReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.foundationinfo.vo.*;
import cn.iocoder.yudao.module.farm.dal.dataobject.foundationinfo.FoundationInfoDO;
import cn.iocoder.yudao.module.farm.service.foundationinfo.CockpitMockInfoService;
import cn.iocoder.yudao.module.farm.service.foundationinfo.FoundationInfoService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@@ -34,6 +33,8 @@ public class FoundationInfoController {
@Resource
private FoundationInfoService foundationInfoService;
@Resource
private CockpitMockInfoService cockpitMockInfoService;
@PostMapping("/create")
@Operation(summary = "创建基础信息")
@@ -93,17 +94,16 @@ public class FoundationInfoController {
@GetMapping("/data-toggle/get")
@Operation(summary = "数据切换-获取")
@Parameter(name = "data", description = "数据", required = true)
public CommonResult<String> getDataToggle(@RequestParam("data") String data) {
String res = "";
return success(res);
@Parameter(name = "baseId", description = "数据", required = true)
public CommonResult<List<DataToggleRespVO>> getDataToggle(@RequestParam("baseId") String baseId) {
return success(cockpitMockInfoService.getDataToggle(baseId));
}
@PostMapping("/data-toggle/create")
@Operation(summary = "数据切换-保存")
@Parameter(name = "data", description = "数据", required = true)
public CommonResult<String> createDataToggle(@RequestParam("data") String data) {
public CommonResult<String> createDataToggle(@Valid @RequestBody List<DataToggleReqVO> createReqVO) {
cockpitMockInfoService.createDataToggle(createReqVO);
return success("success");
}
}

22
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/foundationinfo/vo/DataToggleReqVO.java Normal file
View File

@@ -0,0 +1,22 @@
package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.foundationinfo.vo;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @description: TODO
* @author: binda
* @date: 2025/11/20 22:26
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class DataToggleReqVO {
private String baseId;
private String flag;
private String type;
private Object data;
}

23
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/foundationinfo/vo/DataToggleRespVO.java Normal file
View File

@@ -0,0 +1,23 @@
package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.foundationinfo.vo;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @description: TODO
* @author: binda
* @date: 2025/11/20 22:26
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class DataToggleRespVO {
private String id;
private String baseId;
private String flag;
private String type;
private Object data;
}

69
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/foundationinfo/CockpitMockInfoDO.java Normal file
View File

@@ -0,0 +1,69 @@
package cn.iocoder.yudao.module.farm.dal.dataobject.foundationinfo;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import lombok.*;
/**
* @description: 驾驶舱模拟数据
* @author: binda
* @date: 2025/11/20 22:50
*/
@TableName("farm_cockpit_mock_info")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class CockpitMockInfoDO extends BaseDO {
/**
* 基础id
*/
private String id;
/**
* 数据维护开关 (1: 开; 0: 关;)
*/
private String flag;
/**
* 数据类型
*/
private String type;
/**
* mock数据
*/
@TableField(typeHandler = JacksonTypeHandler.class)
private String jsonData;
/**
* 基地id
*/
private String baseId;
/**
* 基地
*/
private String baseName;
/**
* 地块ID
*/
private String plotId;
/**
* 地块
*/
private String plotName;
/**
* 租户id
*/
private String tenantId;
}

17
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/foundationinfo/CockpitMockInfoMapper.java Normal file
View File

@@ -0,0 +1,17 @@
package cn.iocoder.yudao.module.farm.dal.mysql.foundationinfo;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.module.farm.dal.dataobject.foundationinfo.CockpitMockInfoDO;
import org.apache.ibatis.annotations.Mapper;
/**
* @description:
* @author: binda
* @date: 2025/11/20 22:53
*/
@Mapper
public interface CockpitMockInfoMapper extends BaseMapperX<CockpitMockInfoDO> {
}

19
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/foundationinfo/CockpitMockInfoService.java Normal file
View File

@@ -0,0 +1,19 @@
package cn.iocoder.yudao.module.farm.service.foundationinfo;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.foundationinfo.vo.DataToggleReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.foundationinfo.vo.DataToggleRespVO;
import java.util.List;
/**
* @description:
* @author: binda
* @date: 2025/11/20 22:56
*/
public interface CockpitMockInfoService {
void createDataToggle(List<DataToggleReqVO> createReqVO);
List<DataToggleRespVO> getDataToggle(String baseId);
}

109
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/foundationinfo/CockpitMockInfoServiceImpl.java Normal file
View File

@@ -0,0 +1,109 @@
package cn.iocoder.yudao.module.farm.service.foundationinfo;
import cn.hutool.core.util.IdUtil;
import cn.hutool.json.JSONUtil;
import cn.idev.excel.util.StringUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.foundationinfo.vo.DataToggleReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.foundationinfo.vo.DataToggleRespVO;
import cn.iocoder.yudao.module.farm.dal.dataobject.foundationinfo.CockpitMockInfoDO;
import cn.iocoder.yudao.module.farm.dal.mysql.foundationinfo.CockpitMockInfoMapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
/**
* @description: TODO
* @author: binda
* @date: 2025/11/20 22:57
*/
@Service
public class CockpitMockInfoServiceImpl implements CockpitMockInfoService {
@Resource
private CockpitMockInfoMapper cockpitMockInfoMapper;
@Override
@Transactional(rollbackFor = Exception.class)
public void createDataToggle(List<DataToggleReqVO> createReqVO) {
if (CollectionUtils.isEmpty(createReqVO)) {
return;
}
// 1. 处理 baseId 为 null 的情况，设置为 "0"
for (DataToggleReqVO vo : createReqVO) {
if (vo.getBaseId() == null) {
vo.setBaseId("0");
}
}
// 2. 获取所有需要处理的 baseId（包括全局数据 baseId=0）
Set<String> baseIds = createReqVO.stream()
.map(DataToggleReqVO::getBaseId)
.collect(Collectors.toSet());
// 3. 删除这些 baseId 对应的所有现有数据
if (!baseIds.isEmpty()) {
cockpitMockInfoMapper.delete(new LambdaQueryWrapper<CockpitMockInfoDO>()
.in(CockpitMockInfoDO::getBaseId, baseIds));
}
// 4. 保存新的数据
List<CockpitMockInfoDO> saveList = new ArrayList<>();
for (DataToggleReqVO vo : createReqVO) {
CockpitMockInfoDO entity = new CockpitMockInfoDO();
entity.setId(IdUtil.fastUUID());
entity.setBaseId(vo.getBaseId());
entity.setFlag(vo.getFlag());
entity.setType(vo.getType());
// 将 data 对象转换为 JSON 字符串
if (vo.getData() != null) {
entity.setJsonData(JSONUtil.toJsonStr(vo.getData()));
}
saveList.add(entity);
}
// 5. 批量插入新数据
if (!saveList.isEmpty()) {
cockpitMockInfoMapper.insertBatch(saveList);
}
}
@Override
public List<DataToggleRespVO> getDataToggle(String baseId) {
// 查询数据库记录
List<CockpitMockInfoDO> entityList = cockpitMockInfoMapper.selectList(
new LambdaQueryWrapper<CockpitMockInfoDO>()
.eq(CockpitMockInfoDO::getBaseId, baseId)
);
// 转换为响应VO
List<DataToggleRespVO> result = new ArrayList<>();
for (CockpitMockInfoDO entity : entityList) {
DataToggleRespVO vo = BeanUtils.toBean(entity, DataToggleRespVO.class);
// 特殊处理 jsonData 到 data 的转换
if (StringUtils.isNotBlank(entity.getJsonData())) {
try {
Object data = JSONUtil.parse(entity.getJsonData());
vo.setData(data);
} catch (Exception e) {
vo.setData(entity.getJsonData());
}
}
result.add(vo);
}
return result;
}
}

3
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/foundationinfo/FoundationInfoServiceImpl.java
View File

@@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.security.core.LoginUser;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.foundationinfo.vo.FoundationInfoPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.foundationinfo.vo.FoundationInfoSaveReqVO;
import cn.iocoder.yudao.module.farm.dal.dataobject.foundationinfo.FoundationInfoDO;
import cn.iocoder.yudao.module.farm.dal.mysql.foundationinfo.CockpitMockInfoMapper;
import cn.iocoder.yudao.module.farm.dal.mysql.foundationinfo.FoundationInfoMapper;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
@@ -29,6 +30,8 @@ public class FoundationInfoServiceImpl implements FoundationInfoService {
@Resource
private FoundationInfoMapper foundationInfoMapper;
@Resource
private CockpitMockInfoMapper cockpitMockMapper;
@Override
public String createFoundationInfo(FoundationInfoSaveReqVO createReqVO) {

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productionplan/ProductionPlanServiceImpl.java
View File

@@ -475,7 +475,7 @@ public class ProductionPlanServiceImpl implements ProductionPlanService {
@Override
public List<YieldStatisticsRespVO> getCultivatingYieldInfo(String baseId, String year) {
return null;
return Collections.EMPTY_LIST;
}
@Override

13
yudao-module-farm/src/main/resources/mapper/foundationinfo/CockpitMockInfoMapper.xml Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.iocoder.yudao.module.farm.dal.mysql.foundationinfo.CockpitMockInfoMapper">
<!--
一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
-->
</mapper>