From 0ba32fdb552a8748970c237bcc320303695a49a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Thu, 3 Jul 2025 16:13:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DeviceInfoController.java | 163 ------------------ .../deviceinfo/mapper/DeviceInfo2Mapper.java | 21 --- .../mapper/xml/DeviceInfo2Mapper.xml | 15 -- .../service/IDeviceInfo2Service.java | 20 --- .../service/impl/DeviceInfo2ServiceImpl.java | 39 ----- .../jeecg/modules/zh/view/hy/entity/Hy.java | 1 + .../zh/view/hy/mapper/xml/HyMapper.xml | 32 ++-- .../shebei/controller/ShebeiController.java | 57 ++++++ .../shebei/entity/Shebei.java} | 14 +- .../zh/view/shebei/mapper/ShebeiMapper.java | 19 ++ .../view/shebei/mapper/xml/ShebeiMapper.xml | 37 ++++ .../view/shebei/service/IShebeiService.java | 18 ++ .../service/impl/ShebeiServiceImpl.java | 24 +++ 13 files changed, 189 insertions(+), 271 deletions(-) delete mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/controller/DeviceInfoController.java delete mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/mapper/DeviceInfo2Mapper.java delete mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/mapper/xml/DeviceInfo2Mapper.xml delete mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/service/IDeviceInfo2Service.java delete mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/service/impl/DeviceInfo2ServiceImpl.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/controller/ShebeiController.java rename jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/{deviceinfo/entity/DeviceInfo.java => view/shebei/entity/Shebei.java} (87%) create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/mapper/ShebeiMapper.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/mapper/xml/ShebeiMapper.xml create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/service/IShebeiService.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/service/impl/ShebeiServiceImpl.java diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/controller/DeviceInfoController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/controller/DeviceInfoController.java deleted file mode 100644 index 2718d77..0000000 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/controller/DeviceInfoController.java +++ /dev/null @@ -1,163 +0,0 @@ -package org.jeecg.modules.zh.deviceinfo.controller; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.jeecg.common.api.vo.Result; -import org.jeecg.common.aspect.annotation.AutoLog; -import org.jeecg.common.system.base.controller.JeecgController; -import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.modules.zh.deviceinfo.entity.DeviceInfo; -import org.jeecg.modules.zh.deviceinfo.service.IDeviceInfo2Service; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.Arrays; - - /** - * @Description: 设备信息 - * @Author: jeecg-boot - * @Date: 2025-07-02 - * @Version: V1.0 - */ -@Api(tags="设备信息") -@RestController -@RequestMapping("/deviceinfo/deviceInfo") -@Slf4j -public class DeviceInfoController extends JeecgController { - @Autowired - private IDeviceInfo2Service deviceInfoService; - - /** - * 分页列表查询 - * - * @param deviceInfo - * @param pageNo - * @param pageSize - * @param req - * @return - */ - //@AutoLog(value = "设备信息-分页列表查询") - @ApiOperation(value="设备信息-分页列表查询", notes="设备信息-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(DeviceInfo deviceInfo, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(deviceInfo, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); -// IPage pageList = deviceInfoService.page(page, queryWrapper); - IPage pageList = deviceInfoService.queryDeviceInfoWithRelatedTables(page, deviceInfo, req.getParameterMap()); - return Result.OK(pageList); - } - - /** - * 添加 - * - * @param deviceInfo - * @return - */ - @AutoLog(value = "设备信息-添加") - @ApiOperation(value="设备信息-添加", notes="设备信息-添加") - @RequiresPermissions("deviceinfo:bl_device_info:add") - @PostMapping(value = "/add") - public Result add(@RequestBody DeviceInfo deviceInfo) { - deviceInfoService.save(deviceInfo); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param deviceInfo - * @return - */ - @AutoLog(value = "设备信息-编辑") - @ApiOperation(value="设备信息-编辑", notes="设备信息-编辑") - @RequiresPermissions("deviceinfo:bl_device_info:edit") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody DeviceInfo deviceInfo) { - deviceInfoService.updateById(deviceInfo); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "设备信息-通过id删除") - @ApiOperation(value="设备信息-通过id删除", notes="设备信息-通过id删除") - @RequiresPermissions("deviceinfo:bl_device_info:delete") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - deviceInfoService.removeById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "设备信息-批量删除") - @ApiOperation(value="设备信息-批量删除", notes="设备信息-批量删除") - @RequiresPermissions("deviceinfo:bl_device_info:deleteBatch") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.deviceInfoService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - //@AutoLog(value = "设备信息-通过id查询") - @ApiOperation(value="设备信息-通过id查询", notes="设备信息-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - DeviceInfo deviceInfo = deviceInfoService.getById(id); - if(deviceInfo==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(deviceInfo); - } - - /** - * 导出excel - * - * @param request - * @param deviceInfo - */ - @RequiresPermissions("deviceinfo:bl_device_info:exportXls") - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, DeviceInfo deviceInfo) { - return super.exportXls(request, deviceInfo, DeviceInfo.class, "设备信息"); - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @RequiresPermissions("deviceinfo:bl_device_info:importExcel") - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, DeviceInfo.class); - } - -} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/mapper/DeviceInfo2Mapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/mapper/DeviceInfo2Mapper.java deleted file mode 100644 index 7013bdb..0000000 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/mapper/DeviceInfo2Mapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.jeecg.modules.zh.deviceinfo.mapper; - - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.zh.deviceinfo.entity.DeviceInfo; - -/** - * @Description: 设备信息 - * @Author: jeecg-boot - * @Date: 2025-07-02 - * @Version: V1.0 - */ -public interface DeviceInfo2Mapper extends BaseMapper { - - IPage selectDeviceInfoWithRelatedTables(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); -} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/mapper/xml/DeviceInfo2Mapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/mapper/xml/DeviceInfo2Mapper.xml deleted file mode 100644 index b217454..0000000 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/mapper/xml/DeviceInfo2Mapper.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/service/IDeviceInfo2Service.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/service/IDeviceInfo2Service.java deleted file mode 100644 index 45a3b7b..0000000 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/service/IDeviceInfo2Service.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.jeecg.modules.zh.deviceinfo.service; - - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.zh.deviceinfo.entity.DeviceInfo; - -import java.util.Map; - -/** - * @Description: 设备信息 - * @Author: jeecg-boot - * @Date: 2025-07-02 - * @Version: V1.0 - */ -public interface IDeviceInfo2Service extends IService { - - IPage queryDeviceInfoWithRelatedTables(Page page, DeviceInfo deviceInfo, Map parameterMap); -} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/service/impl/DeviceInfo2ServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/service/impl/DeviceInfo2ServiceImpl.java deleted file mode 100644 index 8d0739c..0000000 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/service/impl/DeviceInfo2ServiceImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.jeecg.modules.zh.deviceinfo.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.apache.commons.lang.StringUtils; -import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.modules.zh.deviceinfo.entity.DeviceInfo; -import org.jeecg.modules.zh.deviceinfo.mapper.DeviceInfo2Mapper; -import org.jeecg.modules.zh.deviceinfo.service.IDeviceInfo2Service; -import org.springframework.stereotype.Service; - -import java.util.Map; - -/** - * @Description: 设备信息 - * @Author: jeecg-boot - * @Date: 2025-07-02 - * @Version: V1.0 - */ -@Service -public class DeviceInfo2ServiceImpl extends ServiceImpl implements IDeviceInfo2Service { - - @Override - public IPage queryDeviceInfoWithRelatedTables(Page page, DeviceInfo deviceInfo, Map parameterMap) { - // 构建基础查询条件 - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(deviceInfo, parameterMap); - String[] housingestateNames = parameterMap.get("housingestateName"); - if(housingestateNames!=null){ - String housingestateName = housingestateNames[0]; - if(StringUtils.isNotBlank(housingestateName)){ - queryWrapper.like("hi.name",housingestateName); - } - } - // 执行拼表查询 - return baseMapper.selectDeviceInfoWithRelatedTables(page, queryWrapper); - } -} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/entity/Hy.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/entity/Hy.java index a076251..ff2db92 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/entity/Hy.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/entity/Hy.java @@ -17,6 +17,7 @@ public class Hy implements Serializable { private String type; private String housingestateId; private String housingestateName; + private String content; private String beginTime; private String endTime; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/mapper/xml/HyMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/mapper/xml/HyMapper.xml index ae948f8..1d81b58 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/mapper/xml/HyMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/mapper/xml/HyMapper.xml @@ -90,17 +90,27 @@ + SELECT + a.device_id as deviceId, + a.imei, + a.iccid, + a.is_online as isOnline, + a.content, + a.lnglat, + a.box_num as boxNum, + a.in_warehouse as inWarehouse, + b.name as housingestateName, + (select count(*) from bl_user_info b where a.imei = b.imei) as hyCount, + (select count(*) from bl_order_info b where a.imei = b.imei) as tdcsCount + FROM bl_device_info a + LEFT JOIN bl_housingestate_info b ON a.housingestate_id = b.housingestate_id + + + AND a.housingestate_id = #{params.housingestateId} + + + AND a.imei LIKE concat('%',#{params.imei},'%') + + + AND a.is_online = #{params.isOnline} + + + AND a.in_warehouse = #{params.inWarehouse} + + + order by a.device_id + + + diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/service/IShebeiService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/service/IShebeiService.java new file mode 100644 index 0000000..6daf374 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/service/IShebeiService.java @@ -0,0 +1,18 @@ +package org.jeecg.modules.zh.view.shebei.service; + + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.zh.view.shebei.entity.Shebei; + +/** + * @Description: 设备信息 + * @Author: jeecg-boot + * @Date: 2025-07-02 + * @Version: V1.0 + */ +public interface IShebeiService extends IService { + + IPage queryDeviceInfo(Page page, Shebei shebei); +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/service/impl/ShebeiServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/service/impl/ShebeiServiceImpl.java new file mode 100644 index 0000000..c3337c1 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/service/impl/ShebeiServiceImpl.java @@ -0,0 +1,24 @@ +package org.jeecg.modules.zh.view.shebei.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.modules.zh.view.shebei.entity.Shebei; +import org.jeecg.modules.zh.view.shebei.mapper.ShebeiMapper; +import org.jeecg.modules.zh.view.shebei.service.IShebeiService; +import org.springframework.stereotype.Service; + +/** + * @Description: 设备信息 + * @Author: jeecg-boot + * @Date: 2025-07-02 + * @Version: V1.0 + */ +@Service +public class ShebeiServiceImpl extends ServiceImpl implements IShebeiService { + + @Override + public IPage queryDeviceInfo(Page page, Shebei shebei) { + return baseMapper.queryDeviceInfo(page, shebei); + } +}