chuangte/autosprout
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

版本前端展示更新,新增选择有效版本功能

Browse Source
This commit is contained in:
SjS 2025-05-27 13:53:23 +08:00
parent c0f41d8f7a
commit 1b0d6b8fc8
13 changed files with 197 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
AutoSprout-ui/src/api/device/model.js
View File

@ -42,3 +42,15 @@ export function delModel(modelId) {
method: 'delete'
})
}
// 修改型号列表
export function versionControl(modelId,versionId) {
return request({
url: '/device/model/versionControl',
method: 'put',
data: {
modelId: modelId,
versionId: versionId
}
})
}

4
AutoSprout-ui/src/api/device/version.js
View File

@ -38,7 +38,9 @@ export function updateVersion(data) {
// 删除固件版本
export function delVersion(versionId) {
return request({
url: '/version/version/' + versionId,
url: '/version/version/del/' + versionId,
method: 'delete'
})
}

66
AutoSprout-ui/src/views/device/version/index.vue
View File

@ -3,6 +3,23 @@
<!-- 搜索区 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="型号" prop="modelId">
<el-select
v-model="queryParams.modelId"
filterable
clearable
placeholder="请选择型号"
@change="handleQuery"
>
<el-option
v-for="item in modelOptions"
:key="item.modelId"
:label="item.model"
:value="item.modelId"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="版本号" prop="version">
<el-input
v-model="queryParams.version"
@ -83,7 +100,18 @@
<!-- 列表区 -->
<el-table v-loading="loading" :data="versionList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="型号" align="center" prop="model" />
<el-table-column label="型号" align="center" prop="model">
<template slot-scope="scope">
{{ scope.row.model }}
<el-tag
v-if="scope.row.versionId === scope.row.modelVersion"
type="success"
size="mini"
style="margin-left:5px">
当前版本
</el-tag>
</template>
</el-table-column>
<el-table-column label="型号名称" align="center" prop="modelName" />
<el-table-column label="版本号" align="center" prop="version" />
<el-table-column label="大小(K)" align="center" prop="size" />
@ -91,6 +119,14 @@
<el-table-column label="描述" align="center" prop="upgradeDescribe" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleVersionControl(scope.row)"
v-hasPermi="['version:version:control']">
切换版本
</el-button>
<el-button
size="mini"
type="text"
@ -161,7 +197,7 @@
<script>
import { listVersion, getVersion, delVersion, addVersion, updateVersion } from "@/api/device/version";
import {listModel} from "@/api/device/model";
import {listModel, versionControl} from "@/api/device/model";
export default {
name: "Version",
@ -192,6 +228,7 @@ export default {
pageNum: 1,
pageSize: 10,
version: null,
modelId: null,
upgradeRequire: null,
upgradeDescribe: null
},
@ -221,7 +258,12 @@ export default {
/** 查询固件版本列表 */
getList() {
this.loading = true;
listVersion(this.queryParams).then(response => {
const params = {
...this.queryParams,
orderByColumn: ['modelId', 'version'],
isAsc: ['asc', 'desc']
}
listVersion(params).then(response => {
this.versionList = response.rows;
this.total = response.total;
this.loading = false;
@ -271,6 +313,24 @@ export default {
this.open = true;
this.title = "添加固件版本";
},
/** 版本控制按钮操作 */
handleVersionControl(row) {
this.$confirm(`确认切换版本 ${row.version} 的版本为有效版本吗？`, "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
versionControl(row.modelId, row.versionId).then(response => {
this.$message.success("版本切换成功");
this.getList();
}).catch(error => {
this.$message.error("版本切换失败：" + error.message);
});
}).catch(() => {
this.$message.info("已取消切换操作");
});
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();

11
AutoSprout-watering/src/main/java/com/ruoyi/device/controller/AsDeviceVersionController.java
View File

@ -105,4 +105,15 @@ public class AsDeviceVersionController extends BaseController
{
return toAjax(asDeviceVersionService.deleteAsDeviceVersionByVersionIds(versionIds));
}
/**
* 删除固件版本
*/
@PreAuthorize("@ss.hasPermi('device:version:remove')")
@Log(title = "固件版本", businessType = BusinessType.DELETE)
@DeleteMapping("/del/{versionId}")
public AjaxResult delete(@PathVariable Long versionId)
{
return toAjax(asDeviceVersionService.deleteAsDeviceVersionByVersionId(versionId));
}
}

24
AutoSprout-watering/src/main/java/com/ruoyi/device/controller/AsModelController.java
View File

@ -9,14 +9,7 @@ import com.ruoyi.device.domain.vo.AsModelVO;
import com.ruoyi.device.service.IAsDeviceVersionService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@ -124,4 +117,19 @@ public class AsModelController extends BaseController
{
return toAjax(asModelService.deleteAsModelByModelIds(modelIds));
}
/**
* 控制型号版本
*/
@PreAuthorize("@ss.hasPermi('device:model:control')")
@Log(title = "控制版本", businessType = BusinessType.UPDATE)
@PutMapping("/versionControl")
public AjaxResult versionControl(@RequestBody AsModel model)
{
AsModel asModel = new AsModel();
asModel.setModelId(model.getModelId());
asModel.setVersionId(model.getVersionId());
return toAjax(asModelService.updateAsModelVersion(asModel));
}
}

17
AutoSprout-watering/src/main/java/com/ruoyi/device/domain/AsDeviceVersion.java
View File

@ -6,6 +6,7 @@ import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import java.time.LocalDateTime;
import java.util.List;
/**
* 固件版本对象 as_device_version
@ -51,12 +52,24 @@ public class AsDeviceVersion extends BaseEntity
@Excel(name = "升级")
private String upgradeDescribe;
/** 升级 */
/** 创建时间 */
@Excel(name = "创建时间")
private LocalDateTime createLocalDateTime;
/** 升级 */
/** 版本名称 */
@Excel(name = "版本名称")
private String modelName;
/** 型号版本 */
@Excel(name = "型号版本")
private Long modelVersion;
/** 排序字段数组 */
@Excel(name = "排序字段数组")
private List<String> orderByColumn;
/** 排序方向数组 */
@Excel(name = "排序方向数组")
private List<String> isAsc;
}

3
AutoSprout-watering/src/main/java/com/ruoyi/device/mapper/AsDeviceVersionMapper.java
View File

@ -4,6 +4,7 @@ import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.device.domain.AsDeviceVersion;
import com.ruoyi.device.domain.AsModel;
import org.apache.ibatis.annotations.Param;
/**
@ -70,5 +71,5 @@ public interface AsDeviceVersionMapper extends BaseMapper<AsDeviceVersion>
public List<String> selectAsDeviceVersionByModelId(Long modelId);
AsDeviceVersion selectLatestAsDeviceVersion(Long modelId);
AsDeviceVersion selectLatestAsDeviceVersion(AsModel model);
}

2
AutoSprout-watering/src/main/java/com/ruoyi/device/mapper/AsModelMapper.java
View File

@ -83,4 +83,6 @@ public interface AsModelMapper extends BaseMapper<AsModel>
public AsModelVO checkModelByPre(AsModel asModel);
List<AsModelVO> selectAsModelByVersionIds(@Param("ids") List<Long> versionIds);
AsModelVO selectAsModelByVersionId(@Param("versionId") Long versionId);
}

4
AutoSprout-watering/src/main/java/com/ruoyi/device/service/IAsModelService.java
View File

@ -98,4 +98,8 @@ public interface IAsModelService
* @return
*/
List<AsModelVO> selectAsModelByVersionIds(List<Long> versionIds);
int updateAsModelVersion(AsModel asModel);
AsModelVO selectAsModelByVersionId(Long versionId);
}

65
AutoSprout-watering/src/main/java/com/ruoyi/device/service/impl/AsDeviceVersionServiceImpl.java
View File

@ -29,8 +29,7 @@ import javax.annotation.Resource;
* @date 2023-11-11
*/
@Service
public class AsDeviceVersionServiceImpl extends ServiceImpl<AsDeviceVersionMapper, AsDeviceVersion> implements IAsDeviceVersionService
{
public class AsDeviceVersionServiceImpl extends ServiceImpl<AsDeviceVersionMapper, AsDeviceVersion> implements IAsDeviceVersionService {
@Resource
private AsDeviceVersionMapper asDeviceVersionMapper;
@ -48,8 +47,7 @@ public class AsDeviceVersionServiceImpl extends ServiceImpl<AsDeviceVersionMappe
* @return 固件版本
*/
@Override
public AsDeviceVersion selectAsDeviceVersionByVersionId(Long versionId)
{
public AsDeviceVersion selectAsDeviceVersionByVersionId(Long versionId) {
return asDeviceVersionMapper.selectAsDeviceVersionByVersionId(versionId);
}
@ -71,8 +69,7 @@ public class AsDeviceVersionServiceImpl extends ServiceImpl<AsDeviceVersionMappe
* @return 固件版本
*/
@Override
public List<AsDeviceVersion> selectAsDeviceVersionList(AsDeviceVersion asDeviceVersion)
{
public List<AsDeviceVersion> selectAsDeviceVersionList(AsDeviceVersion asDeviceVersion) {
return asDeviceVersionMapper.selectAsDeviceVersionList(asDeviceVersion);
}
@ -83,8 +80,7 @@ public class AsDeviceVersionServiceImpl extends ServiceImpl<AsDeviceVersionMappe
* @return 结果
*/
@Override
public int insertAsDeviceVersion(AsDeviceVersion asDeviceVersion)
{
public int insertAsDeviceVersion(AsDeviceVersion asDeviceVersion) {
asDeviceVersion.setCreateLocalDateTime(LocalDateTime.now());
return asDeviceVersionMapper.insertAsDeviceVersion(asDeviceVersion);
}
@ -96,30 +92,31 @@ public class AsDeviceVersionServiceImpl extends ServiceImpl<AsDeviceVersionMappe
* @return 结果
*/
@Override
public int updateAsDeviceVersion(AsDeviceVersion asDeviceVersion)
{
public int updateAsDeviceVersion(AsDeviceVersion asDeviceVersion) {
asDeviceVersion.setUpdateTime(DateUtils.getNowDate());
// 更新对应的设备固件版本为最新的版本
AsDeviceVersion latestAsDeviceVersion = asDeviceVersionMapper.selectLatestAsDeviceVersion(asDeviceVersion.getModelId());
ServiceUtil.assertion(latestAsDeviceVersion==null,"设备未绑定过固件版本");
AsModel model = new AsModel();
model.setModelId(asDeviceVersion.getModelId());
AsDeviceVersion latestAsDeviceVersion = asDeviceVersionMapper.selectLatestAsDeviceVersion(model);
ServiceUtil.assertion(latestAsDeviceVersion == null, "设备未绑定过固件版本");
AsModel asModel = asModelService.selectAsModelByModelId(asDeviceVersion.getModelId());
ServiceUtil.assertion(asModel==null,"该型号不存在");
if (asDeviceVersion.getCreateLocalDateTime().isAfter(latestAsDeviceVersion.getCreateLocalDateTime())){
ServiceUtil.assertion(asModel == null, "该型号不存在");
if (asDeviceVersion.getCreateLocalDateTime().isAfter(latestAsDeviceVersion.getCreateLocalDateTime())) {
asModel.setVersion(asDeviceVersion.getVersion());
asModel.setVersionId(asDeviceVersion.getVersionId());
}else {
} else {
asModel.setVersionId(latestAsDeviceVersion.getVersionId());
asModel.setVersion(latestAsDeviceVersion.getVersion());
}
Boolean execute = transactionTemplate.execute(e -> {
// 更新型号对应的版本号
int i = asModelMapper.updateAsModel(asModel);
int i = asModelMapper.updateAsModel(asModel);
ServiceUtil.assertion(i == 0, "修改失败！");
i = asDeviceVersionMapper.updateAsDeviceVersion(asDeviceVersion);
i = asDeviceVersionMapper.updateAsDeviceVersion(asDeviceVersion);
ServiceUtil.assertion(i == 0, "修改失败！");
return Boolean.TRUE;
});
if(Boolean.FALSE.equals(execute))throw new ServiceException("修改失败");
if (Boolean.FALSE.equals(execute)) throw new ServiceException("修改失败");
return 1;
}
@ -130,8 +127,7 @@ public class AsDeviceVersionServiceImpl extends ServiceImpl<AsDeviceVersionMappe
* @return 结果
*/
@Override
public int deleteAsDeviceVersionByVersionIds(List<Long> versionIds)
{
public int deleteAsDeviceVersionByVersionIds(List<Long> versionIds) {
List<AsModelVO> asModelVOS = asModelService.selectAsModelByVersionIds(versionIds);
Boolean execute = transactionTemplate.execute(e -> {
@ -144,7 +140,7 @@ public class AsDeviceVersionServiceImpl extends ServiceImpl<AsDeviceVersionMappe
ServiceUtil.assertion(i == 0, "删除失败！");
return Boolean.TRUE;
});
if(Boolean.FALSE.equals(execute))throw new ServiceException("删除失败");
if (Boolean.FALSE.equals(execute)) throw new ServiceException("删除失败");
return 1;
}
@ -155,9 +151,26 @@ public class AsDeviceVersionServiceImpl extends ServiceImpl<AsDeviceVersionMappe
* @return 结果
*/
@Override
public int deleteAsDeviceVersionByVersionId(Long versionId)
{
return asDeviceVersionMapper.deleteAsDeviceVersionByVersionId(versionId);
public int deleteAsDeviceVersionByVersionId(Long versionId) {
// 未绑定型号可直接删除
AsModelVO vo = asModelService.selectAsModelByVersionId(versionId);
if (vo == null){
return asDeviceVersionMapper.deleteAsDeviceVersionByVersionId(versionId);
}
AsDeviceVersion version = asDeviceVersionMapper.selectLatestAsDeviceVersion(vo);
Boolean execute = transactionTemplate.execute(e -> {
AsModel asModel = new AsModel();
asModel.setModelId(vo.getModelId());
asModel.setVersionId(version.getVersionId());
int i = asModelMapper.updateAsModel(asModel);
ServiceUtil.assertion(i == 0, "删除失败！");
i = asDeviceVersionMapper.deleteAsDeviceVersionByVersionId(versionId);
ServiceUtil.assertion(i == 0, "删除失败！");
return Boolean.TRUE;
});
if (Boolean.FALSE.equals(execute)) throw new ServiceException("删除失败");
return 1;
}
@Override
@ -170,7 +183,7 @@ public class AsDeviceVersionServiceImpl extends ServiceImpl<AsDeviceVersionMappe
asDeviceVersion.setCreateLocalDateTime(LocalDateTime.now());
Boolean execute = transactionTemplate.execute(e -> {
// 更新型号对应的版本号
int i = asDeviceVersionMapper.insertAsDeviceVersion(asDeviceVersion);
int i = asDeviceVersionMapper.insertAsDeviceVersion(asDeviceVersion);
ServiceUtil.assertion(i == 0, "修改失败！");
AsModel asModel = asModelService.selectAsModelByModelId(asDeviceVersion.getModelId());
asModel.setVersionId(asDeviceVersion.getVersionId());
@ -178,7 +191,7 @@ public class AsDeviceVersionServiceImpl extends ServiceImpl<AsDeviceVersionMappe
ServiceUtil.assertion(i == 0, "修改失败！");
return Boolean.TRUE;
});
if(Boolean.FALSE.equals(execute))throw new ServiceException("修改失败");
if (Boolean.FALSE.equals(execute)) throw new ServiceException("修改失败");
return 1;
}
}

10
AutoSprout-watering/src/main/java/com/ruoyi/device/service/impl/AsModelServiceImpl.java
View File

@ -265,4 +265,14 @@ public class AsModelServiceImpl extends ServiceImpl<AsModelMapper, AsModel> impl
asModel.setVersionIdList(versionIds);
return asModelMapper.selectAsModelByVersionIds(versionIds);
}
@Override
public int updateAsModelVersion(AsModel asModel) {
return asModelMapper.updateAsModel(asModel);
}
@Override
public AsModelVO selectAsModelByVersionId(Long versionId) {
return asModelMapper.selectAsModelByVersionId(versionId);
}
}

17
AutoSprout-watering/src/main/resources/mapper/device/AsDeviceVersionMapper.xml
View File

@ -32,7 +32,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
v.file,
v.upgrade_require,
v.upgrade_describe,
m.model_name
m.model_name,
m.version_id as model_version
from as_device_version v
left join as_model m on v.model_id = m.model_id
@ -47,7 +48,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="upgradeRequire != null and upgradeRequire != ''"> and v.upgrade_require like concat('%', #{upgradeRequire}, '%')</if>
<if test="upgradeDescribe != null and upgradeDescribe != ''"> and v.upgrade_describe like concat('%', #{upgradeDescribe}, '%')</if>
</where>
order by v.model_id asc,v.version asc
<if test="orderByColumn != null and orderByColumn.size() > 0">
ORDER BY
<foreach item="column" index="index" collection="orderByColumn" separator=",">
<choose>
<when test="column == 'version'">
CAST(SUBSTRING(version, 2) AS UNSIGNED) ${isAsc[index]}
</when>
<otherwise>
v.model_id ${isAsc[index]}
</otherwise>
</choose>
</foreach>
</if>
</select>
<select id="selectAsDeviceVersionByVersionId" parameterType="Long" resultMap="AsDeviceVersionResult">

5
AutoSprout-watering/src/main/resources/mapper/device/AsModelMapper.xml
View File

@ -97,6 +97,11 @@
</foreach>
</select>
<select id="selectAsModelByVersionId" resultType="com.ruoyi.device.domain.vo.AsModelVO">
<include refid="selectAsModelVo"/>
where am.version_id = #{versionId}
</select>
<insert id="insertAsModel" parameterType="AsModel" useGeneratedKeys="true" keyProperty="modelId">
insert into as_model
<trim prefix="(" suffix=")" suffixOverrides=",">