From 58ee50c3895ef932a91e25f0da93df7c28561003 Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Mon, 14 Apr 2025 09:35:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/base/BonusBaseApplication.java | 2 +- .../controller/CollectDeviceController.java | 11 ++++ .../basic/controller/ConstInfoController.java | 26 +++++++- .../basic/controller/DeviceController.java | 14 +++-- .../controller/DeviceTypeController.java | 22 +++++-- .../bonus/base/basic/domain/ConstInfoVo.java | 60 +++++++++++++++++++ .../bonus/base/basic/domain/DeviceTypeVo.java | 20 ++++++- .../base/basic/mapper/ConstInfoMapper.java | 17 +++--- .../base/basic/mapper/DeviceTypeMapper.java | 13 ++++ .../base/basic/service/ConstInfoService.java | 10 ++++ .../base/basic/service/DeviceTypeService.java | 13 ++++ .../service/impl/ConstInfoServiceImpl.java | 20 +++++++ .../service/impl/DeviceTypeServiceImpl.java | 33 ++++++++++ .../mapper/base/basic/ConstINfoMapper.xml | 7 +++ .../mapper/base/basic/DeviceTypeMapper.xml | 23 +++++-- 15 files changed, 261 insertions(+), 30 deletions(-) create mode 100644 bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/CollectDeviceController.java create mode 100644 bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/ConstInfoVo.java diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/BonusBaseApplication.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/BonusBaseApplication.java index a7fa90d..c2bba0d 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/BonusBaseApplication.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/BonusBaseApplication.java @@ -21,7 +21,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; public class BonusBaseApplication { public static void main(String[] args) { SpringApplication.run(BonusBaseApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ 2024博诺思智慧工地平台启动成功 ლ(´ڡ`ლ)ﾞ \n" + + System.err.println("(♥◠‿◠)ﾉﾞ 2024博诺思智慧工地平台启动成功 ლ(´ڡ`ლ)ﾞ \n" + " .-------. ____ __ \n" + " | _ _ \\ \\ \\ / / \n" + " | ( ' ) | \\ _. / ' \n" + diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/CollectDeviceController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/CollectDeviceController.java new file mode 100644 index 0000000..9caebe6 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/CollectDeviceController.java @@ -0,0 +1,11 @@ +package com.bonus.base.basic.controller; + +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Api(tags = "感知设备管理") +@RestController +@RequestMapping("/collect/dev/") +public class CollectDeviceController { +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/ConstInfoController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/ConstInfoController.java index 72a7c05..056fb98 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/ConstInfoController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/ConstInfoController.java @@ -1,11 +1,22 @@ package com.bonus.base.basic.controller; +import com.bonus.base.basic.domain.ConstInfoVo; +import com.bonus.base.basic.domain.DeviceVo; +import com.bonus.base.basic.service.ConstInfoService; import com.bonus.common.core.web.controller.BaseController; +import com.bonus.common.core.web.page.TableDataInfo; +import com.bonus.common.log.annotation.SysLog; +import com.bonus.common.log.enums.OperaType; +import com.bonus.common.security.annotation.RequiresPermissions; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.Data; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * @author 黑子 */ @@ -14,9 +25,20 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/constInfo") public class ConstInfoController extends BaseController { + private ConstInfoService service; - - + /** + * 查询作业现场列表 + */ + @ApiOperation(value = "查询施工现场信息") + @RequiresPermissions("tb:const:list") + @GetMapping("/getPageList") + @SysLog(title = "施工现场管理", businessType = OperaType.QUERY, logType = 1,module = "设备管理->施工现场管理信息") + public TableDataInfo getPageList(ConstInfoVo deviceVo) { + startPage(); + List list = service.getPageList(deviceVo); + return getDataTable(list); + } } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/DeviceController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/DeviceController.java index db08a13..cf5749e 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/DeviceController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/DeviceController.java @@ -21,9 +21,9 @@ import java.util.List; /** * @author 黑子 */ -@Api(tags = "工程项目管理接口") +@Api(tags = "感知设备管理") @RestController -@RequestMapping("/bm_project") +@RequestMapping("/D") public class DeviceController extends BaseController { @Autowired @@ -34,7 +34,7 @@ public class DeviceController extends BaseController { */ @ApiOperation(value = "查询感知设备信息列表") @RequiresPermissions("tb:device:list") - @GetMapping("/list") + @GetMapping("/getPageList") @SysLog(title = "设备管理", businessType = OperaType.INSERT, logType = 1,module = "设备管理->查询感知设备信息列表") public TableDataInfo getPageList(DeviceVo deviceVo) { startPage(); @@ -49,7 +49,7 @@ public class DeviceController extends BaseController { */ @ApiOperation(value = "查询感知设备属性信息") @RequiresPermissions("tb:device:attr") - @GetMapping("/list") + @GetMapping("/getAttrPageList") @SysLog(title = "设备管理", businessType = OperaType.INSERT, logType = 1,module = "设备管理->查询设备属性") public TableDataInfo getAttrPageList(DeviceAttrVo vo) { startPage(); @@ -60,16 +60,18 @@ public class DeviceController extends BaseController { @PreventRepeatSubmit @RequiresPermissions("tb:device:add") @SysLog(title = "设备管理", businessType = OperaType.INSERT, logType = 1,module = "设备管理->新增感知设备") - @PostMapping + @PostMapping("addDevice") public AjaxResult addDevice(@RequestBody DeviceVo deviceVo) { return service.addDevice(deviceVo); } + + @ApiOperation(value = "新增设备管理") @PreventRepeatSubmit @RequiresPermissions("tb:attr:add") @SysLog(title = "设备管理", businessType = OperaType.INSERT, logType = 1,module = "设备管理->新增设备属性") - @PostMapping + @PostMapping("addDeviceAttr") public AjaxResult addDeviceAttr(@RequestBody DeviceAttrVo vo) { return service.addDeviceAttr(vo); } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/DeviceTypeController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/DeviceTypeController.java index e97c7dc..b8d3ec0 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/DeviceTypeController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/DeviceTypeController.java @@ -46,7 +46,7 @@ public class DeviceTypeController extends BaseController { @PreventRepeatSubmit @RequiresPermissions("tb:type:add") @SysLog(title = "设备类型管理", businessType = OperaType.INSERT, logType = 1,module = "设备类型管理->新增设备类型") - @PostMapping + @PostMapping("insertData") public AjaxResult insertData(@RequestBody DeviceTypeVo vo) { return service.insertData(vo); } @@ -57,7 +57,7 @@ public class DeviceTypeController extends BaseController { @PreventRepeatSubmit @RequiresPermissions("tb:type:update") @SysLog(title = "设备类型管理", businessType = OperaType.UPDATE, logType = 1,module = "设备类型管理->修改设备类型") - @PostMapping + @PostMapping("updateData") public AjaxResult updateData(@RequestBody DeviceTypeVo vo) { return service.updateData(vo); } @@ -66,14 +66,26 @@ public class DeviceTypeController extends BaseController { @ApiOperation(value = "删除设备类型") @PreventRepeatSubmit @RequiresPermissions("tb:type:del") - @SysLog(title = "设备类型管理", businessType = OperaType.UPDATE, logType = 1,module = "设备类型管理->删除设备类型") - @PostMapping + @SysLog(title = "设备类型管理", businessType = OperaType.UPDATE,module = "设备类型管理->删除设备类型") + @PostMapping("deleteData") public AjaxResult deleteData(@RequestBody DeviceTypeVo vo) { return service.deleteData(vo); } + @ApiOperation(value = "删除设备类型") + @PreventRepeatSubmit + @SysLog(title = "设备类型管理", businessType = OperaType.UPDATE,module = "设备类型管理->查询设备类型") + @PostMapping("queryDetail") + public AjaxResult queryDetail(@RequestBody DeviceTypeVo vo) { + return service.queryDetail(vo); + } - + @ApiOperation(value = "查询下拉选") + @PreventRepeatSubmit + @PostMapping("querySelected") + public AjaxResult querySelected() { + return service.querySelected(); + } } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/ConstInfoVo.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/ConstInfoVo.java new file mode 100644 index 0000000..5b686b4 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/ConstInfoVo.java @@ -0,0 +1,60 @@ +package com.bonus.base.basic.domain; + +import lombok.Data; + +/** + * 施工 信息维护 实体类 + * @author 黑子 + */ +@Data +public class ConstInfoVo { + + private String id; + /** + * 施工信息名称 + */ + private String name; + /** + * 类型编码 + */ + private String typeCode; + /** + * 类型id + */ + private String typeId; + /** + * 类型名称 + */ + private String typeName; + /** + * 创建时间 + */ + private String createTime; + /** + * 更新时间 + */ + private String updateTime; + /** + * 是否启用 + */ + private String isActive; + /** + * 备注 + */ + private String remark; + /** + * 背景图地址 + */ + private String backImage; + /** + * 配置信息 + */ + private String configData; + + + + + + + +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/DeviceTypeVo.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/DeviceTypeVo.java index cee2070..9964362 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/DeviceTypeVo.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/DeviceTypeVo.java @@ -11,10 +11,24 @@ public class DeviceTypeVo { private String id; private String typeCode; - + /** + * 类型名称 + */ private String typeName; - + /** + * 备注 + */ private String remark; - + /** + * 创建时间 + */ private String createTime; + /** + * 修改时间 + */ + private String updateTime; + + private String keyWord; + + } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/ConstInfoMapper.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/ConstInfoMapper.java index a82e859..03aa982 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/ConstInfoMapper.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/ConstInfoMapper.java @@ -1,19 +1,20 @@ package com.bonus.base.basic.mapper; +import com.bonus.base.basic.domain.ConstInfoVo; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * @author 黑子 */ @Mapper public interface ConstInfoMapper { - - - - - - - - + /** + * 施工分页查询集合 + * @param deviceVo + * @return + */ + List getPageList(ConstInfoVo deviceVo); } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/DeviceTypeMapper.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/DeviceTypeMapper.java index 31caecd..61ef436 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/DeviceTypeMapper.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/DeviceTypeMapper.java @@ -48,4 +48,17 @@ public interface DeviceTypeMapper { * @return */ int deleteData(DeviceTypeVo vo); + + /** + * 查询设备类型 + * @param vo + * @return + */ + DeviceTypeVo queryDetail(DeviceTypeVo vo); + + /** + * 设备类型下拉选查询 + * @return + */ + List querySelected(); } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/ConstInfoService.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/ConstInfoService.java index 851ab82..6cfbf63 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/ConstInfoService.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/ConstInfoService.java @@ -1,7 +1,17 @@ package com.bonus.base.basic.service; +import com.bonus.base.basic.domain.ConstInfoVo; + +import java.util.List; + /** * @author 黑子 */ public interface ConstInfoService { + /** + * 查询 施工现场信息激活 + * @param deviceVo + * @return + */ + List getPageList(ConstInfoVo deviceVo); } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/DeviceTypeService.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/DeviceTypeService.java index 72db8fe..46d7a0d 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/DeviceTypeService.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/DeviceTypeService.java @@ -38,4 +38,17 @@ public interface DeviceTypeService { * @return */ AjaxResult deleteData(DeviceTypeVo vo); + + /** + * 查询设备类型 + * @param vo + * @return + */ + AjaxResult queryDetail(DeviceTypeVo vo); + + /** + * 查询设备类型下拉选 + * @return + */ + AjaxResult querySelected(); } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/ConstInfoServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/ConstInfoServiceImpl.java index fb6712c..18ca2d6 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/ConstInfoServiceImpl.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/ConstInfoServiceImpl.java @@ -1,10 +1,16 @@ package com.bonus.base.basic.service.impl; +import com.bonus.base.basic.domain.ConstInfoVo; +import com.bonus.base.basic.mapper.ConstInfoMapper; import com.bonus.base.basic.service.ConstInfoService; import lombok.Data; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.List; + /** * @author 黑子 */ @@ -12,7 +18,21 @@ import org.springframework.stereotype.Service; @Slf4j public class ConstInfoServiceImpl implements ConstInfoService { + @Autowired + private ConstInfoMapper mapper; + @Override + public List getPageList(ConstInfoVo deviceVo) { + try{ + return mapper.getPageList(deviceVo); + }catch (Exception e){ + log.error(e.toString(),e); + } + return new ArrayList<>(); + } + public static void main(String[] args) { + log.info(""); + } } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/DeviceTypeServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/DeviceTypeServiceImpl.java index a925305..4b2403f 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/DeviceTypeServiceImpl.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/DeviceTypeServiceImpl.java @@ -104,5 +104,38 @@ public class DeviceTypeServiceImpl implements DeviceTypeService { } + /** + * 查询设备类型 + * @param vo + * @return + */ + @Override + public AjaxResult queryDetail(DeviceTypeVo vo) { + try{ + DeviceTypeVo data=mapper.queryDetail(vo); + return AjaxResult.success(data); + + }catch (Exception e){ + log.error(e.toString(),e); + } + return AjaxResult.error("查询失败"); + } + + /** + * + * @return + */ + @Override + public AjaxResult querySelected() { + try{ + List list=mapper.querySelected(); + return AjaxResult.success(list); + + }catch (Exception e){ + log.error(e.toString(),e); + } + return AjaxResult.success("查询异常",new ArrayList<>()); + } + } diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/basic/ConstINfoMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/basic/ConstINfoMapper.xml index 008c8ca..9347078 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/base/basic/ConstINfoMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/basic/ConstINfoMapper.xml @@ -4,4 +4,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + \ No newline at end of file diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/basic/DeviceTypeMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/basic/DeviceTypeMapper.xml index 1d5d786..baf25fa 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/base/basic/DeviceTypeMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/basic/DeviceTypeMapper.xml @@ -20,14 +20,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id=#{id} + + \ No newline at end of file