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);