From 43b88952d2594fd3c487402ed8d777c19fce3066 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Wed, 27 Aug 2025 15:14:49 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=95=BF=E8=80=85=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=87=E7=AD=BE=E5=A4=87=E4=BB=BD=202?= =?UTF-8?q?=E3=80=81=E9=95=BF=E8=80=85=E6=A0=87=E7=AD=BE=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=85=203?= =?UTF-8?q?=E3=80=81=E8=B0=83=E6=95=B4=E9=95=BF=E8=80=85=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E5=90=84=E7=95=8C=E9=9D=A2=E8=BE=B9=E8=B7=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nu/job/elder/ServiceElderBkJob.java | 76 +++++++ .../nu/job/elder/ServiceElderCleanBkJob.java | 35 ++++ .../controller/ElderBkItemController.java | 195 ++++++++++++++++++ .../controller/ElderBkMainController.java | 170 +++++++++++++++ .../modules/elderbk/entity/ElderBkItem.java | 143 +++++++++++++ .../modules/elderbk/entity/ElderBkMain.java | 46 +++++ .../elderbk/mapper/ElderBkItemMapper.java | 15 ++ .../elderbk/mapper/ElderBkMainMapper.java | 15 ++ .../elderbk/mapper/xml/ElderBkItemMapper.xml | 12 ++ .../elderbk/mapper/xml/ElderBkMainMapper.xml | 12 ++ .../elderbk/service/IElderBkItemService.java | 15 ++ .../elderbk/service/IElderBkMainService.java | 15 ++ .../service/impl/ElderBkItemServiceImpl.java | 26 +++ .../service/impl/ElderBkMainServiceImpl.java | 26 +++ .../controller/ElderTagController.java | 7 + .../nu/modules/eldertag/entity/ElderTag.java | 2 + .../service/impl/ElderTagServiceImpl.java | 1 + .../mapper/xml/DirectiveBkItemMapper.xml | 2 +- .../mapper/xml/DirectiveBkMainMapper.xml | 2 +- 19 files changed, 813 insertions(+), 2 deletions(-) create mode 100644 nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/job/elder/ServiceElderBkJob.java create mode 100644 nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/job/elder/ServiceElderCleanBkJob.java create mode 100644 nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/controller/ElderBkItemController.java create mode 100644 nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/controller/ElderBkMainController.java create mode 100644 nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/entity/ElderBkItem.java create mode 100644 nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/entity/ElderBkMain.java create mode 100644 nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/mapper/ElderBkItemMapper.java create mode 100644 nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/mapper/ElderBkMainMapper.java create mode 100644 nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/mapper/xml/ElderBkItemMapper.xml create mode 100644 nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/mapper/xml/ElderBkMainMapper.xml create mode 100644 nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/service/IElderBkItemService.java create mode 100644 nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/service/IElderBkMainService.java create mode 100644 nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/service/impl/ElderBkItemServiceImpl.java create mode 100644 nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/service/impl/ElderBkMainServiceImpl.java diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/job/elder/ServiceElderBkJob.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/job/elder/ServiceElderBkJob.java new file mode 100644 index 0000000..4b5ed7e --- /dev/null +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/job/elder/ServiceElderBkJob.java @@ -0,0 +1,76 @@ +package com.nu.job.elder; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.IdUtil; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; +import com.nu.modules.elderbk.entity.ElderBkItem; +import com.nu.modules.elderbk.entity.ElderBkMain; +import com.nu.modules.elderbk.service.IElderBkItemService; +import com.nu.modules.elderbk.service.IElderBkMainService; +import com.nu.modules.eldertag.entity.ElderTag; +import com.nu.modules.eldertag.service.IElderTagService; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.system.api.ISysBaseAPI; +import org.quartz.Job; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.stream.Collectors; + +/** + * 长者标签备份 + */ +@Slf4j +@Component +public class ServiceElderBkJob implements Job { + + @Autowired + private IElderTagService elderTagService; + @Autowired + private ISysBaseAPI sysBaseAPI; + @Autowired + private IElderBkMainService bkMainService; + @Autowired + private IElderBkItemService bkItemService; + + /** + * 备份各机构长者标签 + * @param jobExecutionContext + * @throws JobExecutionException + */ + @Override + public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { + List orgList = sysBaseAPI.queryOpeDept(); + List codes = orgList.stream().map(o -> o.getString("code")).collect(Collectors.toList()); + String currentOrgCode = ""; + for (int i = 0; i < codes.size(); i++) { + currentOrgCode = codes.get(i); + try { + DynamicDataSourceContextHolder.push(codes.get(i)); + List list = elderTagService.lambdaQuery().list(); + DynamicDataSourceContextHolder.clear(); + if(list!=null && list.size()>0){ + //增加长者标签主备份记录 + ElderBkMain elderBkMain = new ElderBkMain(); + elderBkMain.setOrgCode(codes.get(i)); + bkMainService.save(elderBkMain); + //增加对应机构的长者标签到备份子表中 + List needAddList = BeanUtil.copyToList(list, ElderBkItem.class); + needAddList.forEach(d -> { + d.setElderId(d.getId()); + d.setPkid(elderBkMain.getId()); + d.setId(IdUtil.simpleUUID()); + }); + bkItemService.saveBatch(needAddList); + } + } catch (Exception e) { + log.info("备份机构【{}】的长者标签时报错",currentOrgCode,e); + e.printStackTrace(); + } + } + } +} diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/job/elder/ServiceElderCleanBkJob.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/job/elder/ServiceElderCleanBkJob.java new file mode 100644 index 0000000..b311ed1 --- /dev/null +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/job/elder/ServiceElderCleanBkJob.java @@ -0,0 +1,35 @@ +package com.nu.job.elder; + +import com.nu.modules.elderbk.service.IElderBkItemService; +import com.nu.modules.elderbk.service.IElderBkMainService; +import lombok.extern.slf4j.Slf4j; +import org.quartz.Job; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 清理长者标签备份 + */ +@Slf4j +@Component +public class ServiceElderCleanBkJob implements Job { + + @Autowired + private IElderBkMainService bkMainService; + @Autowired + private IElderBkItemService bkItemService; + + /** + * 备份各机构长者标签 + * + * @param jobExecutionContext + * @throws JobExecutionException + */ + @Override + public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { + bkItemService.cleanBkByPhysical(); + bkMainService.cleanBkByPhysical(); + } +} diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/controller/ElderBkItemController.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/controller/ElderBkItemController.java new file mode 100644 index 0000000..c7b9e48 --- /dev/null +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/controller/ElderBkItemController.java @@ -0,0 +1,195 @@ +package com.nu.modules.elderbk.controller; + +import java.text.SimpleDateFormat; +import java.util.Arrays; +import java.util.List; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.nu.utils.DictUtils; +import org.apache.shiro.SecurityUtils; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.vo.LoginUser; +import com.nu.modules.elderbk.entity.ElderBkItem; +import com.nu.modules.elderbk.service.IElderBkItemService; + +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.jeecg.config.JeecgBaseConfig; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +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.servlet.ModelAndView; +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-08-25 + * @Version: V1.0 + */ +@Api(tags = "长者标签备份子表") +@RestController +@RequestMapping("/elderbk/elderBkItem") +@Slf4j +public class ElderBkItemController extends JeecgController { + @Autowired + private IElderBkItemService elderBkItemService; + @Resource + private JeecgBaseConfig jeecgBaseConfig; + @Autowired + private DictUtils dictUtils; + + /** + * 分页列表查询 + * + * @param elderBkItem + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "长者标签备份子表-分页列表查询") + @ApiOperation(value = "长者标签备份子表-分页列表查询", notes = "长者标签备份子表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(ElderBkItem elderBkItem, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(elderBkItem, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = elderBkItemService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param elderBkItem + * @return + */ + @AutoLog(value = "长者标签备份子表-添加") + @ApiOperation(value = "长者标签备份子表-添加", notes = "长者标签备份子表-添加") + @RequiresPermissions("elderbk:nu_elder_bk_item:add") + @PostMapping(value = "/add") + public Result add(@RequestBody ElderBkItem elderBkItem) { + elderBkItemService.save(elderBkItem); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param elderBkItem + * @return + */ + @AutoLog(value = "长者标签备份子表-编辑") + @ApiOperation(value = "长者标签备份子表-编辑", notes = "长者标签备份子表-编辑") + @RequiresPermissions("elderbk:nu_elder_bk_item:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) + public Result edit(@RequestBody ElderBkItem elderBkItem) { + elderBkItemService.updateById(elderBkItem); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "长者标签备份子表-通过id删除") + @ApiOperation(value = "长者标签备份子表-通过id删除", notes = "长者标签备份子表-通过id删除") + @RequiresPermissions("elderbk:nu_elder_bk_item:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name = "id", required = true) String id) { + elderBkItemService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "长者标签备份子表-批量删除") + @ApiOperation(value = "长者标签备份子表-批量删除", notes = "长者标签备份子表-批量删除") + @RequiresPermissions("elderbk:nu_elder_bk_item:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + this.elderBkItemService.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) { + ElderBkItem elderBkItem = elderBkItemService.getById(id); + if (elderBkItem == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(elderBkItem); + } + + /** + * 导出excel + * + * @param request + * @param elderBkItem + */ + @RequiresPermissions("elderbk:nu_elder_bk_item:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ElderBkItem elderBkItem) { + String title = "长者标签备份，备份时间：" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(elderBkItem.getCreateTime_()); + QueryWrapper queryWrapper = new QueryWrapper<>(); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + + queryWrapper.eq("pkid", elderBkItem.getExportPkId()); + List exportList = service.list(queryWrapper); + for (ElderBkItem et : exportList) { + et.setType(dictUtils.translateDictValue("elder_tag_type",et.getType())); + } + + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + //此处设置的filename无效 ,前端会重更新设置一下 + mv.addObject(NormalExcelConstants.FILE_NAME, title); + mv.addObject(NormalExcelConstants.CLASS, ElderBkItem.class); + //update-begin--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置-------------------- + ExportParams exportParams = new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title); + exportParams.setImageBasePath(jeecgBaseConfig.getPath().getUpload()); + //update-end--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置---------------------- + mv.addObject(NormalExcelConstants.PARAMS, exportParams); + mv.addObject(NormalExcelConstants.DATA_LIST, exportList); + return mv; + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("elderbk:nu_elder_bk_item:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ElderBkItem.class); + } + +} diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/controller/ElderBkMainController.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/controller/ElderBkMainController.java new file mode 100644 index 0000000..7fbffa2 --- /dev/null +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/controller/ElderBkMainController.java @@ -0,0 +1,170 @@ +package com.nu.modules.elderbk.controller; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; +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 com.nu.modules.elderbk.entity.ElderBkMain; +import com.nu.modules.elderbk.service.IElderBkMainService; + +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.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +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-08-25 + * @Version: V1.0 + */ +@Api(tags="长者标签备份主表") +@RestController +@RequestMapping("/elderbk/elderBkMain") +@Slf4j +public class ElderBkMainController extends JeecgController { + @Autowired + private IElderBkMainService elderBkMainService; + + /** + * 分页列表查询 + * + * @param elderBkMain + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "长者标签备份主表-分页列表查询") + @ApiOperation(value="长者标签备份主表-分页列表查询", notes="长者标签备份主表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(ElderBkMain elderBkMain, + @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("orgCode", QueryRuleEnum.LIKE_WITH_OR); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(elderBkMain, req.getParameterMap(),customeRuleMap); + Page page = new Page(pageNo, pageSize); + IPage pageList = elderBkMainService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param elderBkMain + * @return + */ + @AutoLog(value = "长者标签备份主表-添加") + @ApiOperation(value="长者标签备份主表-添加", notes="长者标签备份主表-添加") + @RequiresPermissions("elderbk:nu_elder_bk_main:add") + @PostMapping(value = "/add") + public Result add(@RequestBody ElderBkMain elderBkMain) { + elderBkMainService.save(elderBkMain); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param elderBkMain + * @return + */ + @AutoLog(value = "长者标签备份主表-编辑") + @ApiOperation(value="长者标签备份主表-编辑", notes="长者标签备份主表-编辑") + @RequiresPermissions("elderbk:nu_elder_bk_main:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody ElderBkMain elderBkMain) { + elderBkMainService.updateById(elderBkMain); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "长者标签备份主表-通过id删除") + @ApiOperation(value="长者标签备份主表-通过id删除", notes="长者标签备份主表-通过id删除") + @RequiresPermissions("elderbk:nu_elder_bk_main:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + elderBkMainService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "长者标签备份主表-批量删除") + @ApiOperation(value="长者标签备份主表-批量删除", notes="长者标签备份主表-批量删除") + @RequiresPermissions("elderbk:nu_elder_bk_main:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.elderBkMainService.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) { + ElderBkMain elderBkMain = elderBkMainService.getById(id); + if(elderBkMain==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(elderBkMain); + } + + /** + * 导出excel + * + * @param request + * @param elderBkMain + */ + @RequiresPermissions("elderbk:nu_elder_bk_main:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ElderBkMain elderBkMain) { + return super.exportXls(request, elderBkMain, ElderBkMain.class, "长者标签备份主表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("elderbk:nu_elder_bk_main:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ElderBkMain.class); + } + +} diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/entity/ElderBkItem.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/entity/ElderBkItem.java new file mode 100644 index 0000000..80ae570 --- /dev/null +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/entity/ElderBkItem.java @@ -0,0 +1,143 @@ +package com.nu.modules.elderbk.entity; + +import java.io.Serializable; +import java.util.Date; +import java.math.BigDecimal; + +import com.baomidou.mybatisplus.annotation.*; +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-08-25 + * @Version: V1.0 + */ +@Data +@TableName("nu_elder_bk_item") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "nu_elder_bk_item对象", description = "长者标签备份子表") +public class ElderBkItem implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private String id; + /** + * 所属机构 + */ + @Excel(name = "所属机构", width = 50, dictTable = "sys_depart", dicText = "depart_name", dicCode = "org_code") + @ApiModelProperty(value = "所属机构") + @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "org_code") + private String sysOrgCode; + /** + * 标签类型 + */ + @Excel(name = "标签类型", width = 20) + @ApiModelProperty(value = "标签类型") + @Dict(dicCode = "elder_tag_type") + private java.lang.String type; + /** + * 标签名称 + */ + @Excel(name = "标签名称", width = 20) + @ApiModelProperty(value = "标签名称") + private java.lang.String tagName; + /** + * 说明 + */ + @Excel(name = "说明", width = 40) + @ApiModelProperty(value = "说明") + private java.lang.String describ; + /** + * 价格 + */ + @Excel(name = "价格(元)", width = 18) + @ApiModelProperty(value = "价格") + private java.math.BigDecimal price; + /** + * 图标 + */ + @ApiModelProperty(value = "图标") + private java.lang.String pic; + /** + * 图标md5值 + */ + @ApiModelProperty(value = "图标md5值") + private java.lang.String picMd5; + /** + * 排序 + */ + @ApiModelProperty(value = "排序") + private java.lang.Integer sort; + /** + * 是否启用 + */ + @ApiModelProperty(value = "是否启用") + @Dict(dicCode = "iz_enabled") + private java.lang.String izEnabled; + /** + * 是否删除 + */ + @ApiModelProperty(value = "是否删除") + @TableLogic + private java.lang.String delFlag; + /** + * 创建人 + */ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /** + * 创建日期 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /** + * 更新人 + */ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /** + * 更新日期 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /** + * nu_elder_bk_main.id + */ + @ApiModelProperty(value = "nu_elder_bk_main.id") + private String pkid; + /** + * 长者标签id + */ + @ApiModelProperty(value = "nu_config_service_elder.id.id") + private String elderId; + + //要导出的pkid + @TableField(exist = false) + private String exportPkId; + /** + * 导出用创建日期 + */ + @TableField(exist = false) + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private java.util.Date createTime_; +} + diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/entity/ElderBkMain.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/entity/ElderBkMain.java new file mode 100644 index 0000000..43c1bab --- /dev/null +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/entity/ElderBkMain.java @@ -0,0 +1,46 @@ +package com.nu.modules.elderbk.entity; + +import java.io.Serializable; +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.*; +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-08-25 + * @Version: V1.0 + */ +@Data +@TableName("nu_elder_bk_main") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="nu_elder_bk_main对象", description="长者标签备份主表") +public class ElderBkMain implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private String id; + /** 机构编码*/ + @Excel(name = " 机构编码", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "org_code") + @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "org_code") + @ApiModelProperty(value = " 机构编码") + private String orgCode; + /**备份时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "备份时间") + private Date createTime; + +} diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/mapper/ElderBkItemMapper.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/mapper/ElderBkItemMapper.java new file mode 100644 index 0000000..2e75c13 --- /dev/null +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/mapper/ElderBkItemMapper.java @@ -0,0 +1,15 @@ +package com.nu.modules.elderbk.mapper; + +import com.nu.modules.elderbk.entity.ElderBkItem; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 长者标签备份子表 + * @Author: jeecg-boot + * @Date: 2025-08-25 + * @Version: V1.0 + */ +public interface ElderBkItemMapper extends BaseMapper { + + void cleanBkByPhysical(); +} diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/mapper/ElderBkMainMapper.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/mapper/ElderBkMainMapper.java new file mode 100644 index 0000000..486747b --- /dev/null +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/mapper/ElderBkMainMapper.java @@ -0,0 +1,15 @@ +package com.nu.modules.elderbk.mapper; + +import com.nu.modules.elderbk.entity.ElderBkMain; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 长者标签备份主表 + * @Author: jeecg-boot + * @Date: 2025-08-25 + * @Version: V1.0 + */ +public interface ElderBkMainMapper extends BaseMapper { + + void cleanBkByPhysical(); +} diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/mapper/xml/ElderBkItemMapper.xml b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/mapper/xml/ElderBkItemMapper.xml new file mode 100644 index 0000000..bbb0d8d --- /dev/null +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/mapper/xml/ElderBkItemMapper.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/mapper/xml/ElderBkMainMapper.xml b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/mapper/xml/ElderBkMainMapper.xml new file mode 100644 index 0000000..c8dab0e --- /dev/null +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/mapper/xml/ElderBkMainMapper.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/service/IElderBkItemService.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/service/IElderBkItemService.java new file mode 100644 index 0000000..b4841c7 --- /dev/null +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/service/IElderBkItemService.java @@ -0,0 +1,15 @@ +package com.nu.modules.elderbk.service; + +import com.nu.modules.elderbk.entity.ElderBkItem; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 长者标签备份子表 + * @Author: jeecg-boot + * @Date: 2025-08-25 + * @Version: V1.0 + */ +public interface IElderBkItemService extends IService { + + void cleanBkByPhysical(); +} diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/service/IElderBkMainService.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/service/IElderBkMainService.java new file mode 100644 index 0000000..ec2e8fc --- /dev/null +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/service/IElderBkMainService.java @@ -0,0 +1,15 @@ +package com.nu.modules.elderbk.service; + +import com.nu.modules.elderbk.entity.ElderBkMain; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 长者标签备份主表 + * @Author: jeecg-boot + * @Date: 2025-08-25 + * @Version: V1.0 + */ +public interface IElderBkMainService extends IService { + + void cleanBkByPhysical(); +} diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/service/impl/ElderBkItemServiceImpl.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/service/impl/ElderBkItemServiceImpl.java new file mode 100644 index 0000000..bc2c125 --- /dev/null +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/service/impl/ElderBkItemServiceImpl.java @@ -0,0 +1,26 @@ +package com.nu.modules.elderbk.service.impl; + +import com.nu.modules.elderbk.entity.ElderBkItem; +import com.nu.modules.elderbk.mapper.ElderBkItemMapper; +import com.nu.modules.elderbk.service.IElderBkItemService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 长者标签备份子表 + * @Author: jeecg-boot + * @Date: 2025-08-25 + * @Version: V1.0 + */ +@Service +public class ElderBkItemServiceImpl extends ServiceImpl implements IElderBkItemService { + + /** + * 删除一周前备份（真删) + */ + @Override + public void cleanBkByPhysical() { + baseMapper.cleanBkByPhysical(); + } +} diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/service/impl/ElderBkMainServiceImpl.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/service/impl/ElderBkMainServiceImpl.java new file mode 100644 index 0000000..e7b6e75 --- /dev/null +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/service/impl/ElderBkMainServiceImpl.java @@ -0,0 +1,26 @@ +package com.nu.modules.elderbk.service.impl; + +import com.nu.modules.elderbk.entity.ElderBkMain; +import com.nu.modules.elderbk.mapper.ElderBkMainMapper; +import com.nu.modules.elderbk.service.IElderBkMainService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 长者标签备份主表 + * @Author: jeecg-boot + * @Date: 2025-08-25 + * @Version: V1.0 + */ +@Service +public class ElderBkMainServiceImpl extends ServiceImpl implements IElderBkMainService { + + /** + * 删除一周前备份（真删) + */ + @Override + public void cleanBkByPhysical() { + baseMapper.cleanBkByPhysical(); + } +} diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertag/controller/ElderTagController.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertag/controller/ElderTagController.java index 0c761d0..edf71c4 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertag/controller/ElderTagController.java +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertag/controller/ElderTagController.java @@ -72,6 +72,10 @@ public class ElderTagController extends JeecgController> queryPageListByDS(@RequestParam(name = "dataSourceCode") String dataSourceCode, ElderTag et, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { + if(StringUtils.isNotBlank(et.getQueryIds())){ + //按id查询时去除启用/停用 + et.setIzEnabled(null); + } if (StringUtils.isBlank(dataSourceCode)) { return Result.ok(new Page()); } @@ -79,6 +83,9 @@ public class ElderTagController extends JeecgController page = new Page(pageNo, pageSize); IPage list = elderTagService.page(page, queryWrapper); diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertag/entity/ElderTag.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertag/entity/ElderTag.java index f2ca3c6..f47fd16 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertag/entity/ElderTag.java +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertag/entity/ElderTag.java @@ -94,6 +94,8 @@ public class ElderTag implements Serializable { @ApiModelProperty(value = "所属机构") private java.lang.String sysOrgCode; + @TableField(exist = false) + private String queryIds;//需要查询的ids /**需要排除的id */ @TableField(exist = false) private String excludeIds; diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertag/service/impl/ElderTagServiceImpl.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertag/service/impl/ElderTagServiceImpl.java index 7affd96..c916204 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertag/service/impl/ElderTagServiceImpl.java +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertag/service/impl/ElderTagServiceImpl.java @@ -74,6 +74,7 @@ public class ElderTagServiceImpl extends ServiceImpl i AsyncMain asyncMain = new AsyncMain(); asyncMain.setType("elderTag"); asyncMain.setOrgCode(dataSourceCode); + asyncMain.setSyncIds(syncIds);//同步内容id（逗号分隔） asyncMain.setDescr("长者标签同步"); asyncMainService.saveData("master", asyncMain); elderMQDto.setAsyncId(asyncMain.getId()); diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivebk/mapper/xml/DirectiveBkItemMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivebk/mapper/xml/DirectiveBkItemMapper.xml index 140cac8..55e8459 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivebk/mapper/xml/DirectiveBkItemMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivebk/mapper/xml/DirectiveBkItemMapper.xml @@ -6,7 +6,7 @@ diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivebk/mapper/xml/DirectiveBkMainMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivebk/mapper/xml/DirectiveBkMainMapper.xml index 141a2ba..9e0327c 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivebk/mapper/xml/DirectiveBkMainMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivebk/mapper/xml/DirectiveBkMainMapper.xml @@ -6,7 +6,7 @@