diff --git a/haiwei-admin/src/main/java/com/haiwei/web/controller/broad/ApiController.java b/haiwei-admin/src/main/java/com/haiwei/web/controller/broad/ApiController.java index e1fba63..d235c30 100644 --- a/haiwei-admin/src/main/java/com/haiwei/web/controller/broad/ApiController.java +++ b/haiwei-admin/src/main/java/com/haiwei/web/controller/broad/ApiController.java @@ -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型脱水机")); + } + + } diff --git a/haiwei-admin/src/main/resources/static/img/profile.jpg b/haiwei-admin/src/main/resources/static/img/profile.jpg new file mode 100644 index 0000000..b3a940b Binary files /dev/null and b/haiwei-admin/src/main/resources/static/img/profile.jpg differ diff --git a/haiwei-manage/src/main/java/com/haiwei/manage/mapper/BaseDeviceInfoMapper.java b/haiwei-manage/src/main/java/com/haiwei/manage/mapper/BaseDeviceInfoMapper.java index a3487f3..791e4a6 100644 --- a/haiwei-manage/src/main/java/com/haiwei/manage/mapper/BaseDeviceInfoMapper.java +++ b/haiwei-manage/src/main/java/com/haiwei/manage/mapper/BaseDeviceInfoMapper.java @@ -26,6 +26,7 @@ public interface BaseDeviceInfoMapper * @return 设备信息维护集合 */ public List selectBaseDeviceInfoList(BaseDeviceInfo baseDeviceInfo); + public List selectBaseDeviceInfoListByDeviceName(String deviceName); /** * 新增设备信息维护 diff --git a/haiwei-manage/src/main/java/com/haiwei/manage/service/IBaseDeviceInfoService.java b/haiwei-manage/src/main/java/com/haiwei/manage/service/IBaseDeviceInfoService.java index a753d88..04a40fc 100644 --- a/haiwei-manage/src/main/java/com/haiwei/manage/service/IBaseDeviceInfoService.java +++ b/haiwei-manage/src/main/java/com/haiwei/manage/service/IBaseDeviceInfoService.java @@ -26,6 +26,7 @@ public interface IBaseDeviceInfoService * @return 设备信息维护集合 */ public List selectBaseDeviceInfoList(BaseDeviceInfo baseDeviceInfo); + public List selectBaseDeviceInfoList(String deviceName); /** * 新增设备信息维护 diff --git a/haiwei-manage/src/main/java/com/haiwei/manage/service/impl/BaseDeviceInfoServiceImpl.java b/haiwei-manage/src/main/java/com/haiwei/manage/service/impl/BaseDeviceInfoServiceImpl.java index a494649..e443f35 100644 --- a/haiwei-manage/src/main/java/com/haiwei/manage/service/impl/BaseDeviceInfoServiceImpl.java +++ b/haiwei-manage/src/main/java/com/haiwei/manage/service/impl/BaseDeviceInfoServiceImpl.java @@ -97,4 +97,9 @@ public class BaseDeviceInfoServiceImpl implements IBaseDeviceInfoService { return baseDeviceInfoMapper.deleteBaseDeviceInfoById(objid); } + + @Override + public List selectBaseDeviceInfoList(String deviceName) { + return baseDeviceInfoMapper.selectBaseDeviceInfoListByDeviceName(deviceName); + } } diff --git a/haiwei-manage/src/main/resources/mapper/manage/BaseDeviceInfoMapper.xml b/haiwei-manage/src/main/resources/mapper/manage/BaseDeviceInfoMapper.xml index db546e1..aa59996 100644 --- a/haiwei-manage/src/main/resources/mapper/manage/BaseDeviceInfoMapper.xml +++ b/haiwei-manage/src/main/resources/mapper/manage/BaseDeviceInfoMapper.xml @@ -30,6 +30,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + -
- -
- - + + + + + + + + +
diff --git a/haiwei-manage/src/main/resources/templates/manage/base_device_info/base_device_info.html b/haiwei-manage/src/main/resources/templates/manage/base_device_info/base_device_info.html index c3fc118..8cad941 100644 --- a/haiwei-manage/src/main/resources/templates/manage/base_device_info/base_device_info.html +++ b/haiwei-manage/src/main/resources/templates/manage/base_device_info/base_device_info.html @@ -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: '设备规格' diff --git a/haiwei-manage/src/main/resources/templates/manage/base_device_info/edit.html b/haiwei-manage/src/main/resources/templates/manage/base_device_info/edit.html index 630d7d4..d0737f5 100644 --- a/haiwei-manage/src/main/resources/templates/manage/base_device_info/edit.html +++ b/haiwei-manage/src/main/resources/templates/manage/base_device_info/edit.html @@ -24,15 +24,15 @@
-
- -
- -
- -
-
-
+ + + + + + + + +