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-04-11 14:48:32 +08:00
parent 6d08137305
commit d46df2ebd9
13 changed files with 98 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AutoSprout-admin/src/main/resources/application-druid.yml
View File

@ -10,9 +10,9 @@ spring:
# username: root
# password: 123456
master:
url: jdbc:mysql://localhost:3306/autosprout?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
url: jdbc:mysql://47.120.68.19:3306/autosprout-dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: 123456
password: d0dbe100b71c1d09
# 从库数据源
slave:
# 从数据源开关/默认关闭

20
AutoSprout-ui/src/views/device/model/index.vue
View File

@ -258,6 +258,18 @@ export default {
},
methods: {
/** 查询版本号 */
getVersionByModel(modelId) {
listVersion({ modelId: modelId }) // 假设后端支持modelId参数过滤
.then(response => {
this.versionOptions = response.rows;
// 保持当前选择的版本有效性
if (this.form.versionId &&
!this.versionOptions.some(v => v.versionId === this.form.versionId)) {
this.form.versionId = null;
}
});
},
/** 查询型号列表列表 */
getList() {
this.loading = true;
@ -320,17 +332,19 @@ export default {
this.reset();
this.open = true;
this.title = "添加型号";
this.loading = true;
this.versionOptions = []; // 关键代码
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const modelId = row.modelId || this.ids
const modelId = row.modelId || this.ids;
getModel(modelId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改型号列表";
this.title = "修改型号";
this.getVersionByModel(modelId); // 关键代码
});
},
/** 提交按钮 */

10
AutoSprout-watering/src/main/java/com/ruoyi/device/app/AppController.java
View File

@ -470,6 +470,16 @@ public class AppController extends BaseController
return AjaxResult.success(asDevices);
}
/**
* 获取型号详情信息
*/
@GetMapping("/model/{id}")
public AjaxResult getModelDetail(@PathVariable Long id)
{
AsModel asModel = asModelService.selectAsModelDetail(id);
return AjaxResult.success(asModel);
}
/**
* 所有型号列表
*/

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

@ -2,6 +2,9 @@ package com.ruoyi.device.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.device.domain.AsDeviceVersion;
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;
@ -34,6 +37,8 @@ public class AsModelController extends BaseController
@Autowired
private IAsModelService asModelService;
@Autowired
private IAsDeviceVersionService asDeviceVersionService;
/**
* 查询型号列表列表
*/
@ -66,7 +71,10 @@ public class AsModelController extends BaseController
@GetMapping(value = "/{modelId}")
public AjaxResult getInfo(@PathVariable("modelId") Long modelId)
{
return success(asModelService.selectAsModelByModelId(modelId));
AsModel asModel = asModelService.selectAsModelByModelId(modelId);
List<String> versionList = asDeviceVersionService.selectAsDeviceVersionByModelId(modelId);
asModel.setVersionList(versionList);
return success(asModel);
}
/**

8
AutoSprout-watering/src/main/java/com/ruoyi/device/domain/AsModel.java
View File

@ -5,6 +5,8 @@ import lombok.Data;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import java.util.List;
/**
* 型号列表对象 as_model
*
@ -59,4 +61,10 @@ public class AsModel extends BaseEntity
@Excel(name = "在线率")
private String onlineRate;
@Excel(name = "版本数据")
private AsDeviceVersion asDeviceVersion;
@Excel(name = "版本号集合")
private List<String> versionList;
}

17
AutoSprout-watering/src/main/java/com/ruoyi/device/domain/vo/AsModelVO.java Normal file
View File

@ -0,0 +1,17 @@
package com.ruoyi.device.domain.vo;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.device.domain.AsDeviceVersion;
import com.ruoyi.device.domain.AsModel;
import lombok.Data;
import java.util.List;
@Data
public class AsModelVO extends AsModel {
/** 版本信息集合 */
@Excel(name = "版本信息集合")
private List<AsDeviceVersion> asDeviceVersions;
}

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

@ -66,4 +66,6 @@ public interface AsDeviceVersionMapper extends BaseMapper<AsDeviceVersion>
* @return 结果
*/
public int deleteAsDeviceVersionByVersionIds(Long[] versionIds);
public List<String> selectAsDeviceVersionByModelId(Long modelId);
}

2
AutoSprout-watering/src/main/java/com/ruoyi/device/service/IAsDeviceVersionService.java
View File

@ -67,4 +67,6 @@ public interface IAsDeviceVersionService
* @return 结果
*/
public int deleteAsDeviceVersionByVersionId(Long versionId);
public List<String> selectAsDeviceVersionByModelId(Long modelId);
}

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

@ -75,4 +75,6 @@ public interface IAsModelService
* @return 结果
*/
public boolean checkModelUnique(AsModel asModel);
public AsModel selectAsModelDetail(Long modelId);
}

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

@ -1,5 +1,6 @@
package com.ruoyi.device.service.impl;
import java.util.Collections;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@ -107,4 +108,9 @@ public class AsDeviceVersionServiceImpl extends ServiceImpl<AsDeviceVersionMappe
{
return asDeviceVersionMapper.deleteAsDeviceVersionByVersionId(versionId);
}
@Override
public List<String> selectAsDeviceVersionByModelId(Long modelId) {
return asDeviceVersionMapper.selectAsDeviceVersionByModelId(modelId);
}
}

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

@ -43,6 +43,7 @@ public class AsModelServiceImpl extends ServiceImpl<AsModelMapper, AsModel> impl
@Resource
private AsDeviceVersionMapper versionMapper;
/**
* 查询型号列表
*
@ -184,4 +185,17 @@ public class AsModelServiceImpl extends ServiceImpl<AsModelMapper, AsModel> impl
}
return UserConstants.UNIQUE;
}
/**
* 获取型号详细信息以及对应的版本信息
* @param modelId
* @return
*/
@Override
public AsModel selectAsModelDetail(Long modelId) {
AsModel asModel = asModelMapper.selectAsModelByModelId(modelId);
AsDeviceVersion asDeviceVersion = versionMapper.selectAsDeviceVersionByVersionId(asModel.getVersionId());
asModel.setAsDeviceVersion(asDeviceVersion);
return asModel;
}
}

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

@ -34,6 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
v.upgrade_describe
from as_device_version v
left join as_model m on v.model_id = m.model_id
</sql>
<select id="selectAsDeviceVersionList" parameterType="AsDeviceVersion" resultMap="AsDeviceVersionResult">
@ -57,6 +58,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where v.version = #{version}
</select>
<select id="selectAsDeviceVersionByModelId" resultType="java.lang.String">
select adv.version
from as_model am
left join as_device_version adv on am.model_id = adv.model_id
where am.model_id = #{modelId}
</select>
<insert id="insertAsDeviceVersion" parameterType="AsDeviceVersion" useGeneratedKeys="true" keyProperty="versionId">
insert into as_device_version
<trim prefix="(" suffix=")" suffixOverrides=",">

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

@ -42,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectAsModelVo"/>
where model_id = #{modelId}
</select>
<select id="checkModelUnique" parameterType="String" resultMap="AsModelResult">
select model_id, model from as_model where model = #{model} limit 1
</select>