From b126d1d2cd4a246a60a0c91f117961a76c7a7935 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Fri, 27 Jun 2025 09:28:17 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8E=9F=E6=9D=A5?= =?UTF-8?q?=E7=9A=84=E6=96=87=E4=BB=B6=E5=9C=B0=E5=9D=80=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9F=BA=E7=A1=80=E8=AF=B7=E8=B4=AD=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NuInvoicingQgdInfoController.java | 180 ++++++++++++++++++ .../entity/NuInvoicingQgdInfo.java | 112 +++++++++++ .../mapper/NuInvoicingQgdInfoMapper.java | 17 ++ .../mapper/xml/NuInvoicingQgdInfoMapper.xml | 5 + .../service/INuInvoicingQgdInfoService.java | 14 ++ .../impl/NuInvoicingQgdInfoServiceImpl.java | 19 ++ .../NuInvoicingQgdMainController.java | 180 ++++++++++++++++++ .../entity/NuInvoicingQgdMain.java | 68 +++++++ .../mapper/NuInvoicingQgdMainMapper.java | 17 ++ .../mapper/xml/NuInvoicingQgdMainMapper.xml | 5 + .../service/INuInvoicingQgdMainService.java | 14 ++ .../impl/NuInvoicingQgdMainServiceImpl.java | 19 ++ .../NuIotTqApiRequestLogController.java | 53 ++++-- .../entity/NuIotTqApiRequestLog.java | 8 +- .../mapper/NuIotTqApiRequestLogMapper.java | 7 +- .../mapper/xml/NuIotTqApiRequestLogMapper.xml | 2 +- .../service/INuIotTqApiRequestLogService.java | 4 +- .../impl/NuIotTqApiRequestLogServiceImpl.java | 8 +- .../mapper/xml/ElectricityMeterMapper.xml | 2 +- .../service/IElectricityMeterService.java | 2 + .../impl/ElectricityMeterServiceImpl.java | 79 ++++++-- .../NuIotTqElectricitySyncLogController.java | 23 +-- .../entity/NuIotTqElectricitySyncLog.java | 9 +- .../NuIotTqElectricitySyncLogMapper.java | 7 +- .../xml/NuIotTqElectricitySyncLogMapper.xml | 2 +- .../INuIotTqElectricitySyncLogService.java | 4 +- .../NuIotTqElectricitySyncLogServiceImpl.java | 8 +- .../service/impl/HumidDeviceServiceImpl.java | 14 +- 28 files changed, 776 insertions(+), 106 deletions(-) create mode 100644 nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/controller/NuInvoicingQgdInfoController.java create mode 100644 nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/entity/NuInvoicingQgdInfo.java create mode 100644 nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/mapper/NuInvoicingQgdInfoMapper.java create mode 100644 nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/mapper/xml/NuInvoicingQgdInfoMapper.xml create mode 100644 nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/service/INuInvoicingQgdInfoService.java create mode 100644 nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/service/impl/NuInvoicingQgdInfoServiceImpl.java create mode 100644 nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/controller/NuInvoicingQgdMainController.java create mode 100644 nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/entity/NuInvoicingQgdMain.java create mode 100644 nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/mapper/NuInvoicingQgdMainMapper.java create mode 100644 nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/mapper/xml/NuInvoicingQgdMainMapper.xml create mode 100644 nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/service/INuInvoicingQgdMainService.java create mode 100644 nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/service/impl/NuInvoicingQgdMainServiceImpl.java rename nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/{nuIotTqApiRequestLog => tq/apiRequestLog}/controller/NuIotTqApiRequestLogController.java (81%) rename nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/{nuIotTqApiRequestLog => tq/apiRequestLog}/entity/NuIotTqApiRequestLog.java (92%) rename nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/{nuIotTqApiRequestLog => tq/apiRequestLog}/mapper/NuIotTqApiRequestLogMapper.java (56%) rename nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/{nuIotTqApiRequestLog => tq/apiRequestLog}/mapper/xml/NuIotTqApiRequestLogMapper.xml (63%) rename nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/{nuIotTqApiRequestLog => tq/apiRequestLog}/service/INuIotTqApiRequestLogService.java (67%) rename nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/{nuIotTqApiRequestLog => tq/apiRequestLog}/service/impl/NuIotTqApiRequestLogServiceImpl.java (57%) rename nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/{nuIotTqElectricitySyncLog => tq/syncLog}/controller/NuIotTqElectricitySyncLogController.java (85%) rename nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/{nuIotTqElectricitySyncLog => tq/syncLog}/entity/NuIotTqElectricitySyncLog.java (90%) rename nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/{nuIotTqElectricitySyncLog => tq/syncLog}/mapper/NuIotTqElectricitySyncLogMapper.java (55%) rename nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/{nuIotTqElectricitySyncLog => tq/syncLog}/mapper/xml/NuIotTqElectricitySyncLogMapper.xml (60%) rename nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/{nuIotTqElectricitySyncLog => tq/syncLog}/service/INuIotTqElectricitySyncLogService.java (65%) rename nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/{nuIotTqElectricitySyncLog => tq/syncLog}/service/impl/NuIotTqElectricitySyncLogServiceImpl.java (55%) diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/controller/NuInvoicingQgdInfoController.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/controller/NuInvoicingQgdInfoController.java new file mode 100644 index 0000000..e6a47d0 --- /dev/null +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/controller/NuInvoicingQgdInfoController.java @@ -0,0 +1,180 @@ +package com.nu.modules.nuInvoicingQgdInfo.controller; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.query.QueryRuleEnum; +import org.jeecg.common.util.oConvertUtils; +import com.nu.modules.nuInvoicingQgdInfo.entity.NuInvoicingQgdInfo; +import com.nu.modules.nuInvoicingQgdInfo.service.INuInvoicingQgdInfoService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: 请购单-请购信息 + * @Author: jeecg-boot + * @Date: 2025-06-26 + * @Version: V1.0 + */ +@Api(tags="请购单-请购信息") +@RestController +@RequestMapping("/nuInvoicingQgdInfo/nuInvoicingQgdInfo") +@Slf4j +public class NuInvoicingQgdInfoController extends JeecgController { + @Autowired + private INuInvoicingQgdInfoService nuInvoicingQgdInfoService; + + /** + * 分页列表查询 + * + * @param nuInvoicingQgdInfo + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "请购单-请购信息-分页列表查询") + @ApiOperation(value="请购单-请购信息-分页列表查询", notes="请购单-请购信息-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(NuInvoicingQgdInfo nuInvoicingQgdInfo, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(nuInvoicingQgdInfo, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = nuInvoicingQgdInfoService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param nuInvoicingQgdInfo + * @return + */ + @AutoLog(value = "请购单-请购信息-添加") + @ApiOperation(value="请购单-请购信息-添加", notes="请购单-请购信息-添加") + @RequiresPermissions("nuInvoicingQgdInfo:nu_invoicing_qgd_info:add") + @PostMapping(value = "/add") + public Result add(@RequestBody NuInvoicingQgdInfo nuInvoicingQgdInfo) { + nuInvoicingQgdInfoService.save(nuInvoicingQgdInfo); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param nuInvoicingQgdInfo + * @return + */ + @AutoLog(value = "请购单-请购信息-编辑") + @ApiOperation(value="请购单-请购信息-编辑", notes="请购单-请购信息-编辑") + @RequiresPermissions("nuInvoicingQgdInfo:nu_invoicing_qgd_info:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody NuInvoicingQgdInfo nuInvoicingQgdInfo) { + nuInvoicingQgdInfoService.updateById(nuInvoicingQgdInfo); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "请购单-请购信息-通过id删除") + @ApiOperation(value="请购单-请购信息-通过id删除", notes="请购单-请购信息-通过id删除") + @RequiresPermissions("nuInvoicingQgdInfo:nu_invoicing_qgd_info:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + nuInvoicingQgdInfoService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "请购单-请购信息-批量删除") + @ApiOperation(value="请购单-请购信息-批量删除", notes="请购单-请购信息-批量删除") + @RequiresPermissions("nuInvoicingQgdInfo:nu_invoicing_qgd_info:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.nuInvoicingQgdInfoService.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) { + NuInvoicingQgdInfo nuInvoicingQgdInfo = nuInvoicingQgdInfoService.getById(id); + if(nuInvoicingQgdInfo==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(nuInvoicingQgdInfo); + } + + /** + * 导出excel + * + * @param request + * @param nuInvoicingQgdInfo + */ + @RequiresPermissions("nuInvoicingQgdInfo:nu_invoicing_qgd_info:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, NuInvoicingQgdInfo nuInvoicingQgdInfo) { + return super.exportXls(request, nuInvoicingQgdInfo, NuInvoicingQgdInfo.class, "请购单-请购信息"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("nuInvoicingQgdInfo:nu_invoicing_qgd_info:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, NuInvoicingQgdInfo.class); + } + +} diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/entity/NuInvoicingQgdInfo.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/entity/NuInvoicingQgdInfo.java new file mode 100644 index 0000000..796b98d --- /dev/null +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/entity/NuInvoicingQgdInfo.java @@ -0,0 +1,112 @@ +package com.nu.modules.nuInvoicingQgdInfo.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableLogic; +import org.jeecg.common.constant.ProvinceCityArea; +import org.jeecg.common.util.SpringContextUtils; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 请购单-请购信息 + * @Author: jeecg-boot + * @Date: 2025-06-26 + * @Version: V1.0 + */ +@Data +@TableName("nu_invoicing_qgd_info") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="nu_invoicing_qgd_info对象", description="请购单-请购信息") +public class NuInvoicingQgdInfo implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.String id; + /**createBy*/ + @ApiModelProperty(value = "createBy") + private java.lang.String createBy; + /**createTime*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "createTime") + private java.util.Date createTime; + /**updateBy*/ + @ApiModelProperty(value = "updateBy") + private java.lang.String updateBy; + /**updateTime*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "updateTime") + private java.util.Date updateTime; + /**sysOrgCode*/ + @ApiModelProperty(value = "sysOrgCode") + private java.lang.String sysOrgCode; + /**请购单id*/ + @Excel(name = "请购单id", width = 15) + @ApiModelProperty(value = "请购单id") + private java.lang.String mainId; + /**请购单编号*/ + @Excel(name = "请购单编号", width = 15) + @ApiModelProperty(value = "请购单编号") + private java.lang.String mainNo; + /**物料id*/ + @Excel(name = "物料id", width = 15) + @ApiModelProperty(value = "物料id") + private java.lang.String wlId; + /**物料编码*/ + @Excel(name = "物料编码", width = 15) + @ApiModelProperty(value = "物料编码") + private java.lang.String wlMaterialNo; + /**物料名称*/ + @Excel(name = "物料名称", width = 15) + @ApiModelProperty(value = "物料名称") + private java.lang.String wlName; + /**采购单位*/ + @Excel(name = "采购单位", width = 15) + @ApiModelProperty(value = "采购单位") + private java.lang.String wlUnits; + /**规格型号*/ + @Excel(name = "规格型号", width = 15) + @ApiModelProperty(value = "规格型号") + private java.lang.String wlSpecificationModel; + /**上限*/ + @Excel(name = "上限", width = 15) + @ApiModelProperty(value = "上限") + private java.lang.String wlUpperLimit; + /**下限*/ + @Excel(name = "下限", width = 15) + @ApiModelProperty(value = "下限") + private java.lang.String wlLowerLimit; + /**供应商id*/ + @Excel(name = "供应商id", width = 15) + @ApiModelProperty(value = "供应商id") + private java.lang.String suppliersId; + /**供应商名称*/ + @Excel(name = "供应商名称", width = 15) + @ApiModelProperty(value = "供应商名称") + private java.lang.String suppliersName; + /**请购数量*/ + @Excel(name = "请购数量", width = 15) + @ApiModelProperty(value = "请购数量") + private java.lang.Integer purchaseQuantity; + /**brand*/ + @Excel(name = "brand", width = 15) + @ApiModelProperty(value = "brand") + private java.lang.String brand; +} diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/mapper/NuInvoicingQgdInfoMapper.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/mapper/NuInvoicingQgdInfoMapper.java new file mode 100644 index 0000000..07829fa --- /dev/null +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/mapper/NuInvoicingQgdInfoMapper.java @@ -0,0 +1,17 @@ +package com.nu.modules.nuInvoicingQgdInfo.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.nu.modules.nuInvoicingQgdInfo.entity.NuInvoicingQgdInfo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 请购单-请购信息 + * @Author: jeecg-boot + * @Date: 2025-06-26 + * @Version: V1.0 + */ +public interface NuInvoicingQgdInfoMapper extends BaseMapper { + +} diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/mapper/xml/NuInvoicingQgdInfoMapper.xml b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/mapper/xml/NuInvoicingQgdInfoMapper.xml new file mode 100644 index 0000000..880aa6f --- /dev/null +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/mapper/xml/NuInvoicingQgdInfoMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/service/INuInvoicingQgdInfoService.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/service/INuInvoicingQgdInfoService.java new file mode 100644 index 0000000..2d03ffe --- /dev/null +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/service/INuInvoicingQgdInfoService.java @@ -0,0 +1,14 @@ +package com.nu.modules.nuInvoicingQgdInfo.service; + +import com.nu.modules.nuInvoicingQgdInfo.entity.NuInvoicingQgdInfo; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 请购单-请购信息 + * @Author: jeecg-boot + * @Date: 2025-06-26 + * @Version: V1.0 + */ +public interface INuInvoicingQgdInfoService extends IService { + +} diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/service/impl/NuInvoicingQgdInfoServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/service/impl/NuInvoicingQgdInfoServiceImpl.java new file mode 100644 index 0000000..fabca80 --- /dev/null +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/service/impl/NuInvoicingQgdInfoServiceImpl.java @@ -0,0 +1,19 @@ +package com.nu.modules.nuInvoicingQgdInfo.service.impl; + +import com.nu.modules.nuInvoicingQgdInfo.entity.NuInvoicingQgdInfo; +import com.nu.modules.nuInvoicingQgdInfo.mapper.NuInvoicingQgdInfoMapper; +import com.nu.modules.nuInvoicingQgdInfo.service.INuInvoicingQgdInfoService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 请购单-请购信息 + * @Author: jeecg-boot + * @Date: 2025-06-26 + * @Version: V1.0 + */ +@Service +public class NuInvoicingQgdInfoServiceImpl extends ServiceImpl implements INuInvoicingQgdInfoService { + +} diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/controller/NuInvoicingQgdMainController.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/controller/NuInvoicingQgdMainController.java new file mode 100644 index 0000000..cd959e5 --- /dev/null +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/controller/NuInvoicingQgdMainController.java @@ -0,0 +1,180 @@ +package com.nu.modules.nuInvoicingQgdMain.controller; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.query.QueryRuleEnum; +import org.jeecg.common.util.oConvertUtils; +import com.nu.modules.nuInvoicingQgdMain.entity.NuInvoicingQgdMain; +import com.nu.modules.nuInvoicingQgdMain.service.INuInvoicingQgdMainService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: 请购单 + * @Author: jeecg-boot + * @Date: 2025-06-26 + * @Version: V1.0 + */ +@Api(tags="请购单") +@RestController +@RequestMapping("/nuInvoicingQgdMain/nuInvoicingQgdMain") +@Slf4j +public class NuInvoicingQgdMainController extends JeecgController { + @Autowired + private INuInvoicingQgdMainService nuInvoicingQgdMainService; + + /** + * 分页列表查询 + * + * @param nuInvoicingQgdMain + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "请购单-分页列表查询") + @ApiOperation(value="请购单-分页列表查询", notes="请购单-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(NuInvoicingQgdMain nuInvoicingQgdMain, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(nuInvoicingQgdMain, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = nuInvoicingQgdMainService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param nuInvoicingQgdMain + * @return + */ + @AutoLog(value = "请购单-添加") + @ApiOperation(value="请购单-添加", notes="请购单-添加") + @RequiresPermissions("nuInvoicingQgdMain:nu_invoicing_qgd_main:add") + @PostMapping(value = "/add") + public Result add(@RequestBody NuInvoicingQgdMain nuInvoicingQgdMain) { + nuInvoicingQgdMainService.save(nuInvoicingQgdMain); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param nuInvoicingQgdMain + * @return + */ + @AutoLog(value = "请购单-编辑") + @ApiOperation(value="请购单-编辑", notes="请购单-编辑") + @RequiresPermissions("nuInvoicingQgdMain:nu_invoicing_qgd_main:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody NuInvoicingQgdMain nuInvoicingQgdMain) { + nuInvoicingQgdMainService.updateById(nuInvoicingQgdMain); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "请购单-通过id删除") + @ApiOperation(value="请购单-通过id删除", notes="请购单-通过id删除") + @RequiresPermissions("nuInvoicingQgdMain:nu_invoicing_qgd_main:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + nuInvoicingQgdMainService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "请购单-批量删除") + @ApiOperation(value="请购单-批量删除", notes="请购单-批量删除") + @RequiresPermissions("nuInvoicingQgdMain:nu_invoicing_qgd_main:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.nuInvoicingQgdMainService.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) { + NuInvoicingQgdMain nuInvoicingQgdMain = nuInvoicingQgdMainService.getById(id); + if(nuInvoicingQgdMain==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(nuInvoicingQgdMain); + } + + /** + * 导出excel + * + * @param request + * @param nuInvoicingQgdMain + */ + @RequiresPermissions("nuInvoicingQgdMain:nu_invoicing_qgd_main:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, NuInvoicingQgdMain nuInvoicingQgdMain) { + return super.exportXls(request, nuInvoicingQgdMain, NuInvoicingQgdMain.class, "请购单"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("nuInvoicingQgdMain:nu_invoicing_qgd_main:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, NuInvoicingQgdMain.class); + } + +} diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/entity/NuInvoicingQgdMain.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/entity/NuInvoicingQgdMain.java new file mode 100644 index 0000000..74a5bb7 --- /dev/null +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/entity/NuInvoicingQgdMain.java @@ -0,0 +1,68 @@ +package com.nu.modules.nuInvoicingQgdMain.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableLogic; +import org.jeecg.common.constant.ProvinceCityArea; +import org.jeecg.common.util.SpringContextUtils; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 请购单 + * @Author: jeecg-boot + * @Date: 2025-06-26 + * @Version: V1.0 + */ +@Data +@TableName("nu_invoicing_qgd_main") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="nu_invoicing_qgd_main对象", description="请购单") +public class NuInvoicingQgdMain implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.String id; + /**createBy*/ + @ApiModelProperty(value = "createBy") + private java.lang.String createBy; + /**createTime*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "createTime") + private java.util.Date createTime; + /**updateBy*/ + @ApiModelProperty(value = "updateBy") + private java.lang.String updateBy; + /**updateTime*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "updateTime") + private java.util.Date updateTime; + /**sysOrgCode*/ + @ApiModelProperty(value = "sysOrgCode") + private java.lang.String sysOrgCode; + /**请购单号*/ + @Excel(name = "请购单号", width = 15) + @ApiModelProperty(value = "请购单号") + private java.lang.Integer qgdNo; + /**请购状态 0未下单 1已下单*/ + @Excel(name = "请购状态 0未下单 1已下单", width = 15) + @ApiModelProperty(value = "请购状态 0未下单 1已下单") + private java.lang.Integer status; +} diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/mapper/NuInvoicingQgdMainMapper.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/mapper/NuInvoicingQgdMainMapper.java new file mode 100644 index 0000000..30fde20 --- /dev/null +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/mapper/NuInvoicingQgdMainMapper.java @@ -0,0 +1,17 @@ +package com.nu.modules.nuInvoicingQgdMain.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.nu.modules.nuInvoicingQgdMain.entity.NuInvoicingQgdMain; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 请购单 + * @Author: jeecg-boot + * @Date: 2025-06-26 + * @Version: V1.0 + */ +public interface NuInvoicingQgdMainMapper extends BaseMapper { + +} diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/mapper/xml/NuInvoicingQgdMainMapper.xml b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/mapper/xml/NuInvoicingQgdMainMapper.xml new file mode 100644 index 0000000..0d1bf3a --- /dev/null +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/mapper/xml/NuInvoicingQgdMainMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/service/INuInvoicingQgdMainService.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/service/INuInvoicingQgdMainService.java new file mode 100644 index 0000000..9eba15f --- /dev/null +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/service/INuInvoicingQgdMainService.java @@ -0,0 +1,14 @@ +package com.nu.modules.nuInvoicingQgdMain.service; + +import com.nu.modules.nuInvoicingQgdMain.entity.NuInvoicingQgdMain; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 请购单 + * @Author: jeecg-boot + * @Date: 2025-06-26 + * @Version: V1.0 + */ +public interface INuInvoicingQgdMainService extends IService { + +} diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/service/impl/NuInvoicingQgdMainServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/service/impl/NuInvoicingQgdMainServiceImpl.java new file mode 100644 index 0000000..7075bf7 --- /dev/null +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/service/impl/NuInvoicingQgdMainServiceImpl.java @@ -0,0 +1,19 @@ +package com.nu.modules.nuInvoicingQgdMain.service.impl; + +import com.nu.modules.nuInvoicingQgdMain.entity.NuInvoicingQgdMain; +import com.nu.modules.nuInvoicingQgdMain.mapper.NuInvoicingQgdMainMapper; +import com.nu.modules.nuInvoicingQgdMain.service.INuInvoicingQgdMainService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 请购单 + * @Author: jeecg-boot + * @Date: 2025-06-26 + * @Version: V1.0 + */ +@Service +public class NuInvoicingQgdMainServiceImpl extends ServiceImpl implements INuInvoicingQgdMainService { + +} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/controller/NuIotTqApiRequestLogController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/controller/NuIotTqApiRequestLogController.java similarity index 81% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/controller/NuIotTqApiRequestLogController.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/controller/NuIotTqApiRequestLogController.java index e728b1d..f9ad028 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/controller/NuIotTqApiRequestLogController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/controller/NuIotTqApiRequestLogController.java @@ -1,39 +1,27 @@ -package com.nu.modules.nuIotTqApiRequestLog.controller; +package com.nu.modules.tq.apiRequestLog.controller; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryRuleEnum; -import org.jeecg.common.util.oConvertUtils; -import com.nu.modules.nuIotTqApiRequestLog.entity.NuIotTqApiRequestLog; -import com.nu.modules.nuIotTqApiRequestLog.service.INuIotTqApiRequestLogService; +import com.nu.modules.tq.apiRequestLog.entity.NuIotTqApiRequestLog; +import com.nu.modules.tq.apiRequestLog.service.INuIotTqApiRequestLogService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jeecg.common.system.base.controller.JeecgController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.jeecg.common.aspect.annotation.AutoLog; @@ -78,6 +66,31 @@ public class NuIotTqApiRequestLogController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(nuIotTqApiRequestLog, req.getParameterMap(),customeRuleMap); Page page = new Page(pageNo, pageSize); IPage pageList = nuIotTqApiRequestLogService.page(page, queryWrapper); + // 获取当前时间 + Calendar calendar = Calendar.getInstance(); + // 减去5分钟 + calendar.add(Calendar.MINUTE, -5); + // 转换为Date对象 + Date fiveMinutesAgo = calendar.getTime(); + for(NuIotTqApiRequestLog par:pageList.getRecords()){ + String dateStr = par.getRequestTime(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Date date = null; + try { + date = sdf.parse(dateStr); + System.out.println("Date: " + date); // 输出：Date: Tue Aug 15 14:30:00 CST 2023 + } catch (ParseException e) { + e.printStackTrace(); + } + //如果返回状态为空并且超过了5分钟则返回抄表失败 + if(StringUtils.isBlank(par.getResolveStatus()) && fiveMinutesAgo.getTime() > date.getTime()){ + par.setResolveStatus("抄表失败"); + //判断返回状态为空并且没有超过了5分钟则返回抄表中 + }else if(StringUtils.isBlank(par.getResolveStatus())){ + par.setResolveStatus(par.getRequestStatus()); + } + //返回状态有值，则保持原样，输出返回状态值 + } return Result.OK(pageList); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/entity/NuIotTqApiRequestLog.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/entity/NuIotTqApiRequestLog.java similarity index 92% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/entity/NuIotTqApiRequestLog.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/entity/NuIotTqApiRequestLog.java index 228685a..2d94c75 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/entity/NuIotTqApiRequestLog.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/entity/NuIotTqApiRequestLog.java @@ -1,15 +1,11 @@ -package com.nu.modules.nuIotTqApiRequestLog.entity; +package com.nu.modules.tq.apiRequestLog.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; import java.util.Date; -import java.math.BigDecimal; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; -import org.jeecg.common.constant.ProvinceCityArea; -import org.jeecg.common.util.SpringContextUtils; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/mapper/NuIotTqApiRequestLogMapper.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/NuIotTqApiRequestLogMapper.java similarity index 56% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/mapper/NuIotTqApiRequestLogMapper.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/NuIotTqApiRequestLogMapper.java index 16181e3..1f12182 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/mapper/NuIotTqApiRequestLogMapper.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/NuIotTqApiRequestLogMapper.java @@ -1,9 +1,6 @@ -package com.nu.modules.nuIotTqApiRequestLog.mapper; +package com.nu.modules.tq.apiRequestLog.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.nu.modules.nuIotTqApiRequestLog.entity.NuIotTqApiRequestLog; +import com.nu.modules.tq.apiRequestLog.entity.NuIotTqApiRequestLog; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/mapper/xml/NuIotTqApiRequestLogMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/xml/NuIotTqApiRequestLogMapper.xml similarity index 63% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/mapper/xml/NuIotTqApiRequestLogMapper.xml rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/xml/NuIotTqApiRequestLogMapper.xml index 31f35b8..4706e40 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/mapper/xml/NuIotTqApiRequestLogMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/xml/NuIotTqApiRequestLogMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/service/INuIotTqApiRequestLogService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/INuIotTqApiRequestLogService.java similarity index 67% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/service/INuIotTqApiRequestLogService.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/INuIotTqApiRequestLogService.java index 6b2ce12..506afcd 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/service/INuIotTqApiRequestLogService.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/INuIotTqApiRequestLogService.java @@ -1,6 +1,6 @@ -package com.nu.modules.nuIotTqApiRequestLog.service; +package com.nu.modules.tq.apiRequestLog.service; -import com.nu.modules.nuIotTqApiRequestLog.entity.NuIotTqApiRequestLog; +import com.nu.modules.tq.apiRequestLog.entity.NuIotTqApiRequestLog; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/service/impl/NuIotTqApiRequestLogServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/impl/NuIotTqApiRequestLogServiceImpl.java similarity index 57% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/service/impl/NuIotTqApiRequestLogServiceImpl.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/impl/NuIotTqApiRequestLogServiceImpl.java index ab4638b..1437058 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/service/impl/NuIotTqApiRequestLogServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/impl/NuIotTqApiRequestLogServiceImpl.java @@ -1,8 +1,8 @@ -package com.nu.modules.nuIotTqApiRequestLog.service.impl; +package com.nu.modules.tq.apiRequestLog.service.impl; -import com.nu.modules.nuIotTqApiRequestLog.entity.NuIotTqApiRequestLog; -import com.nu.modules.nuIotTqApiRequestLog.mapper.NuIotTqApiRequestLogMapper; -import com.nu.modules.nuIotTqApiRequestLog.service.INuIotTqApiRequestLogService; +import com.nu.modules.tq.apiRequestLog.entity.NuIotTqApiRequestLog; +import com.nu.modules.tq.apiRequestLog.mapper.NuIotTqApiRequestLogMapper; +import com.nu.modules.tq.apiRequestLog.service.INuIotTqApiRequestLogService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml index 853338c..c4ca620 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml @@ -26,7 +26,7 @@ left join nu_iot_tq_collector b on a.cid = b.cid - AND a.address = #{params.address} + AND a.address like concat('%',#{params.address},'%') AND a.nuId = #{params.nuId} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/IElectricityMeterService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/IElectricityMeterService.java index 9be9315..592d643 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/IElectricityMeterService.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/IElectricityMeterService.java @@ -20,4 +20,6 @@ public interface IElectricityMeterService extends IService { String eleReadNotify(String response_content, String timestamp, String sign); void syncElectricity(String dataSourceCode, ElectricityMeter electricityMeter); + + void editHldy(ElectricityMeter electricityMeter); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/impl/ElectricityMeterServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/impl/ElectricityMeterServiceImpl.java index d15b1a9..48f512e 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/impl/ElectricityMeterServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/impl/ElectricityMeterServiceImpl.java @@ -8,8 +8,8 @@ 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 com.nu.modules.nuIotTqElectricitySyncLog.entity.NuIotTqElectricitySyncLog; -import com.nu.modules.nuIotTqElectricitySyncLog.service.INuIotTqElectricitySyncLogService; +import com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog; +import com.nu.modules.tq.syncLog.service.INuIotTqElectricitySyncLogService; import com.nu.modules.tq.common.entity.TqApiLog; import com.nu.modules.tq.common.service.ITqApiLogService; import com.nu.modules.tq.utils.HttpTool; @@ -104,7 +104,7 @@ public class ElectricityMeterServiceImpl extends ServiceImpl - + \ No newline at end of file diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/service/INuIotTqElectricitySyncLogService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/INuIotTqElectricitySyncLogService.java similarity index 65% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/service/INuIotTqElectricitySyncLogService.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/INuIotTqElectricitySyncLogService.java index bd60a30..c68c1e8 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/service/INuIotTqElectricitySyncLogService.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/INuIotTqElectricitySyncLogService.java @@ -1,6 +1,6 @@ -package com.nu.modules.nuIotTqElectricitySyncLog.service; +package com.nu.modules.tq.syncLog.service; -import com.nu.modules.nuIotTqElectricitySyncLog.entity.NuIotTqElectricitySyncLog; +import com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/service/impl/NuIotTqElectricitySyncLogServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/impl/NuIotTqElectricitySyncLogServiceImpl.java similarity index 55% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/service/impl/NuIotTqElectricitySyncLogServiceImpl.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/impl/NuIotTqElectricitySyncLogServiceImpl.java index 2954565..b62ed93 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/service/impl/NuIotTqElectricitySyncLogServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/impl/NuIotTqElectricitySyncLogServiceImpl.java @@ -1,8 +1,8 @@ -package com.nu.modules.nuIotTqElectricitySyncLog.service.impl; +package com.nu.modules.tq.syncLog.service.impl; -import com.nu.modules.nuIotTqElectricitySyncLog.entity.NuIotTqElectricitySyncLog; -import com.nu.modules.nuIotTqElectricitySyncLog.mapper.NuIotTqElectricitySyncLogMapper; -import com.nu.modules.nuIotTqElectricitySyncLog.service.INuIotTqElectricitySyncLogService; +import com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog; +import com.nu.modules.tq.syncLog.mapper.NuIotTqElectricitySyncLogMapper; +import com.nu.modules.tq.syncLog.service.INuIotTqElectricitySyncLogService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java index 00d5a00..f7883bc 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java @@ -7,11 +7,8 @@ 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 com.nu.modules.nuIotTqElectricitySyncLog.entity.NuIotTqElectricitySyncLog; -import com.nu.modules.nuIotTqElectricitySyncLog.service.INuIotTqElectricitySyncLogService; -import com.nu.modules.tq.utils.HttpTool; -import com.nu.modules.tq.water.entity.WaterMeter; -import com.nu.modules.tq.water.service.impl.WaterMeterServiceImpl; +import com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog; +import com.nu.modules.tq.syncLog.service.INuIotTqElectricitySyncLogService; import com.nu.modules.yiweilian.humid.entity.HumidDevice; import com.nu.modules.yiweilian.humid.mapper.HumidDeviceMapper; import com.nu.modules.yiweilian.humid.service.IHumidDeviceService; @@ -27,7 +24,6 @@ import org.springframework.stereotype.Service; import java.util.HashMap; import java.util.Map; -import java.util.UUID; @Slf4j @Service @@ -248,12 +244,12 @@ public class HumidDeviceServiceImpl extends ServiceImpl params = getParmas(page+1,limit,humidDevice); From d4b9c5920ec58ff59f39ebb81dc722c389c76346 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Fri, 27 Jun 2025 10:27:49 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E5=AD=97?= =?UTF-8?q?=E5=8F=8A=E5=88=A4=E6=96=AD=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NuIotTqApiRequestLogController.java | 20 ++- .../mapper/xml/ElectricityMeterMapper.xml | 4 +- .../service/impl/WaterMeterServiceImpl.java | 111 +++++++++++--- .../service/impl/HumidDeviceServiceImpl.java | 140 +++++++++++------- 4 files changed, 200 insertions(+), 75 deletions(-) diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/controller/NuIotTqApiRequestLogController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/controller/NuIotTqApiRequestLogController.java index f9ad028..c26a000 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/controller/NuIotTqApiRequestLogController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/controller/NuIotTqApiRequestLogController.java @@ -84,7 +84,25 @@ public class NuIotTqApiRequestLogController extends JeecgController date.getTime()){ - par.setResolveStatus("抄表失败"); + //9清零 3抄表 10电表拉闸 11电表合闸 49水表清零 42水表抄表 43水表开闸 53水表关闸 + if(StringUtils.equals("9",par.getType())){ + par.setResolveStatus("清零失败"); + }else if (StringUtils.equals("3",par.getType())){ + par.setResolveStatus("抄表失败"); + }else if(StringUtils.equals("10",par.getType())){ + par.setResolveStatus("拉闸失败"); + }else if (StringUtils.equals("11",par.getType())){ + par.setResolveStatus("合闸失败"); + }else if(StringUtils.equals("49",par.getType())){ + par.setResolveStatus("清零失败"); + }else if (StringUtils.equals("42",par.getType())){ + par.setResolveStatus("抄表失败"); + }else if (StringUtils.equals("43",par.getType())){ + par.setResolveStatus("开阀失败"); + }else if (StringUtils.equals("53",par.getType())){ + par.setResolveStatus("关阀失败"); + } + //判断返回状态为空并且没有超过了5分钟则返回抄表中 }else if(StringUtils.isBlank(par.getResolveStatus())){ par.setResolveStatus(par.getRequestStatus()); diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml index c4ca620..f5fe454 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml @@ -29,10 +29,10 @@ AND a.address like concat('%',#{params.address},'%') - AND a.nuId = #{params.nuId} + AND a.nu_id = #{params.nuId} - AND a.departId = #{params.departId} + AND a.depart_id = #{params.departId} AND a.relay_state = #{params.relayState} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java index 427b2dc..3c8a1b2 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java @@ -3,9 +3,13 @@ package com.nu.modules.tq.water.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; +import com.baomidou.dynamic.datasource.annotation.DS; +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 com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog; +import com.nu.modules.tq.syncLog.service.INuIotTqElectricitySyncLogService; import com.nu.modules.tq.common.entity.TqApiLog; import com.nu.modules.tq.common.service.ITqApiLogService; import com.nu.modules.tq.utils.HttpTool; @@ -15,8 +19,10 @@ import com.nu.modules.tq.water.entity.WaterMeter; import com.nu.modules.tq.water.mapper.WaterMeterMapper; import com.nu.modules.tq.water.service.IWaterMeterService; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import java.util.*; @@ -31,6 +37,14 @@ public class WaterMeterServiceImpl extends ServiceImpl findPage(Page page, WaterMeter waterMeter){ return baseMapper.findPage(page,waterMeter); @@ -91,7 +105,7 @@ public class WaterMeterServiceImpl extends ServiceImpl waterControl(WaterMeter waterMeter){ @@ -133,9 +147,9 @@ public class WaterMeterServiceImpl extends ServiceImpl> req = new ArrayList<>(); @@ -166,6 +180,11 @@ public class WaterMeterServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("cid",waterMeter.getCid()); + WaterMeter oldParam = baseMapper.selectOne(queryWrapper);//查询数据库中该表号数据原始数据 + if(oldParam == null){ + baseMapper.insert(waterMeter); + }else{ + baseMapper.updateById(waterMeter); + } + } catch (Exception e) { + throw new RuntimeException(e); + } + return true; + } } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java index f7883bc..044ae88 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java @@ -1,5 +1,6 @@ package com.nu.modules.yiweilian.humid.service.impl; +import cn.hutool.core.date.DateUtil; import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; import com.baomidou.dynamic.datasource.annotation.DS; @@ -22,6 +23,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; +import java.util.Calendar; +import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -227,29 +230,53 @@ public class HumidDeviceServiceImpl extends ServiceImpl0){ + for(int i=0;i params = getParmas(page+1,limit,humidDevice); @@ -340,7 +367,8 @@ public class HumidDeviceServiceImpl extends ServiceImpl0){ + for(int i=0;i Date: Mon, 30 Jun 2025 09:48:19 +0800 Subject: [PATCH 3/9] =?UTF-8?q?tplink=E6=8E=A5=E5=8F=A3=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nu/modules/tplink/alarm/controller/AlarmLogController.java | 2 +- .../modules/tplink/camera/controller/CameraInfoController.java | 2 +- .../tplink/project/controller/ProjectInfoController.java | 2 +- .../modules/tplink/region/controller/RegionInfoController.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/alarm/controller/AlarmLogController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/alarm/controller/AlarmLogController.java index 80192cc..81693f2 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/alarm/controller/AlarmLogController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/alarm/controller/AlarmLogController.java @@ -47,7 +47,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; */ @Api(tags="护理单元-物联管理-TPLINK告警日志信息") @RestController -@RequestMapping("/iot/alarmLog") +@RequestMapping("/iot/tplink/alarmLog") @Slf4j public class AlarmLogController extends JeecgController { @Autowired diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/controller/CameraInfoController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/controller/CameraInfoController.java index bf7b09d..cb9589c 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/controller/CameraInfoController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/controller/CameraInfoController.java @@ -40,7 +40,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; */ @Api(tags="护理单元-物联管理-摄像头信息") @RestController -@RequestMapping("/iot/cameraInfo") +@RequestMapping("/iot/tplink/cameraInfo") @Slf4j public class CameraInfoController extends JeecgController { @Autowired diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/controller/ProjectInfoController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/controller/ProjectInfoController.java index f0631df..a704d2a 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/controller/ProjectInfoController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/controller/ProjectInfoController.java @@ -33,7 +33,7 @@ import java.util.List; */ @Api(tags="护理单元-物联管理-TPLINK项目信息") @RestController -@RequestMapping("/iot/projectInfo") +@RequestMapping("/iot/tplink/projectInfo") @Slf4j public class ProjectInfoController extends JeecgController { @Autowired diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/controller/RegionInfoController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/controller/RegionInfoController.java index d746cb0..2d6e28e 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/controller/RegionInfoController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/controller/RegionInfoController.java @@ -29,7 +29,7 @@ import java.util.List; */ @Api(tags="护理单元-物联管理-TPLINK分组信息") @RestController -@RequestMapping("/iot/regionInfo") +@RequestMapping("/iot/tplink/regionInfo") @Slf4j public class RegionInfoController extends JeecgController { @Autowired From 6efc7cf8fea4b01efb7f7ad82eb3ff916970e7b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Mon, 30 Jun 2025 11:47:20 +0800 Subject: [PATCH 4/9] =?UTF-8?q?tplink=E8=8E=B7=E5=8F=96=E6=8A=A4=E7=90=86?= =?UTF-8?q?=E5=8D=95=E5=85=83=E4=BF=A1=E6=81=AF=E8=B7=AF=E5=BE=84=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nu/modules/tplink/camera/entity/CameraInfo.java | 2 +- .../tplink/camera/mapper/xml/CameraInfoMapper.xml | 12 ++++++------ .../java/com/nu/modules/tplink/utils/TumsApi.java | 3 +-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/CameraInfo.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/CameraInfo.java index 5d1a90f..bc6297c 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/CameraInfo.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/CameraInfo.java @@ -133,7 +133,7 @@ public class CameraInfo implements Serializable { private String topTime; /**护理单元*/ @ApiModelProperty(value = "护理单元编码") - @Dict(dictTable ="nu_base_info",dicText = "nu_name",dicCode = "code") + @Dict(dictTable ="nu_base_info",dicText = "nu_name",dicCode = "nu_id") private String nuId; /**护理单元*/ @ApiModelProperty(value = "护理单元") diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml index a672a96..c766dde 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml @@ -29,7 +29,7 @@ a.nu_id as nuId, b.nu_name as nuName, ifnull(c.multitrans,0) as multitrans - from nu_iot_tplink_camera a left join nu_base_info b on a.nu_id = b.id + from nu_iot_tplink_camera a left join nu_base_info b on a.nu_id = b.nu_id left join nu_iot_tplink_camera_capability c on a.device_index = c.device_index @@ -85,7 +85,7 @@ record_plan_id as recordPlanId, a.nu_id as nuId, b.nu_name as nuName - from nu_iot_tplink_camera a left join nu_base_info b on a.nu_id = b.id + from nu_iot_tplink_camera a left join nu_base_info b on a.nu_id = b.nu_id AND a.project_id = #{projectId} @@ -129,12 +129,12 @@ diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/utils/TumsApi.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/utils/TumsApi.java index f638ca0..a4b7dd9 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/utils/TumsApi.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/utils/TumsApi.java @@ -44,8 +44,7 @@ public class TumsApi { private void initTumsConfig(){ if(tumsConfig==null){ - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - tumsConfig = tumsConfigMapper.getByCode(sysUser.getOrgCode()); + tumsConfig = tumsConfigMapper.getByCode(null); } } From 24b011fbf2e97dc64ee60a194129e9d8537e31c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Mon, 30 Jun 2025 14:25:06 +0800 Subject: [PATCH 5/9] =?UTF-8?q?tplink=E6=91=84=E5=83=8F=E5=A4=B4=E5=8F=98?= =?UTF-8?q?=E7=84=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CameraInfoController.java | 22 +++ .../tplink/camera/entity/CameraInfo.java | 9 ++ .../camera/service/ICameraInfoService.java | 2 + .../service/impl/CameraInfoServiceImpl.java | 143 ++++++++++++++++++ .../com/nu/modules/tplink/enums/ApiEnum.java | 2 +- .../com/nu/modules/tplink/utils/TumsApi.java | 13 ++ 6 files changed, 190 insertions(+), 1 deletion(-) diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/controller/CameraInfoController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/controller/CameraInfoController.java index cb9589c..f9b16b6 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/controller/CameraInfoController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/controller/CameraInfoController.java @@ -130,6 +130,17 @@ public class CameraInfoController extends JeecgController syncProjectIpcDevice(CameraInfo cameraInfo) { + return service.syncProjectIpcDevice(cameraInfo); + } + /** * 获取画面基本信息 * @@ -488,4 +499,15 @@ public class CameraInfoController extends JeecgController { void rebootDevice(CameraInfo cameraInfo); void sync(String jsonResponse); void syncCapability(String deviceIndex,String jsonResponse); + Result syncProjectIpcDevice(CameraInfo cameraInfo); Result getIpcCapability(CameraInfo cameraInfo); Result getImageCommon(Map map); Result setImageCommon(Map map); @@ -59,4 +60,5 @@ public interface ICameraInfoService extends IService { Result uploadToServer(CameraInfo cameraInfo); Result stopUploadToServer(CameraInfo cameraInfo); Result getUploadToServerProcess(CameraInfo cameraInfo); + Result motionCtrl(CameraInfo cameraInfo); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java index cebe578..860ff2e 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java @@ -245,6 +245,111 @@ public class CameraInfoServiceImpl extends ServiceImpl syncProjectIpcDevice(CameraInfo cameraInfo){ + StringBuffer sb = new StringBuffer(); + sb.append("{"); + sb.append("\"start\"").append(":0").append(","); + sb.append("\"limit\"").append(":1000").append(","); + sb.append("\"filterAnd\"").append(":").append("{"); + sb.append("\"deviceTypeList\"").append(":[").append("\"SURVEILLANCECAMERA\"").append("],"); + sb.append("\"projectId\"").append(":").append("\"").append(cameraInfo.getProjectId()).append("\""); + sb.append("},"); + sb.append("\"sort\"").append(":").append("[{"); + sb.append("\"key\"").append(":").append("\"deviceIndex\"").append(","); + sb.append("\"value\"").append(":").append("\"asc\""); + sb.append("}]"); + sb.append("}"); + String jsonResponse = tumsApi.getDeviceList(sb.toString()); + JSONObject jsonObject = new JSONObject(jsonResponse); + String errorCode = jsonObject.getStr("error_code"); + if(errorCode.equals("0")){ + syncProjectIpc(jsonResponse); + return Result.OK("同步设备成功！"); + }else{ + ErrorCode errVo = errorCodeService.getByCode(errorCode); + String errMsg = errVo.getErrorMsg(); + log.info("getImageCommon:{}",errMsg); + return Result.error(errMsg); + } + } + + /** + * 同步IPC设备信息入库 + * @param jsonResponse + * @return + */ + private void syncProjectIpc(String jsonResponse){ + JSONObject jsonObject = new JSONObject(jsonResponse); + if(jsonObject.getInt("error_code").equals(0)){ + JSONObject result = (JSONObject)jsonObject.get("result"); + if(result.getInt("total")>0){ + JSONArray list = result.getJSONArray("list"); + for(int i=0;i暂时无用 **/ IPC_MOTION_CTRL("/tums/ptz/v1/motionCtrl","高速球机移动方向控制"), + /** =================>暂时无用 **/ IPC_GET_ALL_PRESETS("/tums/ptz/v1/getAllPresets","获取高速球机的所有预置点"), IPC_OPERATE_PRESET("/tums/ptz/v1/operatePreset","操作高速球机的预置点"), IPC_GET_ALL_TOURS("/tums/ptz/v1/getAllTours","获取高速球机的所有巡航列表"), diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/utils/TumsApi.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/utils/TumsApi.java index a4b7dd9..12a6944 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/utils/TumsApi.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/utils/TumsApi.java @@ -584,4 +584,17 @@ public class TumsApi { return jsonResponse; } + /** + * 高速球机移动方向控制 + * @param jsonRequest + * @return + */ + public String motionCtrl(String jsonRequest){ + this.createTumsClient(); + log.info("motionCtrl:request:{}",jsonRequest); + String jsonResponse = tumsClient.request(jsonRequest, ApiEnum.IPC_MOTION_CTRL.getValue()); + log.info("motionCtrl:response:{}",jsonResponse); + return jsonResponse; + } + } From 77af84d48baf554a16f393992c4f9cb40692a4bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Mon, 30 Jun 2025 14:34:16 +0800 Subject: [PATCH 6/9] =?UTF-8?q?tplinkapi=E6=8E=A5=E5=8F=A3=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=8F=98=E7=84=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AppCameraInfoController.java | 120 ++---------------- .../iot/tplink/entity/AppCameraInfo.java | 9 ++ .../modules/iot/tplink/enums/AppApiEnum.java | 3 +- .../tplink/service/IAppCameraInfoService.java | 1 + .../impl/AppCameraInfoServiceImpl.java | 30 +++++ .../modules/iot/tplink/utils/AppTumsApi.java | 13 ++ 6 files changed, 69 insertions(+), 107 deletions(-) diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/controller/AppCameraInfoController.java b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/controller/AppCameraInfoController.java index 3f9100f..f8b699e 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/controller/AppCameraInfoController.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/controller/AppCameraInfoController.java @@ -19,14 +19,13 @@ import javax.servlet.http.HttpServletRequest; import java.util.Map; /** -* @Description: 护理单元-物联管理-摄像头信息 +* @Description: API-摄像头信息 * @Author: jeecg-boot * @Date: 2025-01-17 * @Version: V1.0 */ -@Api(tags="护理单元-物联管理-摄像头信息") @RestController -@RequestMapping("/nuIpadApi/iot/tplink/cameraInfo") +@RequestMapping("/api/iot/tplink/cameraInfo") @Slf4j public class AppCameraInfoController extends JeecgController { @Autowired @@ -41,7 +40,6 @@ public class AppCameraInfoController extends JeecgController> queryPageList(AppCameraInfo CameraInfo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -52,7 +50,6 @@ public class AppCameraInfoController extends JeecgController> queryNuPageList(AppCameraInfo CameraInfo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -63,7 +60,6 @@ public class AppCameraInfoController extends JeecgController getByNuId(AppCameraInfo CameraInfo) { AppCameraInfo entity = service.getByNuId(CameraInfo); @@ -71,7 +67,7 @@ public class AppCameraInfoController extends JeecgController getOsdCapability(@RequestBody Map map) { - return service.getOsdCapability(map); - } - /** * 获取OSD参数 * @@ -181,50 +166,6 @@ public class AppCameraInfoController extends JeecgController getTamperDet(@RequestBody Map map) { - return service.getTamperDet(map); - } - - /** - * 设置镜头遮挡参数 - * - * @param map - * @return - */ - @PostMapping(value = "/setTamperDet") - public Result setTamperDet(@RequestBody Map map) { - return service.setTamperDet(map); - } - - /** - * 获取镜头遮挡处理方式 - * - * @param map - * @return - */ - @PostMapping(value = "/getTamperNotif") - public Result getTamperNotif(@RequestBody Map map) { - return service.getTamperNotif(map); - } - - /** - * 设置镜头遮挡处理方式 - * - * @param map - * @return - */ - @PostMapping(value = "/setTamperNotif") - public Result setTamperNotif(@RequestBody Map map) { - return service.setTamperNotif(map); - } - /** * 报警声音试听 * @@ -236,50 +177,6 @@ public class AppCameraInfoController extends JeecgController getAlarmInfo(@RequestBody Map map) { - return service.getAlarmInfo(map); - } - - /** - * 设置白光/声音告警参数 - * - * @param map - * @return - */ - @PostMapping(value = "/setAlarmInfo") - public Result setAlarmInfo(@RequestBody Map map) { - return service.setAlarmInfo(map); - } - - /** - * 获取白光/声音告警布防时间 - * - * @param map - * @return - */ - @PostMapping(value = "/getAlarmPlan") - public Result getAlarmPlan(@RequestBody Map map) { - return service.getAlarmPlan(map); - } - - /** - * 设置白光/声音告警布防时间 - * - * @param map - * @return - */ - @PostMapping(value = "/setAlarmPlan") - public Result setAlarmPlan(@RequestBody Map map) { - return service.setAlarmPlan(map); - } - /** * 搜索某天的录像数据 * @@ -360,4 +257,15 @@ public class AppCameraInfoController extends JeecgController { Result uploadToServer(AppCameraInfo cameraInfo); Result stopUploadToServer(AppCameraInfo cameraInfo); Result getUploadToServerProcess(AppCameraInfo cameraInfo); + Result motionCtrl(AppCameraInfo cameraInfo); } diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/service/impl/AppCameraInfoServiceImpl.java b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/service/impl/AppCameraInfoServiceImpl.java index 2d06c89..ab931ae 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/service/impl/AppCameraInfoServiceImpl.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/service/impl/AppCameraInfoServiceImpl.java @@ -1890,4 +1890,34 @@ public class AppCameraInfoServiceImpl extends ServiceImpl Date: Mon, 30 Jun 2025 14:46:03 +0800 Subject: [PATCH 7/9] =?UTF-8?q?tplinkapi=E6=8E=A5=E5=8F=A3=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=8F=98=E7=84=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/tplink/mapper/xml/AppCameraInfoMapper.xml | 13 ++++++++----- .../tplink/camera/mapper/xml/CameraInfoMapper.xml | 3 +++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/mapper/xml/AppCameraInfoMapper.xml b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/mapper/xml/AppCameraInfoMapper.xml index 7dbb54e..5fa822a 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/mapper/xml/AppCameraInfoMapper.xml +++ b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/mapper/xml/AppCameraInfoMapper.xml @@ -28,7 +28,7 @@ a.nu_id as nuId, b.nu_name as nuName, ifnull(c.multitrans,0) as multitrans - from nu_iot_tplink_camera a left join nu_base_info b on a.nu_id = b.id + from nu_iot_tplink_camera a left join nu_base_info b on a.nu_id = b.nu_id left join nu_iot_tplink_camera_capability c on a.device_index = c.device_index @@ -46,6 +46,9 @@ AND a.region_name LIKE concat('%',#{params.regionName},'%') + + AND a.nu_id = #{params.nuId} + AND b.nu_name LIKE concat('%',#{params.nuName},'%') @@ -87,12 +90,12 @@ @@ -154,7 +157,7 @@ protocol as protocol, a.nu_id as nuId, b.nu_name as nuName - from nu_iot_tplink_camera a left join nu_base_info b on a.nu_id = b.id + from nu_iot_tplink_camera a left join nu_base_info b on a.nu_id = b.nu_id where a.nu_id = #{nuId} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml index c766dde..82addc1 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml @@ -47,6 +47,9 @@ AND a.region_name LIKE concat('%',#{params.regionName},'%') + + AND a.nu_id = #{params.nuId} + AND b.nu_name LIKE concat('%',#{params.nuName},'%') From dacc88c6d2255514835d280f2f2edb244a2aaa1d Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Mon, 30 Jun 2025 14:54:37 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../electricity/controller/ElectricityMeterController.java | 6 +++++- .../nu/modules/tq/electricity/entity/ElectricityMeter.java | 2 ++ .../modules/tq/water/controller/WaterMeterController.java | 6 +++++- .../java/com/nu/modules/tq/water/entity/WaterMeter.java | 6 ++---- .../com/nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml | 6 +++--- .../yiweilian/humid/controller/HumidDeviceController.java | 6 +++++- .../com/nu/modules/yiweilian/humid/entity/HumidDevice.java | 2 ++ 7 files changed, 24 insertions(+), 10 deletions(-) diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/controller/ElectricityMeterController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/controller/ElectricityMeterController.java index 4badd1a..fa5d769 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/controller/ElectricityMeterController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/controller/ElectricityMeterController.java @@ -1,14 +1,17 @@ package com.nu.modules.tq.electricity.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 com.nu.modules.tq.electricity.entity.ElectricityMeter; import com.nu.modules.tq.electricity.service.IElectricityMeterService; +import com.nu.modules.tq.water.entity.WaterMeter; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; 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.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -37,7 +40,8 @@ public class ElectricityMeterController extends JeecgController page = new Page(pageNo, pageSize); - IPage pageList = service.findPage(page, electricityMeter); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(electricityMeter, req.getParameterMap()); + IPage pageList = service.page(page, queryWrapper); return Result.OK(pageList); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/entity/ElectricityMeter.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/entity/ElectricityMeter.java index f9d6eb7..4576d60 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/entity/ElectricityMeter.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/entity/ElectricityMeter.java @@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.jeecg.common.aspect.annotation.Dict; import org.jeecgframework.poi.excel.annotation.Excel; import java.io.Serializable; @@ -67,6 +68,7 @@ public class ElectricityMeter implements Serializable { @ApiModelProperty(value = "描述") private String remark; + @Dict(dicCode = "nu_id", dicText = "nu_name", dictTable = "nu_base_info") private String nuId;//护理单元ID private String nuName;//护理单元 private String departId;//机构ID diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/controller/WaterMeterController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/controller/WaterMeterController.java index 831ef38..01d6b1c 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/controller/WaterMeterController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/controller/WaterMeterController.java @@ -1,12 +1,15 @@ package com.nu.modules.tq.water.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 com.nu.modules.tq.water.entity.WaterMeter; import com.nu.modules.tq.water.service.IWaterMeterService; +import com.nu.modules.yiweilian.humid.entity.HumidDevice; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -37,7 +40,8 @@ public class WaterMeterController extends JeecgController page = new Page(pageNo, pageSize); - IPage pageList = service.findPage(page, waterMeter); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(waterMeter, req.getParameterMap()); + IPage pageList = service.page(page, queryWrapper); return Result.OK(pageList); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/entity/WaterMeter.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/entity/WaterMeter.java index 70a4995..3a74eb8 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/entity/WaterMeter.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/entity/WaterMeter.java @@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.jeecg.common.aspect.annotation.Dict; import org.jeecgframework.poi.excel.annotation.Excel; import java.io.Serializable; @@ -70,12 +71,9 @@ public class WaterMeter implements Serializable { @ApiModelProperty(value = "描述") private String remark; - @TableField(exist = false) + @Dict(dicCode = "nu_id", dicText = "nu_name", dictTable = "nu_base_info") private String nuId;//护理单元ID - @TableField(exist = false) private String nuName;//护理单元 - @TableField(exist = false) private String departId;//机构ID - @TableField(exist = false) private String departName;//机构名称 } \ No newline at end of file diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml index 394ba3f..5b7f4c8 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml @@ -24,13 +24,13 @@ left join nu_iot_tq_collector b on a.cid = b.cid - AND a.address = #{params.address} + AND a.address like concat('%',#{params.address},'%') - AND a.nuId = #{params.nuId} + AND a.nu_id = #{params.nuId} - AND a.departId = #{params.departId} + AND a.depart_id = #{params.departId} AND a.relay_state = #{params.relayState} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/controller/HumidDeviceController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/controller/HumidDeviceController.java index 3bbd004..a349f72 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/controller/HumidDeviceController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/controller/HumidDeviceController.java @@ -1,7 +1,9 @@ package com.nu.modules.yiweilian.humid.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 com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog; import com.nu.modules.tq.water.entity.WaterMeter; import com.nu.modules.yiweilian.humid.entity.HumidDevice; import com.nu.modules.yiweilian.humid.service.IHumidDeviceService; @@ -9,6 +11,7 @@ import lombok.extern.slf4j.Slf4j; 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.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; @@ -36,7 +39,8 @@ public class HumidDeviceController extends JeecgController page = new Page(pageNo, pageSize); - IPage pageList = service.findPage(page, humidDevice); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(humidDevice, req.getParameterMap()); + IPage pageList = service.page(page, queryWrapper); return Result.OK(pageList); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/entity/HumidDevice.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/entity/HumidDevice.java index 04b06ab..8af0d59 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/entity/HumidDevice.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/entity/HumidDevice.java @@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.jeecg.common.aspect.annotation.Dict; import org.jeecgframework.poi.excel.annotation.Excel; import java.io.Serializable; @@ -105,6 +106,7 @@ public class HumidDevice implements Serializable { @TableField(exist = false) private Integer alarmCn; //告警数量 + @Dict(dicCode = "nu_id", dicText = "nu_name", dictTable = "nu_base_info") private String nuId;//护理单元ID private String nuName;//护理单元 private String departId;//机构ID From c8e4a15e07f7c8e79aeb364d750a28fc0e59b0d0 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Mon, 30 Jun 2025 15:27:47 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=A4=B9=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ller.java => ApiRequestLogController.java} | 40 ++--- ...qApiRequestLog.java => ApiRequestLog.java} | 2 +- ...ogMapper.java => ApiRequestLogMapper.java} | 4 +- .../mapper/xml/ApiRequestLogMapper.xml} | 2 +- .../mapper/xml/NuIotTqApiRequestLogMapper.xml | 5 - ...ervice.java => IApiRequestLogService.java} | 4 +- .../impl/ApiRequestLogServiceImpl.java | 19 ++ .../impl/NuIotTqApiRequestLogServiceImpl.java | 19 -- .../ElectricityMeterController.java | 8 - .../service/IElectricityMeterService.java | 1 - .../impl/ElectricityMeterServiceImpl.java | 74 -------- .../NuIotTqElectricitySyncLogController.java | 163 ------------------ .../entity/NuIotTqElectricitySyncLog.java | 100 ----------- .../NuIotTqElectricitySyncLogMapper.java | 14 -- .../INuIotTqElectricitySyncLogService.java | 14 -- .../NuIotTqElectricitySyncLogServiceImpl.java | 19 -- .../service/impl/WaterMeterServiceImpl.java | 5 - .../controller/HumidDeviceController.java | 9 - .../humid/service/IHumidDeviceService.java | 2 - .../service/impl/HumidDeviceServiceImpl.java | 75 -------- 20 files changed, 45 insertions(+), 534 deletions(-) rename nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/controller/{NuIotTqApiRequestLogController.java => ApiRequestLogController.java} (79%) rename nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/entity/{NuIotTqApiRequestLog.java => ApiRequestLog.java} (98%) rename nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/{NuIotTqApiRequestLogMapper.java => ApiRequestLogMapper.java} (57%) rename nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/{syncLog/mapper/xml/NuIotTqElectricitySyncLogMapper.xml => apiRequestLog/mapper/xml/ApiRequestLogMapper.xml} (64%) delete mode 100644 nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/xml/NuIotTqApiRequestLogMapper.xml rename nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/{INuIotTqApiRequestLogService.java => IApiRequestLogService.java} (58%) create mode 100644 nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/impl/ApiRequestLogServiceImpl.java delete mode 100644 nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/impl/NuIotTqApiRequestLogServiceImpl.java delete mode 100644 nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/controller/NuIotTqElectricitySyncLogController.java delete mode 100644 nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/entity/NuIotTqElectricitySyncLog.java delete mode 100644 nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/mapper/NuIotTqElectricitySyncLogMapper.java delete mode 100644 nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/INuIotTqElectricitySyncLogService.java delete mode 100644 nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/impl/NuIotTqElectricitySyncLogServiceImpl.java diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/controller/NuIotTqApiRequestLogController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/controller/ApiRequestLogController.java similarity index 79% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/controller/NuIotTqApiRequestLogController.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/controller/ApiRequestLogController.java index c26a000..1c9d04c 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/controller/NuIotTqApiRequestLogController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/controller/ApiRequestLogController.java @@ -10,8 +10,8 @@ import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryRuleEnum; -import com.nu.modules.tq.apiRequestLog.entity.NuIotTqApiRequestLog; -import com.nu.modules.tq.apiRequestLog.service.INuIotTqApiRequestLogService; +import com.nu.modules.tq.apiRequestLog.entity.ApiRequestLog; +import com.nu.modules.tq.apiRequestLog.service.IApiRequestLogService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -35,11 +35,11 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; */ @Api(tags="api请求日志") @RestController -@RequestMapping("/nuIotTqApiRequestLog/nuIotTqApiRequestLog") +@RequestMapping("/iot/tq/ApiRequestLog") @Slf4j -public class NuIotTqApiRequestLogController extends JeecgController { +public class ApiRequestLogController extends JeecgController { @Autowired - private INuIotTqApiRequestLogService nuIotTqApiRequestLogService; + private IApiRequestLogService nuIotTqApiRequestLogService; /** * 分页列表查询 @@ -53,26 +53,26 @@ public class NuIotTqApiRequestLogController extends JeecgController> queryPageList(NuIotTqApiRequestLog nuIotTqApiRequestLog, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { + public Result> queryPageList(ApiRequestLog nuIotTqApiRequestLog, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { // 自定义查询规则 Map customeRuleMap = new HashMap<>(); // 自定义多选的查询规则为：LIKE_WITH_OR customeRuleMap.put("type", QueryRuleEnum.LIKE_WITH_OR); customeRuleMap.put("requestStatus", QueryRuleEnum.LIKE_WITH_OR); customeRuleMap.put("resolveStatus", QueryRuleEnum.LIKE_WITH_OR); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(nuIotTqApiRequestLog, req.getParameterMap(),customeRuleMap); - Page page = new Page(pageNo, pageSize); - IPage pageList = nuIotTqApiRequestLogService.page(page, queryWrapper); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(nuIotTqApiRequestLog, req.getParameterMap(),customeRuleMap); + Page page = new Page(pageNo, pageSize); + IPage pageList = nuIotTqApiRequestLogService.page(page, queryWrapper); // 获取当前时间 Calendar calendar = Calendar.getInstance(); // 减去5分钟 calendar.add(Calendar.MINUTE, -5); // 转换为Date对象 Date fiveMinutesAgo = calendar.getTime(); - for(NuIotTqApiRequestLog par:pageList.getRecords()){ + for(ApiRequestLog par:pageList.getRecords()){ String dateStr = par.getRequestTime(); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Date date = null; @@ -122,7 +122,7 @@ public class NuIotTqApiRequestLogController extends JeecgController add(@RequestBody NuIotTqApiRequestLog nuIotTqApiRequestLog) { + public Result add(@RequestBody ApiRequestLog nuIotTqApiRequestLog) { nuIotTqApiRequestLogService.save(nuIotTqApiRequestLog); return Result.OK("添加成功！"); } @@ -137,7 +137,7 @@ public class NuIotTqApiRequestLogController extends JeecgController edit(@RequestBody NuIotTqApiRequestLog nuIotTqApiRequestLog) { + public Result edit(@RequestBody ApiRequestLog nuIotTqApiRequestLog) { nuIotTqApiRequestLogService.updateById(nuIotTqApiRequestLog); return Result.OK("编辑成功!"); } @@ -181,8 +181,8 @@ public class NuIotTqApiRequestLogController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { - NuIotTqApiRequestLog nuIotTqApiRequestLog = nuIotTqApiRequestLogService.getById(id); + public Result queryById(@RequestParam(name="id",required=true) String id) { + ApiRequestLog nuIotTqApiRequestLog = nuIotTqApiRequestLogService.getById(id); if(nuIotTqApiRequestLog==null) { return Result.error("未找到对应数据"); } @@ -197,8 +197,8 @@ public class NuIotTqApiRequestLogController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, NuIotTqApiRequestLog.class); + return super.importExcel(request, response, ApiRequestLog.class); } } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/entity/NuIotTqApiRequestLog.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/entity/ApiRequestLog.java similarity index 98% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/entity/NuIotTqApiRequestLog.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/entity/ApiRequestLog.java index 2d94c75..1570975 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/entity/NuIotTqApiRequestLog.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/entity/ApiRequestLog.java @@ -27,7 +27,7 @@ import lombok.experimental.Accessors; @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @ApiModel(value="nu_iot_tq_api_request_log对象", description="api请求日志") -public class NuIotTqApiRequestLog implements Serializable { +public class ApiRequestLog implements Serializable { private static final long serialVersionUID = 1L; /**id*/ diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/NuIotTqApiRequestLogMapper.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/ApiRequestLogMapper.java similarity index 57% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/NuIotTqApiRequestLogMapper.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/ApiRequestLogMapper.java index 1f12182..0b9d19b 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/NuIotTqApiRequestLogMapper.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/ApiRequestLogMapper.java @@ -1,6 +1,6 @@ package com.nu.modules.tq.apiRequestLog.mapper; -import com.nu.modules.tq.apiRequestLog.entity.NuIotTqApiRequestLog; +import com.nu.modules.tq.apiRequestLog.entity.ApiRequestLog; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** @@ -9,6 +9,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @Date: 2025-06-10 * @Version: V1.0 */ -public interface NuIotTqApiRequestLogMapper extends BaseMapper { +public interface ApiRequestLogMapper extends BaseMapper { } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/mapper/xml/NuIotTqElectricitySyncLogMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/xml/ApiRequestLogMapper.xml similarity index 64% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/mapper/xml/NuIotTqElectricitySyncLogMapper.xml rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/xml/ApiRequestLogMapper.xml index b441196..e64f87a 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/mapper/xml/NuIotTqElectricitySyncLogMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/xml/ApiRequestLogMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/xml/NuIotTqApiRequestLogMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/xml/NuIotTqApiRequestLogMapper.xml deleted file mode 100644 index 4706e40..0000000 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/xml/NuIotTqApiRequestLogMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/INuIotTqApiRequestLogService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/IApiRequestLogService.java similarity index 58% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/INuIotTqApiRequestLogService.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/IApiRequestLogService.java index 506afcd..ff2a8d1 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/INuIotTqApiRequestLogService.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/IApiRequestLogService.java @@ -1,6 +1,6 @@ package com.nu.modules.tq.apiRequestLog.service; -import com.nu.modules.tq.apiRequestLog.entity.NuIotTqApiRequestLog; +import com.nu.modules.tq.apiRequestLog.entity.ApiRequestLog; import com.baomidou.mybatisplus.extension.service.IService; /** @@ -9,6 +9,6 @@ import com.baomidou.mybatisplus.extension.service.IService; * @Date: 2025-06-10 * @Version: V1.0 */ -public interface INuIotTqApiRequestLogService extends IService { +public interface IApiRequestLogService extends IService { } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/impl/ApiRequestLogServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/impl/ApiRequestLogServiceImpl.java new file mode 100644 index 0000000..ae13657 --- /dev/null +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/impl/ApiRequestLogServiceImpl.java @@ -0,0 +1,19 @@ +package com.nu.modules.tq.apiRequestLog.service.impl; + +import com.nu.modules.tq.apiRequestLog.entity.ApiRequestLog; +import com.nu.modules.tq.apiRequestLog.mapper.ApiRequestLogMapper; +import com.nu.modules.tq.apiRequestLog.service.IApiRequestLogService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: api请求日志 + * @Author: jeecg-boot + * @Date: 2025-06-10 + * @Version: V1.0 + */ +@Service +public class ApiRequestLogServiceImpl extends ServiceImpl implements IApiRequestLogService { + +} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/impl/NuIotTqApiRequestLogServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/impl/NuIotTqApiRequestLogServiceImpl.java deleted file mode 100644 index 1437058..0000000 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/impl/NuIotTqApiRequestLogServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.nu.modules.tq.apiRequestLog.service.impl; - -import com.nu.modules.tq.apiRequestLog.entity.NuIotTqApiRequestLog; -import com.nu.modules.tq.apiRequestLog.mapper.NuIotTqApiRequestLogMapper; -import com.nu.modules.tq.apiRequestLog.service.INuIotTqApiRequestLogService; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -/** - * @Description: api请求日志 - * @Author: jeecg-boot - * @Date: 2025-06-10 - * @Version: V1.0 - */ -@Service -public class NuIotTqApiRequestLogServiceImpl extends ServiceImpl implements INuIotTqApiRequestLogService { - -} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/controller/ElectricityMeterController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/controller/ElectricityMeterController.java index fa5d769..da5323e 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/controller/ElectricityMeterController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/controller/ElectricityMeterController.java @@ -84,12 +84,4 @@ public class ElectricityMeterController extends JeecgController syncElectricity(@RequestBody ElectricityMeter electricityMeter) { - String dataSourceCode = electricityMeter.getDepartServerUrl(); - service.syncElectricity(dataSourceCode,electricityMeter); - return Result.OK("同步成功!"); - } } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/IElectricityMeterService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/IElectricityMeterService.java index 592d643..87565bc 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/IElectricityMeterService.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/IElectricityMeterService.java @@ -19,7 +19,6 @@ public interface IElectricityMeterService extends IService { String eleControlNotify(String response_content, String timestamp, String sign); String eleReadNotify(String response_content, String timestamp, String sign); - void syncElectricity(String dataSourceCode, ElectricityMeter electricityMeter); void editHldy(ElectricityMeter electricityMeter); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/impl/ElectricityMeterServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/impl/ElectricityMeterServiceImpl.java index 48f512e..b49919e 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/impl/ElectricityMeterServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/impl/ElectricityMeterServiceImpl.java @@ -8,8 +8,6 @@ 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 com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog; -import com.nu.modules.tq.syncLog.service.INuIotTqElectricitySyncLogService; import com.nu.modules.tq.common.entity.TqApiLog; import com.nu.modules.tq.common.service.ITqApiLogService; import com.nu.modules.tq.utils.HttpTool; @@ -37,8 +35,6 @@ public class ElectricityMeterServiceImpl extends ServiceImpl { - @Autowired - private INuIotTqElectricitySyncLogService nuIotTqElectricitySyncLogService; - - /** - * 分页列表查询 - * - * @param nuIotTqElectricitySyncLog - * @param pageNo - * @param pageSize - * @param req - * @return - */ - //@AutoLog(value = "同步日志-分页列表查询") - @ApiOperation(value="同步日志-分页列表查询", notes="同步日志-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(NuIotTqElectricitySyncLog nuIotTqElectricitySyncLog, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(nuIotTqElectricitySyncLog, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = nuIotTqElectricitySyncLogService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 添加 - * - * @param nuIotTqElectricitySyncLog - * @return - */ - @AutoLog(value = "同步日志-添加") - @ApiOperation(value="同步日志-添加", notes="同步日志-添加") - @RequiresPermissions("nuIotTqElectricitySyncLog:nu_iot_tq_electricity_sync_log:add") - @PostMapping(value = "/add") - public Result add(@RequestBody NuIotTqElectricitySyncLog nuIotTqElectricitySyncLog) { - nuIotTqElectricitySyncLogService.save(nuIotTqElectricitySyncLog); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param nuIotTqElectricitySyncLog - * @return - */ - @AutoLog(value = "同步日志-编辑") - @ApiOperation(value="同步日志-编辑", notes="同步日志-编辑") - @RequiresPermissions("nuIotTqElectricitySyncLog:nu_iot_tq_electricity_sync_log:edit") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody NuIotTqElectricitySyncLog nuIotTqElectricitySyncLog) { - nuIotTqElectricitySyncLogService.updateById(nuIotTqElectricitySyncLog); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "同步日志-通过id删除") - @ApiOperation(value="同步日志-通过id删除", notes="同步日志-通过id删除") - @RequiresPermissions("nuIotTqElectricitySyncLog:nu_iot_tq_electricity_sync_log:delete") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - nuIotTqElectricitySyncLogService.removeById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "同步日志-批量删除") - @ApiOperation(value="同步日志-批量删除", notes="同步日志-批量删除") - @RequiresPermissions("nuIotTqElectricitySyncLog:nu_iot_tq_electricity_sync_log:deleteBatch") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.nuIotTqElectricitySyncLogService.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) { - NuIotTqElectricitySyncLog nuIotTqElectricitySyncLog = nuIotTqElectricitySyncLogService.getById(id); - if(nuIotTqElectricitySyncLog==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(nuIotTqElectricitySyncLog); - } - - /** - * 导出excel - * - * @param request - * @param nuIotTqElectricitySyncLog - */ - @RequiresPermissions("nuIotTqElectricitySyncLog:nu_iot_tq_electricity_sync_log:exportXls") - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, NuIotTqElectricitySyncLog nuIotTqElectricitySyncLog) { - return super.exportXls(request, nuIotTqElectricitySyncLog, NuIotTqElectricitySyncLog.class, "同步日志"); - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @RequiresPermissions("nuIotTqElectricitySyncLog:nu_iot_tq_electricity_sync_log:importExcel") - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, NuIotTqElectricitySyncLog.class); - } - -} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/entity/NuIotTqElectricitySyncLog.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/entity/NuIotTqElectricitySyncLog.java deleted file mode 100644 index c2d93c8..0000000 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/entity/NuIotTqElectricitySyncLog.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.nu.modules.tq.syncLog.entity; - -import java.io.Serializable; -import java.util.Date; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * @Description: 同步日志 - * @Author: jeecg-boot - * @Date: 2025-06-12 - * @Version: V1.0 - */ -@Data -@TableName("nu_iot_tq_electricity_sync_log") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="nu_iot_tq_electricity_sync_log对象", description="同步日志") -public class NuIotTqElectricitySyncLog implements Serializable { - private static final long serialVersionUID = 1L; - - /**id*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "id") - private String id; - /**createBy*/ - @ApiModelProperty(value = "createBy") - private String createBy; - /**createTime*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "createTime") - private Date createTime; - /**updateBy*/ - @ApiModelProperty(value = "updateBy") - private String updateBy; - /**updateTime*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "updateTime") - private Date updateTime; - /**主表id*/ - @Excel(name = "主表id", width = 15) - @ApiModelProperty(value = "主表id") - private String mainId; - /**主表名称*/ - @Excel(name = "主表名称", width = 15) - @ApiModelProperty(value = "主表名称") - private String mainName; - /**同步类型*/ - @Excel(name = "同步类型", width = 15) - @ApiModelProperty(value = "同步类型") - private String syncType; - /**原机构id*/ - @Excel(name = "原机构id", width = 15) - @ApiModelProperty(value = "原机构id") - private String orgId; - /**原机构名称*/ - @Excel(name = "原机构名称", width = 15) - @ApiModelProperty(value = "原机构名称") - private String orgName; - /**原机构编码*/ - @Excel(name = "原机构编码", width = 15) - @ApiModelProperty(value = "原机构编码") - private String orgCode; - /**新机构id*/ - @Excel(name = "新机构id", width = 15) - @ApiModelProperty(value = "新机构id") - private String newOrgId; - /**新机构名称*/ - @Excel(name = "新机构名称", width = 15) - @ApiModelProperty(value = "新机构名称") - private String newOrgName; - /**新机构编码*/ - @Excel(name = "新机构编码", width = 15) - @ApiModelProperty(value = "新机构编码") - private String newOrgCode; - /**状态*/ - @Excel(name = "状态", width = 15) - @ApiModelProperty(value = "状态") - private String status; - /**备注*/ - @Excel(name = "备注", width = 15) - @ApiModelProperty(value = "备注") - private String content; - /**服务类型*/ - @Excel(name = "服务类型", width = 15) - @ApiModelProperty(value = "服务类型") - private String serverType; -} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/mapper/NuIotTqElectricitySyncLogMapper.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/mapper/NuIotTqElectricitySyncLogMapper.java deleted file mode 100644 index 459ca0b..0000000 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/mapper/NuIotTqElectricitySyncLogMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.nu.modules.tq.syncLog.mapper; - -import com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 同步日志 - * @Author: jeecg-boot - * @Date: 2025-06-12 - * @Version: V1.0 - */ -public interface NuIotTqElectricitySyncLogMapper extends BaseMapper { - -} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/INuIotTqElectricitySyncLogService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/INuIotTqElectricitySyncLogService.java deleted file mode 100644 index c68c1e8..0000000 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/INuIotTqElectricitySyncLogService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.nu.modules.tq.syncLog.service; - -import com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * @Description: 同步日志 - * @Author: jeecg-boot - * @Date: 2025-06-12 - * @Version: V1.0 - */ -public interface INuIotTqElectricitySyncLogService extends IService { - -} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/impl/NuIotTqElectricitySyncLogServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/impl/NuIotTqElectricitySyncLogServiceImpl.java deleted file mode 100644 index b62ed93..0000000 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/impl/NuIotTqElectricitySyncLogServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.nu.modules.tq.syncLog.service.impl; - -import com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog; -import com.nu.modules.tq.syncLog.mapper.NuIotTqElectricitySyncLogMapper; -import com.nu.modules.tq.syncLog.service.INuIotTqElectricitySyncLogService; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -/** - * @Description: 同步日志 - * @Author: jeecg-boot - * @Date: 2025-06-12 - * @Version: V1.0 - */ -@Service -public class NuIotTqElectricitySyncLogServiceImpl extends ServiceImpl implements INuIotTqElectricitySyncLogService { - -} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java index 3c8a1b2..100f03e 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java @@ -8,8 +8,6 @@ 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 com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog; -import com.nu.modules.tq.syncLog.service.INuIotTqElectricitySyncLogService; import com.nu.modules.tq.common.entity.TqApiLog; import com.nu.modules.tq.common.service.ITqApiLogService; import com.nu.modules.tq.utils.HttpTool; @@ -19,7 +17,6 @@ import com.nu.modules.tq.water.entity.WaterMeter; import com.nu.modules.tq.water.mapper.WaterMeterMapper; import com.nu.modules.tq.water.service.IWaterMeterService; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; @@ -38,8 +35,6 @@ public class WaterMeterServiceImpl extends ServiceImpl syncHumidDevice(@RequestBody HumidDevice humidDevice) { - String dataSourceCode = humidDevice.getDepartServerUrl(); - service.syncHumidDevice(dataSourceCode,humidDevice); - return Result.OK("同步成功!"); - } } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/IHumidDeviceService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/IHumidDeviceService.java index a28145d..c2533f1 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/IHumidDeviceService.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/IHumidDeviceService.java @@ -16,7 +16,5 @@ public interface IHumidDeviceService extends IService { Result getDeviceParameters(HumidDevice humidDevice); IPage findLogPage(Page page, HumidDevice humidDevice); - void syncHumidDevice(String dataSourceCode, HumidDevice humidDevice); - void editHldy(HumidDevice humidDevice); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java index 044ae88..1384a06 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java @@ -8,14 +8,11 @@ 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 com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog; -import com.nu.modules.tq.syncLog.service.INuIotTqElectricitySyncLogService; import com.nu.modules.yiweilian.humid.entity.HumidDevice; import com.nu.modules.yiweilian.humid.mapper.HumidDeviceMapper; import com.nu.modules.yiweilian.humid.service.IHumidDeviceService; import com.nu.modules.yiweilian.utils.YiweilianApi; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang.StringUtils; import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.vo.LoginUser; @@ -36,8 +33,6 @@ public class HumidDeviceServiceImpl extends ServiceImpl