yangjun
/
hldy_java_monomer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、长者标签增加标签备份 

2、长者标签日志增加查看详情
3、调整长者标签各界面边距
This commit is contained in:
1378012178@qq.com 2025-08-27 15:14:49 +08:00
parent d55b807001
commit 43b88952d2
19 changed files with 813 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/job/elder/ServiceElderBkJob.java Normal file
View File

@ -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<JSONObject> orgList = sysBaseAPI.queryOpeDept();
List<String> 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<ElderTag> 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<ElderBkItem> 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();
}
}
}
}

35
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/job/elder/ServiceElderCleanBkJob.java Normal file
View File

@ -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();
}
}

195
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/controller/ElderBkItemController.java Normal file
View File

@ -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<ElderBkItem, IElderBkItemService> {
@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<IPage<ElderBkItem>> queryPageList(ElderBkItem elderBkItem, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
QueryWrapper<ElderBkItem> queryWrapper = QueryGenerator.initQueryWrapper(elderBkItem, req.getParameterMap());
Page<ElderBkItem> page = new Page<ElderBkItem>(pageNo, pageSize);
IPage<ElderBkItem> 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<String> 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<String> 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<String> 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<String> 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<ElderBkItem> 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<ElderBkItem> queryWrapper = new QueryWrapper<>();
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
queryWrapper.eq("pkid", elderBkItem.getExportPkId());
List<ElderBkItem> 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);
}
}

170
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/controller/ElderBkMainController.java Normal file
View File

@ -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<ElderBkMain, IElderBkMainService> {
@Autowired
private IElderBkMainService elderBkMainService;
/**
* 分页列表查询
*
* @param elderBkMain
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "长者标签备份主表-分页列表查询")
@ApiOperation(value="长者标签备份主表-分页列表查询", notes="长者标签备份主表-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<ElderBkMain>> queryPageList(ElderBkMain elderBkMain,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
// 自定义查询规则
Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
// 自定义多选的查询规则为：LIKE_WITH_OR
customeRuleMap.put("orgCode", QueryRuleEnum.LIKE_WITH_OR);
QueryWrapper<ElderBkMain> queryWrapper = QueryGenerator.initQueryWrapper(elderBkMain, req.getParameterMap(),customeRuleMap);
Page<ElderBkMain> page = new Page<ElderBkMain>(pageNo, pageSize);
IPage<ElderBkMain> 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<String> 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<String> 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<String> 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<String> 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<ElderBkMain> 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);
}
}

143
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/entity/ElderBkItem.java Normal file
View File

@ -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_;
}

46
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/entity/ElderBkMain.java Normal file
View File

@ -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;
}

15
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/mapper/ElderBkItemMapper.java Normal file
View File

@ -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<ElderBkItem> {
void cleanBkByPhysical();
}

15
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/mapper/ElderBkMainMapper.java Normal file
View File

@ -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<ElderBkMain> {
void cleanBkByPhysical();
}

12
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/mapper/xml/ElderBkItemMapper.xml Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nu.modules.elderbk.mapper.ElderBkItemMapper">
<delete id="cleanBkByPhysical">
<![CDATA[
delete
from nu_elder_bk_item
where pkid in (select id from nu_elder_bk_main where create_time < NOW() - INTERVAL 31 DAY)
]]>
</delete>
</mapper>

12
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/mapper/xml/ElderBkMainMapper.xml Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nu.modules.elderbk.mapper.ElderBkMainMapper">
<delete id="cleanBkByPhysical">
<![CDATA[
DELETE
FROM nu_elder_bk_main
WHERE create_time < NOW() - INTERVAL 31 DAY
]]>
</delete>
</mapper>

15
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/service/IElderBkItemService.java Normal file
View File

@ -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<ElderBkItem> {
void cleanBkByPhysical();
}

15
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/service/IElderBkMainService.java Normal file
View File

@ -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<ElderBkMain> {
void cleanBkByPhysical();
}

26
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/service/impl/ElderBkItemServiceImpl.java Normal file
View File

@ -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<ElderBkItemMapper, ElderBkItem> implements IElderBkItemService {
/**
* 删除一周前备份（真删)
*/
@Override
public void cleanBkByPhysical() {
baseMapper.cleanBkByPhysical();
}
}

26
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderbk/service/impl/ElderBkMainServiceImpl.java Normal file
View File

@ -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<ElderBkMainMapper, ElderBkMain> implements IElderBkMainService {
/**
* 删除一周前备份（真删)
*/
@Override
public void cleanBkByPhysical() {
baseMapper.cleanBkByPhysical();
}
}

7
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertag/controller/ElderTagController.java
View File

@ -72,6 +72,10 @@ public class ElderTagController extends JeecgController<ElderTag, IElderTagServi
@GetMapping(value = "/listByDS")
@DS("#dataSourceCode")
public Result<IPage<ElderTag>> 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<ElderTag>());
}
@ -79,6 +83,9 @@ public class ElderTagController extends JeecgController<ElderTag, IElderTagServi
if (StringUtils.isNotBlank(et.getExcludeIds())) {
queryWrapper.notIn("id", et.getExcludeIds().split(","));
}
if(StringUtils.isNotBlank(et.getQueryIds())){
queryWrapper.in("id",et.getQueryIds().split(","));
}
queryWrapper.orderByAsc("sort");
Page<ElderTag> page = new Page<ElderTag>(pageNo, pageSize);
IPage<ElderTag> list = elderTagService.page(page, queryWrapper);

2
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertag/entity/ElderTag.java
View File

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

1
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertag/service/impl/ElderTagServiceImpl.java
View File

@ -74,6 +74,7 @@ public class ElderTagServiceImpl extends ServiceImpl<ElderTagMapper, ElderTag> 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());

2
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivebk/mapper/xml/DirectiveBkItemMapper.xml
View File

@ -6,7 +6,7 @@
<![CDATA[
delete
from nu_directive_bk_item
where pkid in (select id from nu_directive_bk_main where create_time < NOW() - INTERVAL 8 DAY)
where pkid in (select id from nu_directive_bk_main where create_time < NOW() - INTERVAL 31 DAY)
]]>
</delete>
</mapper>

2
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivebk/mapper/xml/DirectiveBkMainMapper.xml
View File

@ -6,7 +6,7 @@
<![CDATA[
DELETE
FROM nu_directive_bk_main
WHERE create_time < NOW() - INTERVAL 8 DAY
WHERE create_time < NOW() - INTERVAL 31 DAY
]]>
</delete>
</mapper>