wangh
/
dlts_device_cockpit
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改 文件列表按照客户名称查询

Browse Source
master
wangh 2 years ago
parent 472f82ad62
commit bcedcb3a6c
9 changed files with 51 additions and 27 deletions
Show Stats Download Patch File Download Diff File

14
haiwei-admin/src/main/java/com/haiwei/web/controller/broad/ApiController.java
Unescape Escape View File

@ -4,6 +4,7 @@ import com.haiwei.common.core.domain.AjaxResult;
import static com.haiwei.common.core.domain.AjaxResult.*;
import com.haiwei.manage.domain.BaseDeviceInfo;
import com.haiwei.manage.service.IApiService;
import com.haiwei.manage.service.IBaseCustomerService;
import com.haiwei.manage.service.IBaseDeviceInfoService;
@ -33,11 +34,12 @@ public class ApiController {
@Autowired
private IBaseDeviceTypeService baseDeviceTypeService;
@Autowired
private IBaseDeviceInfoService baseDeviceInfoService;
@Autowired
private IBaseCustomerService baseCustomerService;//客户
@ApiOperation(tags = {"首页","文档归档"}, value = "客户-列表")
@ApiOperation(tags = {"首页", "文档归档"}, value = "客户-列表")
@GetMapping("/home/queryCustomer")
public AjaxResult queryCustomer() {
return success(baseCustomerService.selectBaseCustomerList(null));
@ -67,4 +69,12 @@ public class ApiController {
public AjaxResult queryPramList(Date beginTime, Date endTime) {
return success(iApiService.queryPramList(beginTime, endTime));
}
@ApiOperation(tags = {"60脱水机"}, value = "设备介绍")
@GetMapping("/home/deviceInfo")
public AjaxResult deviceInfo() {
return success(baseDeviceInfoService.selectBaseDeviceInfoList("60型脱水机"));
}
}

BIN
haiwei-admin/src/main/resources/static/img/profile.jpg
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 79 KiB

1
haiwei-manage/src/main/java/com/haiwei/manage/mapper/BaseDeviceInfoMapper.java
Unescape Escape View File

@ -26,6 +26,7 @@ public interface BaseDeviceInfoMapper
* @return 设备信息维护集合
*/
public List<BaseDeviceInfo> selectBaseDeviceInfoList(BaseDeviceInfo baseDeviceInfo);
public List<BaseDeviceInfo> selectBaseDeviceInfoListByDeviceName(String deviceName);
/**
* 新增设备信息维护

1
haiwei-manage/src/main/java/com/haiwei/manage/service/IBaseDeviceInfoService.java
Unescape Escape View File

@ -26,6 +26,7 @@ public interface IBaseDeviceInfoService
* @return 设备信息维护集合
*/
public List<BaseDeviceInfo> selectBaseDeviceInfoList(BaseDeviceInfo baseDeviceInfo);
public List<BaseDeviceInfo> selectBaseDeviceInfoList(String deviceName);
/**
* 新增设备信息维护

5
haiwei-manage/src/main/java/com/haiwei/manage/service/impl/BaseDeviceInfoServiceImpl.java
Unescape Escape View File

@ -97,4 +97,9 @@ public class BaseDeviceInfoServiceImpl implements IBaseDeviceInfoService
{
return baseDeviceInfoMapper.deleteBaseDeviceInfoById(objid);
}
@Override
public List<BaseDeviceInfo> selectBaseDeviceInfoList(String deviceName) {
return baseDeviceInfoMapper.selectBaseDeviceInfoListByDeviceName(deviceName);
}
}

7
haiwei-manage/src/main/resources/mapper/manage/BaseDeviceInfoMapper.xml
Unescape Escape View File

@ -30,6 +30,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
<select id="selectBaseDeviceInfoListByDeviceName" parameterType="BaseDeviceInfo" resultMap="BaseDeviceInfoResult">
select top 1 device_name, device_spe, device_function, device_param
from base_device_info where device_name = #{deviceName}
</select>
<select id="selectBaseDeviceInfoById" parameterType="Long" resultMap="BaseDeviceInfoResult">
<include refid="selectBaseDeviceInfoVo"/>
where objid = #{objid}

18
haiwei-manage/src/main/resources/templates/manage/base_device_info/add.html
Unescape Escape View File

@ -25,15 +25,15 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">设备模型图片：</label>
<div class="col-sm-8">
<input type="hidden" name="deviceMode">
<div class="file-loading">
<input class="form-control file-upload" id="deviceMode" name="file" type="file">
</div>
</div>
</div>
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">设备模型图片：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input type="hidden" name="deviceMode">-->
<!-- <div class="file-loading">-->
<!-- <input class="form-control file-upload" id="deviceMode" name="file" type="file">-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group">
<label class="col-sm-3 control-label">设备规格：</label>
<div class="col-sm-8">

14
haiwei-manage/src/main/resources/templates/manage/base_device_info/base_device_info.html
Unescape Escape View File

@ -79,13 +79,13 @@
field: 'deviceTypeName',
title: '设备类型'
},
{
field: 'deviceMode',
title: '设备模型图片',
formatter: function (value, row, index) {
return $.table.imageView(value);
}
},
// {
// field: 'deviceMode',
// title: '设备模型图片',
// formatter: function (value, row, index) {
// return $.table.imageView(value);
// }
// },
{
field: 'deviceSpe',
title: '设备规格'

18
haiwei-manage/src/main/resources/templates/manage/base_device_info/edit.html
Unescape Escape View File

@ -24,15 +24,15 @@
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">设备模型图片：</label>
<div class="col-sm-8">
<input type="hidden" name="deviceMode" th:field="*{deviceMode}">
<div class="file-loading">
<input class="form-control file-upload" id="deviceMode" name="file" type="file">
</div>
</div>
</div>
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">设备模型图片：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input type="hidden" name="deviceMode" th:field="*{deviceMode}">-->
<!-- <div class="file-loading">-->
<!-- <input class="form-control file-upload" id="deviceMode" name="file" type="file">-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group">
<label class="col-sm-3 control-label">设备规格：</label>
<div class="col-sm-8">

Write Preview
Loading…
Cancel
Save