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

farm模块-字典完善

Browse Source
This commit is contained in:
顾君禹
2025-08-21 16:02:18 +08:00
parent 701ba57d23
commit 1cf8291dc1
16 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/farmingrecordinput/FarmingRecordInputDO.java
View File

@@ -68,6 +68,7 @@ public class FarmingRecordInputDO extends BaseDO {
/**
* 用法
*/
@TableField(value = "`usage`")
private String usage;
/**
* 逻辑删除标识符

1
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/inputlibrary/InputLibraryDO.java
View File

@@ -77,6 +77,7 @@ public class InputLibraryDO extends BaseDO {
/**
* 防治对象及使用方法
*/
@TableField(value = "`usage`")
private String usage;
/**
* 0=启用，1=停用

1
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelfarmingoperationinput/ModelFarmingOperationInputDO.java
View File

@@ -51,6 +51,7 @@ public class ModelFarmingOperationInputDO extends BaseDO {
/**
* 用法
*/
@TableField(value = "`usage`")
private String usage;
/**
* 基地id

24
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/disasterdata/DisasterDataServiceImpl.java
View File

@@ -1,23 +1,21 @@
package cn.iocoder.yudao.module.farm.service.disasterdata;
import cn.hutool.core.util.IdUtil;
import cn.iocoder.yudao.module.farm.controller.admin.dict.vo.sys.SysDictReqVO;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.farm.controller.admin.disasterdata.vo.DisasterDataPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.disasterdata.vo.DisasterDataSaveReqVO;
import cn.iocoder.yudao.module.farm.dal.dataobject.disasterdata.DisasterDataDO;
import cn.iocoder.yudao.module.farm.dal.mysql.disasterdata.DisasterDataMapper;
import cn.iocoder.yudao.module.farm.dal.mysql.sysDict.SysDictDO;
import cn.iocoder.yudao.module.farm.dal.mysql.sysDict.SysDictMapper;
import cn.iocoder.yudao.module.farm.enums.CommonConstants;
import org.springframework.stereotype.Service;
import cn.iocoder.yudao.module.farm.framework.util.ImageCollectionUtil;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import cn.iocoder.yudao.module.farm.dal.dataobject.disasterdata.DisasterDataDO;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.farm.dal.mysql.disasterdata.DisasterDataMapper;
import cn.iocoder.yudao.module.farm.framework.util.ImageCollectionUtil;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -43,7 +41,7 @@ public class DisasterDataServiceImpl implements DisasterDataService {
@Override
public String createDisasterData(DisasterDataSaveReqVO createReqVO) {
getLoginUser();
// 插入
DisasterDataDO disasterData = BeanUtils.toBean(createReqVO, DisasterDataDO.class);
// 将图片集合转换为数据库存储的字符串，仅当前端传了列表时进行转换
@@ -51,6 +49,8 @@ public class DisasterDataServiceImpl implements DisasterDataService {
disasterData.setImgUrl(ImageCollectionUtil.toDatabaseString(disasterData.getImageList()));
}
disasterData.setId(IdUtil.fastUUID());
disasterData.setCreateTime(LocalDateTime.now());
disasterData.setCreator(getLoginUser().getId().toString());
disasterDataMapper.insert(disasterData);
// 返回
@@ -67,6 +67,8 @@ public class DisasterDataServiceImpl implements DisasterDataService {
if (updateObj.getImageList() != null) {
updateObj.setImgUrl(ImageCollectionUtil.toDatabaseString(updateObj.getImageList()));
}
updateObj.setUpdater(getLoginUser().getId().toString());
updateObj.setUpdateTime(LocalDateTime.now());
disasterDataMapper.updateById(updateObj);
}
@@ -133,7 +135,7 @@ public class DisasterDataServiceImpl implements DisasterDataService {
long total = disasterDataMapper.selectDisasterDataCount(reqVO);
return new PageResult<>(list,total);
return new PageResult<>(list, total);
}
}

4
yudao-module-farm/src/main/resources/mapper/SysDictMapper.xml
View File

@@ -118,9 +118,7 @@
<if test="status != null">
AND status = #{status}
</if>
<if test="deleted != null">
AND deleted = #{deleted}
</if>
AND deleted = 0
</where>
</sql>

1
yudao-module-farm/src/main/resources/mapper/baseinfo/BaseInfoMapper.xml
View File

@@ -13,5 +13,6 @@
select count(*)
from farm_base_info
where tenant_id = #{tenantId}
and deleted = 0
</select>
</mapper>

4
yudao-module-farm/src/main/resources/mapper/farmingtypemaintenance/FarmingTypeMaintenanceMapper.xml
View File

@@ -44,9 +44,7 @@
<if test="req.useStatus != null">
AND t.use_status = #{req.useStatus}
</if>
<if test="req.deleted != null">
AND t.deleted = #{req.deleted}
</if>
AND t.deleted = 0
</where>
</select>

1
yudao-module-farm/src/main/resources/mapper/modelcycle/ModelCycleMapper.xml
View File

@@ -14,5 +14,6 @@
select *
from farm_model_cycle
where model_id = #{modelId}
and deleted = 0
</select>
</mapper>

1
yudao-module-farm/src/main/resources/mapper/modelenvironmentindex/ModelEnvironmentIndexMapper.xml
View File

@@ -14,5 +14,6 @@
select *
from farm_model_environment_index
where cycle_id = #{cycleId}
and deleted = 0
</select>
</mapper>

5
yudao-module-farm/src/main/resources/mapper/modelfarmingoperation/ModelFarmingOperationMapper.xml
View File

@@ -11,6 +11,9 @@
<select id="selectByCycleId" parameterType="String"
resultType="cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperation.ModelFarmingOperationDO">
select *
from farm_model_farming_operation
where cycle_id = #{cycleId}
and deleted = 0
</select>
</mapper>

1
yudao-module-farm/src/main/resources/mapper/modelfarmingoperationinput/ModelFarmingOperationInputMapper.xml
View File

@@ -14,5 +14,6 @@
select *
from farm_model_farming_operation_input
where farming_id = #{farmingId}
and deleted = 0
</select>
</mapper>

1
yudao-module-farm/src/main/resources/mapper/modelpestdiseaseweed/ModelPestDiseaseWeedMapper.xml
View File

@@ -14,5 +14,6 @@
select *
from farm_model_pest_disease_weed
where cycle_id = #{cycleId}
and deleted = 0
</select>
</mapper>

1
yudao-module-farm/src/main/resources/mapper/modelweatherdisaster/ModelWeatherDisasterMapper.xml
View File

@@ -14,5 +14,6 @@
select *
from farm_model_weather_disaster
where cycle_id = #{cycleId}
and deleted = 0
</select>
</mapper>

1
yudao-module-farm/src/main/resources/mapper/personnelmanagement/PersonnelManagementMapper.xml
View File

@@ -14,5 +14,6 @@
from farm_personnel_management
where tenant_id = #{tenantId}
and account_status = 0
and deleted = 0
</select>
</mapper>

2
yudao-module-farm/src/main/resources/mapper/productionplan/ProductionPlanMapper.xml
View File

@@ -13,10 +13,12 @@
select count(plant_species_code)
from farm_production_plan
where tenant_id = #{tenantId}
and deleted = 0
</select>
<select id="getTotalArea" parameterType="Long" resultType="java.lang.Double">
select sum(total_area)
from farm_production_plan
where tenant_id = #{tenantId}
and deleted = 0
</select>
</mapper>

1
yudao-module-farm/src/main/resources/mapper/speciesclassifylibrary/SpeciesClassifyLibraryMapper.xml
View File

@@ -46,6 +46,7 @@
<if test="req.useStatus != null">
AND t.use_status = #{req.useStatus}
</if>
AND t.deleted = 0
</where>
</select>