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

删除多余代码： 

1、长者标签
2、资源管理
This commit is contained in:
1378012178@qq.com 2026-05-07 13:40:38 +08:00
parent 774a6331b2
commit 48840cffd2
37 changed files with 30 additions and 2342 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

163
nursing-unit-common/src/main/java/com/nu/modules/mediaasyncerrorlog/controller/MediaAsyncErrorLogController.java
View File

@ -1,163 +0,0 @@
package com.nu.modules.mediaasyncerrorlog.controller;
import java.util.Arrays;
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 com.nu.modules.mediaasyncerrorlog.entity.MediaAsyncErrorLog;
import com.nu.modules.mediaasyncerrorlog.service.IMediaAsyncErrorLogService;
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-05-22
* @Version: V1.0
*/
@Api(tags="资源同步错误日志")
@RestController
@RequestMapping("/mediaasyncerrorlog/mediaAsyncErrorLog")
@Slf4j
public class MediaAsyncErrorLogController extends JeecgController<MediaAsyncErrorLog, IMediaAsyncErrorLogService> {
@Autowired
private IMediaAsyncErrorLogService mediaAsyncErrorLogService;
/**
* 分页列表查询
*
* @param mediaAsyncErrorLog
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "资源同步错误日志-分页列表查询")
@ApiOperation(value="资源同步错误日志-分页列表查询", notes="资源同步错误日志-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<MediaAsyncErrorLog>> queryPageList(MediaAsyncErrorLog mediaAsyncErrorLog,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<MediaAsyncErrorLog> queryWrapper = QueryGenerator.initQueryWrapper(mediaAsyncErrorLog, req.getParameterMap());
Page<MediaAsyncErrorLog> page = new Page<MediaAsyncErrorLog>(pageNo, pageSize);
IPage<MediaAsyncErrorLog> pageList = mediaAsyncErrorLogService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param mediaAsyncErrorLog
* @return
*/
@AutoLog(value = "资源同步错误日志-添加")
@ApiOperation(value="资源同步错误日志-添加", notes="资源同步错误日志-添加")
@RequiresPermissions("mediaasyncerrorlog:nu_media_async_error_log:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody MediaAsyncErrorLog mediaAsyncErrorLog) {
mediaAsyncErrorLogService.save(mediaAsyncErrorLog);
return Result.OK("添加成功！");
}
/**
* 编辑
*
* @param mediaAsyncErrorLog
* @return
*/
@AutoLog(value = "资源同步错误日志-编辑")
@ApiOperation(value="资源同步错误日志-编辑", notes="资源同步错误日志-编辑")
@RequiresPermissions("mediaasyncerrorlog:nu_media_async_error_log:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody MediaAsyncErrorLog mediaAsyncErrorLog) {
mediaAsyncErrorLogService.updateById(mediaAsyncErrorLog);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "资源同步错误日志-通过id删除")
@ApiOperation(value="资源同步错误日志-通过id删除", notes="资源同步错误日志-通过id删除")
@RequiresPermissions("mediaasyncerrorlog:nu_media_async_error_log:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
mediaAsyncErrorLogService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "资源同步错误日志-批量删除")
@ApiOperation(value="资源同步错误日志-批量删除", notes="资源同步错误日志-批量删除")
@RequiresPermissions("mediaasyncerrorlog:nu_media_async_error_log:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.mediaAsyncErrorLogService.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<MediaAsyncErrorLog> queryById(@RequestParam(name="id",required=true) String id) {
MediaAsyncErrorLog mediaAsyncErrorLog = mediaAsyncErrorLogService.getById(id);
if(mediaAsyncErrorLog==null) {
return Result.error("未找到对应数据");
}
return Result.OK(mediaAsyncErrorLog);
}
/**
* 导出excel
*
* @param request
* @param mediaAsyncErrorLog
*/
@RequiresPermissions("mediaasyncerrorlog:nu_media_async_error_log:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, MediaAsyncErrorLog mediaAsyncErrorLog) {
return super.exportXls(request, mediaAsyncErrorLog, MediaAsyncErrorLog.class, "资源同步错误日志");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequiresPermissions("mediaasyncerrorlog:nu_media_async_error_log:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, MediaAsyncErrorLog.class);
}
}

53
nursing-unit-common/src/main/java/com/nu/modules/mediaasyncerrorlog/entity/MediaAsyncErrorLog.java
View File

@ -1,53 +0,0 @@
package com.nu.modules.mediaasyncerrorlog.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-05-22
* @Version: V1.0
*/
@Data
@TableName("nu_media_async_error_log")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="nu_media_async_error_log对象", description="资源同步错误日志")
public class MediaAsyncErrorLog implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private java.lang.String id;
/**nu_media_manage.id*/
@Excel(name = "nu_media_manage.id", width = 15)
@ApiModelProperty(value = "nu_media_manage.id")
private java.lang.String mediaid;
/**找到id就是对应的nu_media_manage.id*/
@ApiModelProperty(value = "找到id就是对应的nu_media_manage.id")
private java.lang.String msg;
/**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;
}

14
nursing-unit-common/src/main/java/com/nu/modules/mediaasyncerrorlog/mapper/MediaAsyncErrorLogMapper.java
View File

@ -1,14 +0,0 @@
package com.nu.modules.mediaasyncerrorlog.mapper;
import com.nu.modules.mediaasyncerrorlog.entity.MediaAsyncErrorLog;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 资源同步错误日志
* @Author: jeecg-boot
* @Date: 2025-05-22
* @Version: V1.0
*/
public interface MediaAsyncErrorLogMapper extends BaseMapper<MediaAsyncErrorLog> {
}

5
nursing-unit-common/src/main/java/com/nu/modules/mediaasyncerrorlog/mapper/xml/MediaAsyncErrorLogMapper.xml
View File

@ -1,5 +0,0 @@
<?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.mediaasyncerrorlog.mapper.MediaAsyncErrorLogMapper">
</mapper>

14
nursing-unit-common/src/main/java/com/nu/modules/mediaasyncerrorlog/service/IMediaAsyncErrorLogService.java
View File

@ -1,14 +0,0 @@
package com.nu.modules.mediaasyncerrorlog.service;
import com.nu.modules.mediaasyncerrorlog.entity.MediaAsyncErrorLog;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 资源同步错误日志
* @Author: jeecg-boot
* @Date: 2025-05-22
* @Version: V1.0
*/
public interface IMediaAsyncErrorLogService extends IService<MediaAsyncErrorLog> {
}

19
nursing-unit-common/src/main/java/com/nu/modules/mediaasyncerrorlog/service/impl/MediaAsyncErrorLogServiceImpl.java
View File

@ -1,19 +0,0 @@
package com.nu.modules.mediaasyncerrorlog.service.impl;
import com.nu.modules.mediaasyncerrorlog.entity.MediaAsyncErrorLog;
import com.nu.modules.mediaasyncerrorlog.mapper.MediaAsyncErrorLogMapper;
import com.nu.modules.mediaasyncerrorlog.service.IMediaAsyncErrorLogService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 资源同步错误日志
* @Author: jeecg-boot
* @Date: 2025-05-22
* @Version: V1.0
*/
@Service
public class MediaAsyncErrorLogServiceImpl extends ServiceImpl<MediaAsyncErrorLogMapper, MediaAsyncErrorLog> implements IMediaAsyncErrorLogService {
}

144
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/canaddeldertag/controller/CanAddElderTagController.java
View File

@ -1,144 +0,0 @@
package com.nu.modules.canaddeldertag.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.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.nu.modules.sysconfig.ISysConfigApi;
import com.nu.utils.HttpRequestUtil;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.SecurityUtils;
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.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import com.nu.modules.canaddeldertag.entity.CanAddElderTag;
import com.nu.modules.canaddeldertag.service.ICanAddElderTagService;
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.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-08-14
* @Version: V1.0
*/
@Api(tags = "可新增长者标签")
@RestController
@RequestMapping("/eldertag/canAddElderTag")
@Slf4j
public class CanAddElderTagController extends JeecgController<CanAddElderTag, ICanAddElderTagService> {
@Autowired
private ICanAddElderTagService canAddElderTagService;
@Resource
private JeecgBaseConfig jeecgBaseConfig;
@Autowired
private ISysConfigApi sysConfigApi;
/**
* 分页列表查询
*
* @param canAddElderTag
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "可新增长者标签-分页列表查询")
@ApiOperation(value = "可新增长者标签-分页列表查询", notes = "可新增长者标签-分页列表查询")
@GetMapping(value = "/list")
@DS("ope")
public Result<IPage<CanAddElderTag>> queryPageList(CanAddElderTag canAddElderTag,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<CanAddElderTag> queryWrapper = QueryGenerator.initQueryWrapper(canAddElderTag, req.getParameterMap());
if (StringUtils.isNotBlank(canAddElderTag.getExistElderTagIds())) {
queryWrapper.notIn("tag_id",canAddElderTag.getExistElderTagIds().split(","));
}
Page<CanAddElderTag> page = new Page<CanAddElderTag>(pageNo, pageSize);
IPage<CanAddElderTag> pageList = canAddElderTagService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 导出excel
*
* @param request
* @param canAddElderTag
*/
@RequestMapping(value = "/exportXls")
@DS("ope")
public ModelAndView exportXls(HttpServletRequest request, CanAddElderTag canAddElderTag) {
String title = "差异标签";
QueryWrapper<CanAddElderTag> queryWrapper = new QueryWrapper<CanAddElderTag>();
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if (StringUtils.isNotBlank(canAddElderTag.getSysOrgCode())) {
queryWrapper.eq("sys_org_code", canAddElderTag.getSysOrgCode());
}
if (StringUtils.isNotBlank(canAddElderTag.getExistElderTagIds())) {
queryWrapper.notIn("tag_id", canAddElderTag.getExistElderTagIds().split(","));
}
List<CanAddElderTag> exportList = service.list(queryWrapper);
//获取机构编码及名称
JSONObject opeOpenUrl = sysConfigApi.getByKeyByDS("master", "ope_open_url");
String opeApiAddress = opeOpenUrl.getString("configValue");
if (opeApiAddress.endsWith("/")) {
opeApiAddress = opeApiAddress.substring(0, opeApiAddress.length() - 1);
}
String allOrgCodeAndName = opeApiAddress + "/api/baseInfo/getOrgCodeAndName";
JSONObject result = null;
try {
String res = HttpRequestUtil.doGet(allOrgCodeAndName, HttpRequestUtil.createDefaultHeaders());
JSONObject jsonResponse = JSON.parseObject(res);
result = jsonResponse.getJSONObject("result");
} catch (Exception e) {
e.printStackTrace();
}
if (result != null) {
for (int i = 0; i < exportList.size(); i++) {
exportList.get(i).setSysOrgCode(result.getString(exportList.get(i).getSysOrgCode()));
}
}
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
mv.addObject(NormalExcelConstants.FILE_NAME, title);
mv.addObject(NormalExcelConstants.CLASS, CanAddElderTag.class);
ExportParams exportParams = new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title);
exportParams.setImageBasePath(jeecgBaseConfig.getPath().getUpload());
mv.addObject(NormalExcelConstants.PARAMS, exportParams);
mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
return mv;
}
}

82
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/canaddeldertag/entity/CanAddElderTag.java
View File

@ -1,82 +0,0 @@
package com.nu.modules.canaddeldertag.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.*;
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-08-14
* @Version: V1.0
*/
@Data
@TableName("nu_can_add_elder_tag")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="nu_can_add_elder_tag对象", description="可新增长者标签")
public class CanAddElderTag implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private java.lang.String id;
/**nu_config_elder_tag.id*/
@ApiModelProperty(value = "nu_config_elder_tag.id")
private java.lang.String tagId;
/**所属机构*/
@ApiModelProperty(value = "所属机构")
@Excel(name = "所属机构", width = 50)
@Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "org_code")
private java.lang.String sysOrgCode;
/**标签类型 tx体型标签 qx情绪标签*/
@Excel(name = "标签类型", width = 20,dicCode = "elder_tag_type")
@ApiModelProperty(value = "标签类型")
@Dict(dicCode = "elder_tag_type")
private java.lang.String type;
/**标签名称*/
@Excel(name = "标签名称", width = 30)
@ApiModelProperty(value = "标签名称")
private java.lang.String tagName;
/**说明*/
@Excel(name = "说明", width = 50)
@ApiModelProperty(value = "说明")
private java.lang.String describ;
/**价格*/
@Excel(name = "价格(元)", width = 20)
@ApiModelProperty(value = "价格")
private java.math.BigDecimal price;
/**图标*/
@ApiModelProperty(value = "图标")
private java.lang.String pic;
/**排序*/
@ApiModelProperty(value = "排序")
private java.lang.Integer sort;
/**创建日期*/
@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;
/**
* 已存在服务指令ids 逗号拼接
*/
@TableField(exist = false)
private String existElderTagIds;
}

17
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/canaddeldertag/mapper/CanAddElderTagMapper.java
View File

@ -1,17 +0,0 @@
package com.nu.modules.canaddeldertag.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.nu.modules.canaddeldertag.entity.CanAddElderTag;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 可新增长者标签
* @Author: jeecg-boot
* @Date: 2025-08-14
* @Version: V1.0
*/
public interface CanAddElderTagMapper extends BaseMapper<CanAddElderTag> {
}

5
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/canaddeldertag/mapper/xml/CanAddElderTagMapper.xml
View File

@ -1,5 +0,0 @@
<?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.canaddeldertag.mapper.CanAddElderTagMapper">
</mapper>

14
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/canaddeldertag/service/ICanAddElderTagService.java
View File

@ -1,14 +0,0 @@
package com.nu.modules.canaddeldertag.service;
import com.nu.modules.canaddeldertag.entity.CanAddElderTag;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 可新增长者标签
* @Author: jeecg-boot
* @Date: 2025-08-14
* @Version: V1.0
*/
public interface ICanAddElderTagService extends IService<CanAddElderTag> {
}

19
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/canaddeldertag/service/impl/CanAddElderTagServiceImpl.java
View File

@ -1,19 +0,0 @@
package com.nu.modules.canaddeldertag.service.impl;
import com.nu.modules.canaddeldertag.entity.CanAddElderTag;
import com.nu.modules.canaddeldertag.mapper.CanAddElderTagMapper;
import com.nu.modules.canaddeldertag.service.ICanAddElderTagService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 可新增长者标签
* @Author: jeecg-boot
* @Date: 2025-08-14
* @Version: V1.0
*/
@Service
public class CanAddElderTagServiceImpl extends ServiceImpl<CanAddElderTagMapper, CanAddElderTag> implements ICanAddElderTagService {
}

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

@ -1,44 +1,38 @@
package com.nu.modules.eldertag.controller;
import java.util.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import cn.hutool.core.util.IdUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
import com.google.common.collect.Maps;
import com.nu.dto.*;
import com.nu.modules.canaddeldertag.entity.CanAddElderTag;
import com.nu.modules.canaddeldertag.service.ICanAddElderTagService;
import com.nu.utils.RabbitMQUtil;
import org.apache.commons.compress.utils.Lists;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.common.system.query.QueryGenerator;
import com.nu.modules.eldertag.entity.ElderTag;
import com.nu.modules.eldertag.service.IElderTagService;
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.google.common.collect.Maps;
import com.nu.dto.ElderTagOpeLogInfoMQDto;
import com.nu.dto.ElderTagOpeLogMainMQDto;
import com.nu.modules.eldertag.entity.ElderTag;
import com.nu.modules.eldertag.service.IElderTagService;
import com.nu.utils.RabbitMQUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.compress.utils.Lists;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.DictModel;
import org.jeecg.common.system.vo.LoginUser;
import org.jetbrains.annotations.Nullable;
import org.springframework.beans.BeanUtils;
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;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.*;
/**
* @Description: 长者标签

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

@ -9,8 +9,6 @@ import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.common.collect.Maps;
import com.nu.dto.*;
import com.nu.modules.canaddeldertag.entity.CanAddElderTag;
import com.nu.modules.canaddeldertag.service.ICanAddElderTagService;
import com.nu.modules.eldertag.entity.ElderTag;
import com.nu.modules.eldertag.mapper.ElderTagMapper;
import com.nu.modules.eldertag.service.IElderTagService;
@ -58,8 +56,6 @@ public class ElderTagServiceImpl extends ServiceImpl<ElderTagMapper, ElderTag> i
@Autowired
private RabbitMQUtil rabbitMQUtil;
@Autowired
private ICanAddElderTagService canAddElderTagService;
@Autowired
private DictUtils dictUtils;
/**
@ -91,31 +87,6 @@ public class ElderTagServiceImpl extends ServiceImpl<ElderTagMapper, ElderTag> i
etMQDto.setElderTagList(BeanUtil.copyToList(elderTags, ElderTagAsyncMQDto.class));
elderTagMQListener.handleIncremental2(etMQDto);
// String apiAddress = "";
// //查询源数据平台的接口api地址
// {
// //各平台api地址都存在管理系统中 管理系统api地址在系统参数配置中 “ope_open_url”
// JSONObject opeOpenUrl = sysConfigApi.getByKeyByDS("master", "ope_open_url");
// String opeApiAddress = opeOpenUrl.getString("configValue");
// if (opeApiAddress.endsWith("/")) {
// opeApiAddress = opeApiAddress.substring(0, opeApiAddress.length() - 1);
// }
// String bizApiAddress = opeApiAddress + "/api/baseInfo/getOrgApiAddress?orgCode=" + sourceOrgCode;
//
// try {
// String res = HttpRequestUtil.doGet(bizApiAddress, HttpRequestUtil.createDefaultHeaders());
// JSONObject jsonResponse = JSON.parseObject(res);
// JSONObject result = jsonResponse.getJSONObject("result");
// apiAddress = result.getString("url");
// } catch (Exception e) {
// e.printStackTrace();
// }
// }
//
// elderTagMQListener.handleCreateMedia2(etMQDto, apiAddress);
//给对应业务平台发送消息
//同步结果保存到管理平台
{
List<DictModel> elder_tag_type = sysBaseAPI.getDictItems("elder_tag_type");
@ -265,42 +236,12 @@ public class ElderTagServiceImpl extends ServiceImpl<ElderTagMapper, ElderTag> i
return Result.error("长者标签已存在！");
}
//临时切换至管理平台
DynamicDataSourceContextHolder.push("ope");
List<CanAddElderTag> canAddList;
try {
canAddList = canAddElderTagService.list();
} finally {
DynamicDataSourceContextHolder.clear();
}
boolean needSetId = true;
for (int i = 0; i < canAddList.size(); i++) {
CanAddElderTag canAddElderTag = canAddList.get(i);
if (
canAddElderTag.getType().equals(elderTag.getType()) &&
canAddElderTag.getTagName().equals(elderTag.getTagName())
) {
needSetId = false;
elderTag.setId(canAddElderTag.getTagId());
}
}
JSONObject deptInfo = sysBaseAPI.getDeptInfo();
if (needSetId) {
elderTag.setId(deptInfo.getString("code") + IdUtil.simpleUUID());
}
elderTag.setSysOrgCode(deptInfo.getString("code"));
//处理静态资源
// handleMediaFile(elderTag);
baseMapper.insert(elderTag);
//同步给管理平台
{
ElderTagAsyncMQDto elderTagAsyncMQDto = new ElderTagAsyncMQDto();
BeanUtils.copyProperties(elderTag, elderTagAsyncMQDto);
rabbitMQUtil.sendToExchange("hldy.eldettag", "hldy.eldettag.newadd", elderTagAsyncMQDto);
}
return null;
}

197
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertagmain/controller/ElderTagMainController.java
View File

@ -1,197 +0,0 @@
package com.nu.modules.eldertagmain.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.nu.modules.eldertag.entity.ElderTag;
import com.nu.modules.eldertag.service.IElderTagService;
import com.nu.modules.eldertagmain.entity.ElderTagMain;
import com.nu.modules.eldertagmain.service.IElderTagMainService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.List;
/**
* @Description: 长者标签管理
* @Author: zmy
* @Date: 2025-08-13
* @Version: V1.0
*/
@Api(tags = "长者标签管理")
@RestController
@RequestMapping("/elder/elderTagMain")
@Slf4j
public class ElderTagMainController extends JeecgController<ElderTagMain, IElderTagMainService> {
@Autowired
private IElderTagMainService elderTagMainService;
@Autowired
private ISysBaseAPI sysBaseAPI;
@Autowired
private IElderTagService elderTagService;
/**
* 分页列表查询
*
* @param elderTagMain
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "长者标签管理-分页列表查询")
@ApiOperation(value = "长者标签管理-分页列表查询", notes = "长者标签管理-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<ElderTagMain>> queryPageList(ElderTagMain elderTagMain,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<ElderTagMain> queryWrapper = QueryGenerator.initQueryWrapper(elderTagMain, req.getParameterMap());
queryWrapper.orderByAsc("sort");
Page<ElderTagMain> page = new Page<ElderTagMain>(pageNo, pageSize);
IPage<ElderTagMain> pageList = elderTagMainService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param elderTagMain
* @return
*/
@AutoLog(value = "长者标签管理-添加")
@ApiOperation(value = "长者标签管理-添加", notes = "长者标签管理-添加")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody ElderTagMain elderTagMain) {
elderTagMainService.handleMediaFile(elderTagMain);
elderTagMainService.save(elderTagMain);
return Result.OK("添加成功！");
}
/**
* 批量添加
*
* @param elderTagMainList
* @return
*/
@AutoLog(value = "长者标签管理-批量添加")
@ApiOperation(value = "长者标签管理-批量添加", notes = "长者标签管理-批量添加")
@PostMapping(value = "/batchAdd")
public Result<String> batchAdd(@RequestBody List<ElderTagMain> elderTagMainList) {
elderTagMainList.stream().forEach(m -> {
ElderTag elderTag = new ElderTag();
BeanUtils.copyProperties(m, elderTag);
elderTag.setPrice(new BigDecimal("0"));
elderTag.setType(m.getTypeId());
elderTag.setIzEnabled("0");
elderTag.setDelFlag("0");
elderTagService.add(elderTag);
});
return Result.OK("添加成功！");
}
/**
* 编辑
*
* @param elderTagMain
* @return
*/
@AutoLog(value = "长者标签管理-编辑")
@ApiOperation(value = "长者标签管理-编辑", notes = "长者标签管理-编辑")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody ElderTagMain elderTagMain) {
elderTagMainService.handleMediaFile(elderTagMain);
elderTagMainService.updateById(elderTagMain);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "长者标签管理-通过id删除")
@ApiOperation(value = "长者标签管理-通过id删除", notes = "长者标签管理-通过id删除")
@RequiresPermissions("eldertag:nu_elder_tag:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
elderTagMainService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "长者标签管理-批量删除")
@ApiOperation(value = "长者标签管理-批量删除", notes = "长者标签管理-批量删除")
@RequiresPermissions("eldertag:nu_elder_tag:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.elderTagMainService.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<ElderTagMain> queryById(@RequestParam(name = "id", required = true) String id) {
ElderTagMain elderTagMain = elderTagMainService.getById(id);
if (elderTagMain == null) {
return Result.error("未找到对应数据");
}
return Result.OK(elderTagMain);
}
/**
* 导出excel
*
* @param request
* @param elderTagMain
*/
@RequiresPermissions("eldertag:nu_elder_tag:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ElderTagMain elderTagMain) {
return super.exportXls(request, elderTagMain, ElderTagMain.class, "长者标签管理");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequiresPermissions("eldertag:nu_elder_tag:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, ElderTagMain.class);
}
}

93
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertagmain/entity/ElderTagMain.java
View File

@ -1,93 +0,0 @@
package com.nu.modules.eldertagmain.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: zmy
* @Date: 2025-08-13
* @Version: V1.0
*/
@Data
@TableName("nu_elder_tag_main")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="nu_elder_tag_main对象", description="长者标签管理")
public class ElderTagMain implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private String id;
/**标签类型*/
@ApiModelProperty(value = "标签类型")
@Dict(dicCode = "elder_tag_type")
private String typeId;
/**标签名称*/
@Excel(name = "标签名称", width = 15)
@ApiModelProperty(value = "标签名称")
private String tagName;
/**说明*/
@Excel(name = "说明", width = 40)
@ApiModelProperty(value = "说明")
private String describ;
/**价格*/
@Excel(name = "价格", width = 15)
@ApiModelProperty(value = "价格")
private BigDecimal price;
/**图标*/
@Excel(name = "图标", width = 15)
@ApiModelProperty(value = "图标")
private String pic;
/**图标md5值*/
@ApiModelProperty(value = "图标md5值")
private String picMd5;
/**排序*/
@Excel(name = "排序", width = 15)
@ApiModelProperty(value = "排序")
private Integer sort;
/**是否启用*/
@Excel(name = "是否启用", width = 15)
@ApiModelProperty(value = "是否启用")
@Dict(dicCode = "iz_enabled")
private String izEnabled;
/**是否删除*/
@Excel(name = "是否删除", width = 15)
@ApiModelProperty(value = "是否删除")
@TableLogic
private String delFlag;
/**创建人*/
@ApiModelProperty(value = "创建人")
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期")
private Date createTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期")
private Date updateTime;
/**所属机构*/
@ApiModelProperty(value = "所属机构")
private String sysOrgCode;
}

14
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertagmain/mapper/ElderTagMainMapper.java
View File

@ -1,14 +0,0 @@
package com.nu.modules.eldertagmain.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nu.modules.eldertagmain.entity.ElderTagMain;
/**
* @Description: 长者标签管理
* @Author: zmy
* @Date: 2025-08-13
* @Version: V1.0
*/
public interface ElderTagMainMapper extends BaseMapper<ElderTagMain> {
}

5
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertagmain/mapper/xml/ElderTagMainMapper.xml
View File

@ -1,5 +0,0 @@
<?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.eldertagmain.mapper.ElderTagMainMapper">
</mapper>

15
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertagmain/service/IElderTagMainService.java
View File

@ -1,15 +0,0 @@
package com.nu.modules.eldertagmain.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.nu.modules.eldertagmain.entity.ElderTagMain;
/**
* @Description: 长者标签管理
* @Author: zmy
* @Date: 2025-08-13
* @Version: V1.0
*/
public interface IElderTagMainService extends IService<ElderTagMain> {
void handleMediaFile(ElderTagMain elderTagMain);
}

35
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertagmain/service/impl/ElderTagMainServiceImpl.java
View File

@ -1,35 +0,0 @@
package com.nu.modules.eldertagmain.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nu.modules.eldertagmain.entity.ElderTagMain;
import com.nu.modules.eldertagmain.mapper.ElderTagMainMapper;
import com.nu.modules.eldertagmain.service.IElderTagMainService;
import com.nu.utils.NuFileUtils;
import org.springframework.stereotype.Service;
import java.util.Map;
/**
* @Description: 长者标签管理
* @Author: zmy
* @Date: 2025-08-13
* @Version: V1.0
*/
@Service
public class ElderTagMainServiceImpl extends ServiceImpl<ElderTagMainMapper, ElderTagMain> implements IElderTagMainService {
@Override
public void handleMediaFile(ElderTagMain elderTagMain) {
//需要存储的路径
String mediaFileSavePath = "/eldertag/" + elderTagMain.getTagName();
//图标
String previewFile = elderTagMain.getPic();
// 处理文件并获取更新后的路径
Map<String, String> newFileMap = NuFileUtils.processFile(mediaFileSavePath, previewFile);
if (newFileMap != null) {
elderTagMain.setPic(newFileMap.get("path"));
elderTagMain.setPicMd5(newFileMap.get("md5"));
}
}
}

223
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertagtype/controller/ElderTagTypeController.java
View File

@ -1,223 +0,0 @@
package com.nu.modules.eldertagtype.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 cn.hutool.core.util.IdUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
import com.nu.dto.ElderTagAsyncMQDto;
import com.nu.dto.ElderTagTypeMQDto;
import com.nu.modules.canaddeldertag.entity.CanAddElderTag;
import com.nu.modules.eldertagtypere.entity.ElderTagTypeRe;
import com.nu.modules.eldertagtypere.service.IElderTagTypeReService;
import com.nu.utils.RabbitMQUtil;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.query.QueryRuleEnum;
import org.jeecg.common.util.oConvertUtils;
import com.nu.modules.eldertagtype.entity.ElderTagType;
import com.nu.modules.eldertagtype.service.IElderTagTypeService;
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.BeanUtils;
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-08-26
* @Version: V1.0
*/
@Api(tags = "长者标签类型")
@RestController
@RequestMapping("/elder/elderTagType")
@Slf4j
public class ElderTagTypeController extends JeecgController<ElderTagType, IElderTagTypeService> {
@Autowired
private IElderTagTypeService elderTagTypeService;
@Autowired
private IElderTagTypeReService elderTagTypeReService;
@Autowired
private RabbitMQUtil rabbitMQUtil;
@Autowired
private ISysBaseAPI sysBaseAPI;
/**
* 分页列表查询
*
* @param elderTagType
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "长者标签类型-分页列表查询")
@ApiOperation(value = "长者标签类型-分页列表查询", notes = "长者标签类型-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<ElderTagType>> queryPageList(ElderTagType elderTagType,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<ElderTagType> queryWrapper = QueryGenerator.initQueryWrapper(elderTagType, req.getParameterMap());
Page<ElderTagType> page = new Page<ElderTagType>(pageNo, pageSize);
IPage<ElderTagType> pageList = elderTagTypeService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param elderTagType
* @return
*/
@AutoLog(value = "长者标签类型-添加")
@ApiOperation(value = "长者标签类型-添加", notes = "长者标签类型-添加")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody ElderTagType elderTagType) {
//临时切换至管理平台
DynamicDataSourceContextHolder.push("ope");
List<ElderTagTypeRe> tagTypeReList;
try {
tagTypeReList = elderTagTypeReService.list();
} finally {
DynamicDataSourceContextHolder.clear();
}
boolean needSetId = true;
for (int i = 0; i < tagTypeReList.size(); i++) {
ElderTagTypeRe elderTagTypeRe = tagTypeReList.get(i);
if (elderTagTypeRe.getTypeName().equals(elderTagType.getTypeName())) {
needSetId = false;
elderTagType.setId(elderTagTypeRe.getTypeId());
}
}
JSONObject deptInfo = sysBaseAPI.getDeptInfo();
if (needSetId) {
elderTagType.setId(deptInfo.getString("code") + IdUtil.simpleUUID());
}
elderTagTypeService.save(elderTagType);
//同步给管理平台
{
ElderTagTypeMQDto elderTagTypeMQDto = new ElderTagTypeMQDto();
BeanUtils.copyProperties(elderTagType, elderTagTypeMQDto);
rabbitMQUtil.sendToExchange("hldy.eldettagtype", "hldy.eldettagtype.newadd", elderTagTypeMQDto);
}
return Result.OK("添加成功！");
}
/**
* 编辑
*
* @param elderTagType
* @return
*/
@AutoLog(value = "长者标签类型-编辑")
@ApiOperation(value = "长者标签类型-编辑", notes = "长者标签类型-编辑")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody ElderTagType elderTagType) {
elderTagTypeService.updateById(elderTagType);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "长者标签类型-通过id删除")
@ApiOperation(value = "长者标签类型-通过id删除", notes = "长者标签类型-通过id删除")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
elderTagTypeService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "长者标签类型-批量删除")
@ApiOperation(value = "长者标签类型-批量删除", notes = "长者标签类型-批量删除")
@RequiresPermissions("eldertagtype:nu_elder_tag_type:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.elderTagTypeService.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<ElderTagType> queryById(@RequestParam(name = "id", required = true) String id) {
ElderTagType elderTagType = elderTagTypeService.getById(id);
if (elderTagType == null) {
return Result.error("未找到对应数据");
}
return Result.OK(elderTagType);
}
/**
* 导出excel
*
* @param request
* @param elderTagType
*/
@RequiresPermissions("eldertagtype:nu_elder_tag_type:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ElderTagType elderTagType) {
return super.exportXls(request, elderTagType, ElderTagType.class, "长者标签类型");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequiresPermissions("eldertagtype:nu_elder_tag_type:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, ElderTagType.class);
}
}

55
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertagtype/entity/ElderTagType.java
View File

@ -1,55 +0,0 @@
package com.nu.modules.eldertagtype.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-08-26
* @Version: V1.0
*/
@Data
@TableName("nu_elder_tag_type")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="nu_elder_tag_type对象", description="长者标签类型")
public class ElderTagType implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private java.lang.String id;
/**标签类型名称*/
@Excel(name = "标签类型名称", width = 15)
@ApiModelProperty(value = "标签类型名称")
private java.lang.String typeName;
/**是否启用 Y启用 N未启用*/
@Excel(name = "是否启用 Y启用 N未启用", width = 15, dicCode = "iz_enabled")
@Dict(dicCode = "iz_enabled")
@ApiModelProperty(value = "是否启用 Y启用 N未启用")
private java.lang.String izEnabled;
/**是否删除 0未删除 1删除*/
@Excel(name = "是否删除 0未删除 1删除", width = 15)
@ApiModelProperty(value = "是否删除 0未删除 1删除")
@TableLogic
private java.lang.String delFlag;
}

17
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertagtype/mapper/ElderTagTypeMapper.java
View File

@ -1,17 +0,0 @@
package com.nu.modules.eldertagtype.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.nu.modules.eldertagtype.entity.ElderTagType;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 长者标签类型
* @Author: jeecg-boot
* @Date: 2025-08-26
* @Version: V1.0
*/
public interface ElderTagTypeMapper extends BaseMapper<ElderTagType> {
}

5
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertagtype/mapper/xml/ElderTagTypeMapper.xml
View File

@ -1,5 +0,0 @@
<?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.eldertagtype.mapper.ElderTagTypeMapper">
</mapper>

14
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertagtype/service/IElderTagTypeService.java
View File

@ -1,14 +0,0 @@
package com.nu.modules.eldertagtype.service;
import com.nu.modules.eldertagtype.entity.ElderTagType;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 长者标签类型
* @Author: jeecg-boot
* @Date: 2025-08-26
* @Version: V1.0
*/
public interface IElderTagTypeService extends IService<ElderTagType> {
}

19
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertagtype/service/impl/ElderTagTypeServiceImpl.java
View File

@ -1,19 +0,0 @@
package com.nu.modules.eldertagtype.service.impl;
import com.nu.modules.eldertagtype.entity.ElderTagType;
import com.nu.modules.eldertagtype.mapper.ElderTagTypeMapper;
import com.nu.modules.eldertagtype.service.IElderTagTypeService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 长者标签类型
* @Author: jeecg-boot
* @Date: 2025-08-26
* @Version: V1.0
*/
@Service
public class ElderTagTypeServiceImpl extends ServiceImpl<ElderTagTypeMapper, ElderTagType> implements IElderTagTypeService {
}

160
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertagtypere/controller/ElderTagTypeReController.java
View File

@ -1,160 +0,0 @@
package com.nu.modules.eldertagtypere.controller;
import java.util.Arrays;
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 com.nu.modules.eldertagtypere.entity.ElderTagTypeRe;
import com.nu.modules.eldertagtypere.service.IElderTagTypeReService;
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-26
* @Version: V1.0
*/
@Api(tags="长者标签类型")
@RestController
@RequestMapping("/elder/elderTagTypeRe")
@Slf4j
public class ElderTagTypeReController extends JeecgController<ElderTagTypeRe, IElderTagTypeReService> {
@Autowired
private IElderTagTypeReService elderTagTypeService;
/**
* 分页列表查询
*
* @param elderTagType
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "长者标签类型-分页列表查询")
@ApiOperation(value="长者标签类型-分页列表查询", notes="长者标签类型-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<ElderTagTypeRe>> queryPageList(ElderTagTypeRe elderTagType,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<ElderTagTypeRe> queryWrapper = QueryGenerator.initQueryWrapper(elderTagType, req.getParameterMap());
Page<ElderTagTypeRe> page = new Page<ElderTagTypeRe>(pageNo, pageSize);
IPage<ElderTagTypeRe> pageList = elderTagTypeService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param elderTagType
* @return
*/
@AutoLog(value = "长者标签类型-添加")
@ApiOperation(value="长者标签类型-添加", notes="长者标签类型-添加")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody ElderTagTypeRe elderTagType) {
elderTagTypeService.save(elderTagType);
return Result.OK("添加成功！");
}
/**
* 编辑
*
* @param elderTagType
* @return
*/
@AutoLog(value = "长者标签类型-编辑")
@ApiOperation(value="长者标签类型-编辑", notes="长者标签类型-编辑")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody ElderTagTypeRe elderTagType) {
elderTagTypeService.updateById(elderTagType);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "长者标签类型-通过id删除")
@ApiOperation(value="长者标签类型-通过id删除", notes="长者标签类型-通过id删除")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
elderTagTypeService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "长者标签类型-批量删除")
@ApiOperation(value="长者标签类型-批量删除", notes="长者标签类型-批量删除")
@RequiresPermissions("eldertagtype:nu_elder_tag_type:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.elderTagTypeService.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<ElderTagTypeRe> queryById(@RequestParam(name="id",required=true) String id) {
ElderTagTypeRe elderTagType = elderTagTypeService.getById(id);
if(elderTagType==null) {
return Result.error("未找到对应数据");
}
return Result.OK(elderTagType);
}
/**
* 导出excel
*
* @param request
* @param elderTagType
*/
@RequiresPermissions("eldertagtype:nu_elder_tag_type:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ElderTagTypeRe elderTagType) {
return super.exportXls(request, elderTagType, ElderTagTypeRe.class, "长者标签类型");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequiresPermissions("eldertagtype:nu_elder_tag_type:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, ElderTagTypeRe.class);
}
}

53
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertagtypere/entity/ElderTagTypeRe.java
View File

@ -1,53 +0,0 @@
package com.nu.modules.eldertagtypere.entity;
import java.io.Serializable;
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 lombok.Data;
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-26
* @Version: V1.0
*/
@Data
@TableName("nu_elder_tag_type_re")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="nu_elder_tag_type对象", description="长者标签类型")
public class ElderTagTypeRe implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private String id;
/**标签类型id*/
@Excel(name = "标签类型id", width = 15)
@ApiModelProperty(value = "标签类型id")
private String typeId;
/**标签类型名称*/
@Excel(name = "标签类型名称", width = 15)
@ApiModelProperty(value = "标签类型名称")
private String typeName;
/**是否启用 Y启用 N未启用*/
@Excel(name = "是否启用 Y启用 N未启用", width = 15, dicCode = "iz_enabled")
@Dict(dicCode = "iz_enabled")
@ApiModelProperty(value = "是否启用 Y启用 N未启用")
private String izEnabled;
/**是否删除 0未删除 1删除*/
@Excel(name = "是否删除 0未删除 1删除", width = 15)
@ApiModelProperty(value = "是否删除 0未删除 1删除")
@TableLogic
private String delFlag;
}

14
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertagtypere/mapper/ElderTagTypeReMapper.java
View File

@ -1,14 +0,0 @@
package com.nu.modules.eldertagtypere.mapper;
import com.nu.modules.eldertagtypere.entity.ElderTagTypeRe;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 长者标签类型
* @Author: jeecg-boot
* @Date: 2025-08-26
* @Version: V1.0
*/
public interface ElderTagTypeReMapper extends BaseMapper<ElderTagTypeRe> {
}

5
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertagtypere/mapper/xml/ElderTagTypeReMapper.xml
View File

@ -1,5 +0,0 @@
<?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.eldertagtypere.mapper.ElderTagTypeReMapper">
</mapper>

14
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertagtypere/service/IElderTagTypeReService.java
View File

@ -1,14 +0,0 @@
package com.nu.modules.eldertagtypere.service;
import com.nu.modules.eldertagtypere.entity.ElderTagTypeRe;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 长者标签类型
* @Author: jeecg-boot
* @Date: 2025-08-26
* @Version: V1.0
*/
public interface IElderTagTypeReService extends IService<ElderTagTypeRe> {
}

19
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertagtypere/service/impl/ElderTagTypeReServiceImpl.java
View File

@ -1,19 +0,0 @@
package com.nu.modules.eldertagtypere.service.impl;
import com.nu.modules.eldertagtypere.entity.ElderTagTypeRe;
import com.nu.modules.eldertagtypere.mapper.ElderTagTypeReMapper;
import com.nu.modules.eldertagtypere.service.IElderTagTypeReService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 长者标签类型
* @Author: jeecg-boot
* @Date: 2025-08-26
* @Version: V1.0
*/
@Service
public class ElderTagTypeReServiceImpl extends ServiceImpl<ElderTagTypeReMapper, ElderTagTypeRe> implements IElderTagTypeReService {
}

6
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/mq/elderinfo/listener/ElderInfoMQListener.java
View File

@ -9,8 +9,6 @@ import com.nu.modules.elderinfo.service.IElderInfoService;
import com.nu.modules.elderinfo.service.INuBizElderNuLogService;
import com.nu.modules.eldermofifyinfo.entity.ElderModifyInfo;
import com.nu.modules.eldermofifyinfo.service.IElderModifyInfoService;
import com.nu.modules.mediaasyncerrorlog.service.IMediaAsyncErrorLogService;
import com.nu.modules.sysconfig.ISysConfigApi;
import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.core.ExchangeTypes;
import org.springframework.amqp.rabbit.annotation.Exchange;
@ -34,10 +32,6 @@ public class ElderInfoMQListener {
@Autowired
private IElderInfoService elderInfoService;
@Autowired
private ISysConfigApi sysConfigApi;
@Autowired
private IMediaAsyncErrorLogService mediaAsyncErrorLogService;
@Autowired
private IElderModifyInfoService elderModifyInfoService;
@Autowired
private INuBizElderNuLogService nuBizElderNuLogService;

32
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/mq/eldertag/listener/ElderTagMQListener.java
View File

@ -8,8 +8,6 @@ import com.nu.dto.StatusMQDto;
import com.nu.enums.MQStatus;
import com.nu.modules.eldertag.entity.ElderTag;
import com.nu.modules.eldertag.service.IElderTagService;
import com.nu.modules.mediaasyncerrorlog.entity.MediaAsyncErrorLog;
import com.nu.modules.mediaasyncerrorlog.service.IMediaAsyncErrorLogService;
import com.nu.utils.FileDownloader;
import com.nu.utils.RabbitMQUtil;
import com.nu.utils.SafetyUtil;
@ -45,8 +43,6 @@ public class ElderTagMQListener {
private RabbitMQUtil rabbitMQUtil;
@Autowired
private IElderTagService elderTagService;
@Autowired
private IMediaAsyncErrorLogService mediaAsyncErrorLogService;
@RabbitListener(bindings = @QueueBinding(value = @Queue(name = "#{elderTagAsyncDQNP.getSyncElderTagQueueName()}"), exchange = @Exchange(name = "hldy.eldertag", type = ExchangeTypes.DIRECT), key = "#{elderTagAsyncDQNP.getSyncElderTagKeyName()}"), errorHandler = "elderTagMQErrorHandler")
@Transactional(rollbackFor = {Exception.class})
@ -110,32 +106,8 @@ public class ElderTagMQListener {
String baseUrl = dto.getApi();
//处理长者标签图片
// if (StringUtils.isNotBlank(dto.getPicMd5()) && !dto.getPicMd5().equals(currentElderTag.getPicMd5())) {
// String pic = dto.getPic();
// if (StringUtils.isNotBlank(pic)) {
// String url = baseUrl + "/sys/common/open/static/" + URLEncoder.encode(pic, StandardCharsets.UTF_8).replace("%2F", "/") + "?name=" + SafetyUtil.getSecureKey();
// if (upLoadPath.endsWith("/") || upLoadPath.endsWith("\\")) {
// upLoadPath = upLoadPath.substring(0, upLoadPath.length() - 1);
// }
// String filePath = pic.substring(0, pic.lastIndexOf("/"));
// String fileName = pic.substring(pic.lastIndexOf("/") + 1);
// if (filePath.startsWith("/") || filePath.startsWith("\\")) {
// filePath = filePath.substring(1);
// }
// try {
// FileDownloader.downloadFile(url, upLoadPath + File.separator + filePath, fileName);
et.setPic(dto.getPic());//长者标签图片
et.setPicMd5(dto.getPicMd5());
// } catch (Exception e) {
// e.printStackTrace();
// MediaAsyncErrorLog mediaAsyncErrorLog = new MediaAsyncErrorLog();
// mediaAsyncErrorLog.setMediaid(pic);
// mediaAsyncErrorLog.setMsg(e.getMessage());
// mediaAsyncErrorLogService.save(mediaAsyncErrorLog);
// throw new RuntimeException("长者标签图片文件拉取错误,标签id" + currentElderTag.getId());
// }
// }
// }
elderTagService.updateById(et);
}
});
@ -247,10 +219,6 @@ public class ElderTagMQListener {
et.setPicMd5(dto.getPicMd5());
} catch (Exception e) {
e.printStackTrace();
MediaAsyncErrorLog mediaAsyncErrorLog = new MediaAsyncErrorLog();
mediaAsyncErrorLog.setMediaid(pic);
mediaAsyncErrorLog.setMsg(e.getMessage());
mediaAsyncErrorLogService.save(mediaAsyncErrorLog);
throw new RuntimeException("长者标签图片文件拉取错误,标签id" + currentElderTag.getId());
}
}

14
nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesadvisiory/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java
View File

@ -2,13 +2,11 @@ package com.nu.modules.employeesadvisiory.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nu.modules.employeesmedia.entity.BizEmployeesMedia;
import com.nu.modules.employeesmedia.service.IBizEmployeesMediaService;
import com.nu.modules.employeesadvisiory.entity.NuEmployeesAdvisoryInfo;
import com.nu.modules.employeesadvisiory.mapper.NuEmployeesAdvisoryInfoMapper;
import com.nu.modules.employeesadvisiory.service.INuEmployeesAdvisoryInfoService;
import com.nu.modules.mediaasyncerrorlog.entity.MediaAsyncErrorLog;
import com.nu.modules.mediaasyncerrorlog.service.IMediaAsyncErrorLogService;
import com.nu.modules.employeesmedia.entity.BizEmployeesMedia;
import com.nu.modules.employeesmedia.service.IBizEmployeesMediaService;
import com.nu.modules.sysconfig.ISysConfigApi;
import com.nu.utils.FileDownloader;
import com.nu.utils.SafetyUtil;
@ -35,8 +33,6 @@ public class NuEmployeesAdvisoryInfoServiceImpl extends ServiceImpl<NuEmployeesA
@Value("${jeecg.path.upload}")
private String upLoadPath;
@Autowired
private IMediaAsyncErrorLogService mediaAsyncErrorLogService;
@Autowired
private IBizEmployeesMediaService employeesMediaService;
@Override
@ -76,9 +72,6 @@ public class NuEmployeesAdvisoryInfoServiceImpl extends ServiceImpl<NuEmployeesA
} catch (Exception e) {
data.setCardZmPath(null);
e.printStackTrace();
MediaAsyncErrorLog mediaAsyncErrorLog = new MediaAsyncErrorLog();
mediaAsyncErrorLog.setMediaid(idCardPositive);
mediaAsyncErrorLogService.save(mediaAsyncErrorLog);
throw new RuntimeException("员工申请加入机构-身份证正面文件拉取错误,员工id" + nuEmployeesAdvisoryInfo.getIdCard());
}
}
@ -103,9 +96,6 @@ public class NuEmployeesAdvisoryInfoServiceImpl extends ServiceImpl<NuEmployeesA
} catch (Exception e) {
data.setCardFmPath(null);
e.printStackTrace();
MediaAsyncErrorLog mediaAsyncErrorLog = new MediaAsyncErrorLog();
mediaAsyncErrorLog.setMediaid(idCardNegative);
mediaAsyncErrorLogService.save(mediaAsyncErrorLog);
throw new RuntimeException("员工申请加入机构-身份证反面文件拉取错误,员工id" + nuEmployeesAdvisoryInfo.getIdCard());
}
}

52
nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/service/impl/EmployeesApplyServiceImpl.java
View File

@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
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.dto.EmployeesApplyMQDto;
import com.nu.entity.SysUserEntity;
import com.nu.modules.employeesInfo.entity.BizEmployeesInfo;
@ -13,26 +14,14 @@ import com.nu.modules.employeesInfo.service.IBizEmployeesInfoService;
import com.nu.modules.employeesapply.entity.EmployeesApply;
import com.nu.modules.employeesapply.mapper.EmployeesApplyMapper;
import com.nu.modules.employeesapply.service.IEmployeesApplyService;
import com.nu.modules.mediaasyncerrorlog.entity.MediaAsyncErrorLog;
import com.nu.modules.mediaasyncerrorlog.service.IMediaAsyncErrorLogService;
import com.nu.modules.sysconfig.ISysConfigApi;
import com.nu.utils.FileDownloader;
import com.nu.utils.RabbitMQUtil;
import com.nu.utils.SafetyUtil;
import org.apache.commons.lang.StringUtils;
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.common.system.api.ISysUserAPI;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import java.io.File;
import java.lang.reflect.Field;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
import java.util.*;
@ -50,12 +39,6 @@ public class EmployeesApplyServiceImpl extends ServiceImpl<EmployeesApplyMapper,
@Autowired
private RabbitMQUtil rabbitMQUtil;
@Autowired
private ISysConfigApi sysConfigApi;
@Value("${jeecg.path.upload}")
private String upLoadPath;
@Autowired
private IMediaAsyncErrorLogService mediaAsyncErrorLogService;
@Autowired
private ISysBaseAPI sysBaseAPI;
@Autowired
private ISysUserAPI sysUserAPI;
@ -87,38 +70,16 @@ public class EmployeesApplyServiceImpl extends ServiceImpl<EmployeesApplyMapper,
@Override
public List<Map<String, Object>> getModifyInfo(EmployeesApply employeesApply) {
// 1. 查询变更后数据（申请表中最新待审核的变更数据）
// QueryWrapper<EmployeesApply> sourceQW = new QueryWrapper<>();
// sourceQW.eq("employee_id", employeesApply.getEmployeeId());
// sourceQW.eq("status", "1"); // 审核中
// sourceQW.eq("iz_history", "N"); // 当前数据（非历史）
// sourceQW.eq("apply_type", "2"); // 信息变更申请
// sourceQW.orderByDesc("create_time");
// List<EmployeesApply> sourceList = baseMapper.selectList(sourceQW);
// if (sourceList == null || sourceList.isEmpty()) {
// return Collections.emptyList();
// }
// EmployeesApply modifyData = sourceList.get(0); // 修改后的数据
EmployeesApply usingEa = new EmployeesApply();
usingEa.setEmployeeId(employeesApply.getEmployeeId());
usingEa.setStatus("1");
usingEa.setIzHistory("N");
// usingEa.setApplyType("2");
EmployeesApply modifyData = baseMapper.getModifyData(usingEa);
if (modifyData == null) {
return Collections.emptyList();
}
// 2. 查询当前使用中数据（员工信息表中的正式数据）
// QueryWrapper<BizEmployeesInfo> nowUseQW = new QueryWrapper<>();
// nowUseQW.eq("id", employeesApply.getEmployeeId());
// nowUseQW.orderByDesc("create_time"); // ✅ 修正：原来是 sourceQW，应为 nowUseQW
// List<BizEmployeesInfo> nowUseList = employeesInfoService.list(nowUseQW);
// if (nowUseList == null || nowUseList.isEmpty()) {
// return Collections.emptyList();
// }
// BizEmployeesInfo usingData = nowUseList.get(0); // 原始数据
BizEmployeesInfo bizEmployeesInfo = new BizEmployeesInfo();
bizEmployeesInfo.setId(employeesApply.getEmployeeId());
BizEmployeesInfo usingData = employeesInfoService.findById(bizEmployeesInfo);
@ -266,13 +227,6 @@ public class EmployeesApplyServiceImpl extends ServiceImpl<EmployeesApplyMapper,
// EmployeesApply modifyData = baseMapper.selectById(employeesApply.getId());
EmployeesApply modifyData = baseMapper.findById(employeesApply.getId());
// 2. 查询当前使用中数据
// QueryWrapper<EmployeesApply> usingQW = new QueryWrapper<>();
// usingQW.eq("employee_id", modifyData.getEmployeeId());
// usingQW.eq("status", "2");
// usingQW.lt("create_time", modifyData.getCreateTime());
// usingQW.last("limit 1");
// EmployeesApply usingData = baseMapper.selectOne(usingQW);
EmployeesApply usingEa = new EmployeesApply();
usingEa.setEmployeeId(modifyData.getEmployeeId());
usingEa.setCreateTime(modifyData.getCreateTime());
@ -327,10 +281,6 @@ public class EmployeesApplyServiceImpl extends ServiceImpl<EmployeesApplyMapper,
usingValue = usingValue != null ? sdf.format((Date) usingValue) : null;
}
// if(StringUtils.equals(fieldName,"suppliersNature")){
// usingValue = usingValue != null ? dictUtils.translateDictValue("suppliers_nature", usingValue.toString()) : null;
// modifyValue = modifyValue != null ? dictUtils.translateDictValue("suppliers_nature", modifyValue.toString()) : null;
// }
// 创建结果项
Map<String, Object> fieldMap = new HashMap<>();
fieldMap.put("id", IdUtil.simpleUUID());

643
nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/mq/employees/listener/EmployeesMQListener.java
View File

@ -13,8 +13,6 @@ import com.nu.modules.employeesapply.entity.EmployeesApply;
import com.nu.modules.employeesapply.service.IEmployeesApplyService;
import com.nu.modules.employeesmedia.entity.BizEmployeesMedia;
import com.nu.modules.employeesmedia.service.IBizEmployeesMediaService;
import com.nu.modules.mediaasyncerrorlog.service.IMediaAsyncErrorLogService;
import com.nu.modules.sysconfig.ISysConfigApi;
import com.nu.utils.RabbitMQUtil;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.constant.CommonConstant;
@ -29,7 +27,6 @@ import org.springframework.amqp.rabbit.annotation.QueueBinding;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import java.util.Date;
@ -45,12 +42,6 @@ public class EmployeesMQListener {
@Autowired
private IBizEmployeesInfoService employeesInfoService;
@Autowired
private ISysConfigApi sysConfigApi;
@Value("${jeecg.path.upload}")
private String upLoadPath;
@Autowired
private IMediaAsyncErrorLogService mediaAsyncErrorLogService;
@Autowired
private IBizEmployeesMediaService employeesMediaService;
@Autowired
private ISysUserAPI sysUserAPI;
@ -190,27 +181,6 @@ public class EmployeesMQListener {
employeesInfo.setSysOrgCode(dto.getOrgCode());
employeesInfo.setEntryTime(dto.getOpeTime());
employeesInfo.setIzInvited("Y");
//资源文件拉完图片统一存储，不然页面有路径没资源可显示
String idCardPositive = employeesInfo.getIdCardPositive();
String idCardNegative = employeesInfo.getIdCardNegative();
String healthCertificatePositive = employeesInfo.getHealthCertificatePositive();
String healthCertificateNegative = employeesInfo.getHealthCertificateNegative();
String bankPositive = employeesInfo.getBankPositive();
String bankNegative = employeesInfo.getBankNegative();
String qualification = employeesInfo.getQualification();
String noCrimeCertificate = employeesInfo.getNoCrimeCertificate();
{
// employeesInfo.setIdCardPositive(null);//身份证正面
// employeesInfo.setIdCardNegative(null);//身份证反面
// employeesInfo.setHealthCertificatePositive(null);//健康证正面
// employeesInfo.setHealthCertificateNegative(null);//健康证反面
// employeesInfo.setBankPositive(null);//银行卡正面
// employeesInfo.setBankNegative(null);//银行卡反面
// employeesInfo.setQualification(null);//资质证
// employeesInfo.setNoCrimeCertificate(null);//无犯罪证明
}
employeesInfoService.save(employeesInfo);
//审核通过 - 给员工添加账号
@ -224,230 +194,6 @@ public class EmployeesMQListener {
j.put("employees_id", dto.getEmployeeId());
employeesApplyService.initialization(j);
//去管理平台拉取资源
// {
// BizEmployeesInfo mediaData = new BizEmployeesInfo();
// mediaData.setId(employeesInfo.getId());
//
// JSONObject opeOpenUrl = sysConfigApi.getByKeyByDS("master", "ope_open_url");
// String baseUrl = opeOpenUrl.getString("configValue");
// if (baseUrl.endsWith("/")) {
// baseUrl = baseUrl.substring(0, baseUrl.length() - 1);
// }
// //身份证正面
// {
// if (StringUtils.isNotBlank(idCardPositive)) {
// if (StringUtils.isNotBlank(idCardPositive)) {
// String url = baseUrl + "/sys/common/open/static/" + URLEncoder.encode(idCardPositive, StandardCharsets.UTF_8).replace("%2F", "/") + "?name=" + SafetyUtil.getSecureKey();
// if (upLoadPath.endsWith("/") || upLoadPath.endsWith("\\")) {
// upLoadPath = upLoadPath.substring(0, upLoadPath.length() - 1);
// }
// String filePath = idCardPositive.substring(0, idCardPositive.lastIndexOf("/"));
// String fileName = idCardPositive.substring(idCardPositive.lastIndexOf("/") + 1);
// if (filePath.startsWith("/") || filePath.startsWith("\\")) {
// filePath = filePath.substring(1);
// }
// try {
// FileDownloader.downloadFile(url, upLoadPath + File.separator + filePath, fileName);
// mediaData.setIdCardPositive(idCardPositive);
// } catch (Exception e) {
// e.printStackTrace();
// MediaAsyncErrorLog mediaAsyncErrorLog = new MediaAsyncErrorLog();
// mediaAsyncErrorLog.setMediaid(idCardPositive);
// mediaAsyncErrorLogService.save(mediaAsyncErrorLog);
// throw new RuntimeException("员工申请加入机构-身份证正面文件拉取错误,员工id" + dto.getEmployeeId());
// }
// }
// }
// }
// //身份证反面
// {
// if (StringUtils.isNotBlank(idCardNegative)) {
// if (StringUtils.isNotBlank(idCardNegative)) {
// String url = baseUrl + "/sys/common/open/static/" + URLEncoder.encode(idCardNegative, StandardCharsets.UTF_8).replace("%2F", "/") + "?name=" + SafetyUtil.getSecureKey();
// if (upLoadPath.endsWith("/") || upLoadPath.endsWith("\\")) {
// upLoadPath = upLoadPath.substring(0, upLoadPath.length() - 1);
// }
// String filePath = idCardNegative.substring(0, idCardNegative.lastIndexOf("/"));
// String fileName = idCardNegative.substring(idCardNegative.lastIndexOf("/") + 1);
// if (filePath.startsWith("/") || filePath.startsWith("\\")) {
// filePath = filePath.substring(1);
// }
// try {
// FileDownloader.downloadFile(url, upLoadPath + File.separator + filePath, fileName);
// mediaData.setIdCardNegative(idCardNegative);
// } catch (Exception e) {
// e.printStackTrace();
// MediaAsyncErrorLog mediaAsyncErrorLog = new MediaAsyncErrorLog();
// mediaAsyncErrorLog.setMediaid(idCardNegative);
// mediaAsyncErrorLogService.save(mediaAsyncErrorLog);
// throw new RuntimeException("员工申请加入机构-身份证反面文件拉取错误,员工id" + dto.getEmployeeId());
// }
// }
// }
// }
// //健康证正面
// {
// if (StringUtils.isNotBlank(healthCertificatePositive)) {
// if (StringUtils.isNotBlank(healthCertificatePositive)) {
// String url = baseUrl + "/sys/common/open/static/" + URLEncoder.encode(healthCertificatePositive, StandardCharsets.UTF_8).replace("%2F", "/") + "?name=" + SafetyUtil.getSecureKey();
// if (upLoadPath.endsWith("/") || upLoadPath.endsWith("\\")) {
// upLoadPath = upLoadPath.substring(0, upLoadPath.length() - 1);
// }
// String filePath = healthCertificatePositive.substring(0, healthCertificatePositive.lastIndexOf("/"));
// String fileName = healthCertificatePositive.substring(healthCertificatePositive.lastIndexOf("/") + 1);
// if (filePath.startsWith("/") || filePath.startsWith("\\")) {
// filePath = filePath.substring(1);
// }
// try {
// FileDownloader.downloadFile(url, upLoadPath + File.separator + filePath, fileName);
// mediaData.setHealthCertificatePositive(healthCertificatePositive);
// } catch (Exception e) {
// e.printStackTrace();
// MediaAsyncErrorLog mediaAsyncErrorLog = new MediaAsyncErrorLog();
// mediaAsyncErrorLog.setMediaid(healthCertificatePositive);
// mediaAsyncErrorLogService.save(mediaAsyncErrorLog);
// throw new RuntimeException("员工申请加入机构-健康证正面文件拉取错误,员工id" + dto.getEmployeeId());
// }
// }
// }
// }
// //健康证反面
// {
// if (StringUtils.isNotBlank(healthCertificateNegative)) {
// if (StringUtils.isNotBlank(healthCertificateNegative)) {
// String url = baseUrl + "/sys/common/open/static/" + URLEncoder.encode(healthCertificateNegative, StandardCharsets.UTF_8).replace("%2F", "/") + "?name=" + SafetyUtil.getSecureKey();
// if (upLoadPath.endsWith("/") || upLoadPath.endsWith("\\")) {
// upLoadPath = upLoadPath.substring(0, upLoadPath.length() - 1);
// }
// String filePath = healthCertificateNegative.substring(0, healthCertificateNegative.lastIndexOf("/"));
// String fileName = healthCertificateNegative.substring(healthCertificateNegative.lastIndexOf("/") + 1);
// if (filePath.startsWith("/") || filePath.startsWith("\\")) {
// filePath = filePath.substring(1);
// }
// try {
// FileDownloader.downloadFile(url, upLoadPath + File.separator + filePath, fileName);
// mediaData.setHealthCertificateNegative(healthCertificateNegative);
// } catch (Exception e) {
// e.printStackTrace();
// MediaAsyncErrorLog mediaAsyncErrorLog = new MediaAsyncErrorLog();
// mediaAsyncErrorLog.setMediaid(healthCertificateNegative);
// mediaAsyncErrorLogService.save(mediaAsyncErrorLog);
// throw new RuntimeException("员工申请加入机构-健康证反面文件拉取错误,员工id" + dto.getEmployeeId());
// }
// }
// }
// }
// //银行卡正面
// {
// if (StringUtils.isNotBlank(bankPositive)) {
// if (StringUtils.isNotBlank(bankPositive)) {
// String url = baseUrl + "/sys/common/open/static/" + URLEncoder.encode(bankPositive, StandardCharsets.UTF_8).replace("%2F", "/") + "?name=" + SafetyUtil.getSecureKey();
// if (upLoadPath.endsWith("/") || upLoadPath.endsWith("\\")) {
// upLoadPath = upLoadPath.substring(0, upLoadPath.length() - 1);
// }
// String filePath = bankPositive.substring(0, bankPositive.lastIndexOf("/"));
// String fileName = bankPositive.substring(bankPositive.lastIndexOf("/") + 1);
// if (filePath.startsWith("/") || filePath.startsWith("\\")) {
// filePath = filePath.substring(1);
// }
// try {
// FileDownloader.downloadFile(url, upLoadPath + File.separator + filePath, fileName);
// mediaData.setBankPositive(bankPositive);
// } catch (Exception e) {
// e.printStackTrace();
// MediaAsyncErrorLog mediaAsyncErrorLog = new MediaAsyncErrorLog();
// mediaAsyncErrorLog.setMediaid(bankPositive);
// mediaAsyncErrorLogService.save(mediaAsyncErrorLog);
// throw new RuntimeException("员工申请加入机构-银行卡正面文件拉取错误,员工id" + dto.getEmployeeId());
// }
// }
// }
// }
// //银行卡反面
// {
// if (StringUtils.isNotBlank(bankNegative)) {
// if (StringUtils.isNotBlank(bankNegative)) {
// String url = baseUrl + "/sys/common/open/static/" + URLEncoder.encode(bankNegative, StandardCharsets.UTF_8).replace("%2F", "/") + "?name=" + SafetyUtil.getSecureKey();
// if (upLoadPath.endsWith("/") || upLoadPath.endsWith("\\")) {
// upLoadPath = upLoadPath.substring(0, upLoadPath.length() - 1);
// }
// String filePath = bankNegative.substring(0, bankNegative.lastIndexOf("/"));
// String fileName = bankNegative.substring(bankNegative.lastIndexOf("/") + 1);
// if (filePath.startsWith("/") || filePath.startsWith("\\")) {
// filePath = filePath.substring(1);
// }
// try {
// FileDownloader.downloadFile(url, upLoadPath + File.separator + filePath, fileName);
// mediaData.setBankNegative(bankNegative);
// } catch (Exception e) {
// e.printStackTrace();
// MediaAsyncErrorLog mediaAsyncErrorLog = new MediaAsyncErrorLog();
// mediaAsyncErrorLog.setMediaid(bankNegative);
// mediaAsyncErrorLogService.save(mediaAsyncErrorLog);
// throw new RuntimeException("员工申请加入机构-银行卡反面文件拉取错误,员工id" + dto.getEmployeeId());
// }
// }
// }
// }
// //资质证(多张使用逗号分隔）
// {
// if (StringUtils.isNotBlank(qualification)) {
// List<String> list = Arrays.asList(qualification.split(","));
// for (int i = 0; i < list.size(); i++) {
// String qua = list.get(i);
// if (StringUtils.isNotBlank(qua)) {
// String url = baseUrl + "/sys/common/open/static/" + URLEncoder.encode(qua, StandardCharsets.UTF_8).replace("%2F", "/") + "?name=" + SafetyUtil.getSecureKey();
// if (upLoadPath.endsWith("/") || upLoadPath.endsWith("\\")) {
// upLoadPath = upLoadPath.substring(0, upLoadPath.length() - 1);
// }
// String filePath = qua.substring(0, qua.lastIndexOf("/"));
// String fileName = qua.substring(qua.lastIndexOf("/") + 1);
// if (filePath.startsWith("/") || filePath.startsWith("\\")) {
// filePath = filePath.substring(1);
// }
// try {
// FileDownloader.downloadFile(url, upLoadPath + File.separator + filePath, fileName);
// } catch (Exception e) {
// e.printStackTrace();
// MediaAsyncErrorLog mediaAsyncErrorLog = new MediaAsyncErrorLog();
// mediaAsyncErrorLog.setMediaid(qualification);
// mediaAsyncErrorLogService.save(mediaAsyncErrorLog);
// throw new RuntimeException("员工申请加入机构-资质证文件拉取错误,员工id" + dto.getEmployeeId() + "；文件：" + qua);
// }
// }
// }
// mediaData.setQualification(qualification);
// }
// }
// //无犯罪证明
// {
// if (StringUtils.isNotBlank(noCrimeCertificate)) {
// if (StringUtils.isNotBlank(noCrimeCertificate)) {
// String url = baseUrl + "/sys/common/open/static/" + URLEncoder.encode(noCrimeCertificate, StandardCharsets.UTF_8).replace("%2F", "/") + "?name=" + SafetyUtil.getSecureKey();
// if (upLoadPath.endsWith("/") || upLoadPath.endsWith("\\")) {
// upLoadPath = upLoadPath.substring(0, upLoadPath.length() - 1);
// }
// String filePath = noCrimeCertificate.substring(0, noCrimeCertificate.lastIndexOf("/"));
// String fileName = noCrimeCertificate.substring(noCrimeCertificate.lastIndexOf("/") + 1);
// if (filePath.startsWith("/") || filePath.startsWith("\\")) {
// filePath = filePath.substring(1);
// }
// try {
// FileDownloader.downloadFile(url, upLoadPath + File.separator + filePath, fileName);
// mediaData.setNoCrimeCertificate(noCrimeCertificate);
// } catch (Exception e) {
// e.printStackTrace();
// MediaAsyncErrorLog mediaAsyncErrorLog = new MediaAsyncErrorLog();
// mediaAsyncErrorLog.setMediaid(noCrimeCertificate);
// mediaAsyncErrorLogService.save(mediaAsyncErrorLog);
// throw new RuntimeException("员工申请加入机构-无犯罪证明文件拉取错误,员工id" + dto.getEmployeeId());
// }
// }
// }
// }
// employeesInfoService.updateById(mediaData);
// }
}
JSONObject deptInfo = sysBaseAPI.getDeptInfo();
String orgCode = deptInfo.getString("code");
@ -478,12 +224,6 @@ public class EmployeesMQListener {
//资源文件拉完图片统一存储，不然页面有路径没资源可显示
String idCardPositive = dto.getIdCardPositive();
String idCardNegative = dto.getIdCardNegative();
String healthCertificatePositive = dto.getHealthCertificatePositive();
String healthCertificateNegative = dto.getHealthCertificateNegative();
String bankPositive = dto.getBankPositive();
String bankNegative = dto.getBankNegative();
String qualification = dto.getQualification();
String noCrimeCertificate = dto.getNoCrimeCertificate();
BizEmployeesInfo infoMediaData = new BizEmployeesInfo();
EmployeesApply appMediaData = new EmployeesApply();
{
@ -493,16 +233,6 @@ public class EmployeesMQListener {
empInfo.setId(dto.getEmployeeId());
empInfo.setModifyStatus(null);
empInfo.setIzInvited(null);
{
// empInfo.setIdCardPositive(null);//身份证正面
// empInfo.setIdCardNegative(null);//身份证反面
// empInfo.setHealthCertificatePositive(null);//健康证正面
// empInfo.setHealthCertificateNegative(null);//健康证反面
// empInfo.setBankPositive(null);//银行卡正面
// empInfo.setBankNegative(null);//银行卡反面
// empInfo.setQualification(null);//资质证
// empInfo.setNoCrimeCertificate(null);//无犯罪证明
}
employeesInfoService.updateById(empInfo);
infoMediaData.setId(empInfo.getId());
downMedia = true;
@ -523,292 +253,10 @@ public class EmployeesMQListener {
empApply.setStatus(null);
empApply.setAuditContent(null);
empApply.setDelFlag(null);
{
// empApply.setIdCardPositive(null);//身份证正面
// empApply.setIdCardNegative(null);//身份证反面
// empApply.setHealthCertificatePositive(null);//健康证正面
// empApply.setHealthCertificateNegative(null);//健康证反面
// empApply.setBankPositive(null);//银行卡正面
// empApply.setBankNegative(null);//银行卡反面
// empApply.setQualification(null);//资质证
// empApply.setNoCrimeCertificate(null);//无犯罪证明
}
employeesApplyService.updateById(empApply);
appMediaData.setId(empApply.getId());
downMedia = true;
}
//如果需要拉取全部资源则开始拉取 不需要进行条件三
if (downMedia) {
// new Thread(() -> {
// //去管理平台拉取资源
// {
// JSONObject opeOpenUrl = sysConfigApi.getByKeyByDS("master", "ope_open_url");
// String baseUrl = opeOpenUrl.getString("configValue");
// if (baseUrl.endsWith("/")) {
// baseUrl = baseUrl.substring(0, baseUrl.length() - 1);
// }
// //身份证正面
// {
// if (StringUtils.isNotBlank(idCardPositive)) {
// if (StringUtils.isNotBlank(idCardPositive)) {
// String url = baseUrl + "/sys/common/open/static/" + URLEncoder.encode(idCardPositive, StandardCharsets.UTF_8).replace("%2F", "/") + "?name=" + SafetyUtil.getSecureKey();
// if (upLoadPath.endsWith("/") || upLoadPath.endsWith("\\")) {
// upLoadPath = upLoadPath.substring(0, upLoadPath.length() - 1);
// }
// String filePath = idCardPositive.substring(0, idCardPositive.lastIndexOf("/"));
// String fileName = idCardPositive.substring(idCardPositive.lastIndexOf("/") + 1);
// if (filePath.startsWith("/") || filePath.startsWith("\\")) {
// filePath = filePath.substring(1);
// }
// try {
// FileDownloader.downloadFile(url, upLoadPath + File.separator + filePath, fileName);
// if (StringUtils.isNotBlank(infoMediaData.getId())) {
// infoMediaData.setIdCardPositive(idCardPositive);
// }
// if (StringUtils.isNotBlank(appMediaData.getId())) {
// appMediaData.setIdCardPositive(idCardPositive);
// }
// } catch (Exception e) {
// e.printStackTrace();
// MediaAsyncErrorLog mediaAsyncErrorLog = new MediaAsyncErrorLog();
// mediaAsyncErrorLog.setMediaid(idCardPositive);
// mediaAsyncErrorLogService.save(mediaAsyncErrorLog);
// throw new RuntimeException("其它机构审核员工信息通过后通知本机构修改员工信息-身份证正面文件拉取错误,员工id" + dto.getEmployeeId());
// }
// }
// }
// }
// //身份证反面
// {
// if (StringUtils.isNotBlank(idCardNegative)) {
// if (StringUtils.isNotBlank(idCardNegative)) {
// String url = baseUrl + "/sys/common/open/static/" + URLEncoder.encode(idCardNegative, StandardCharsets.UTF_8).replace("%2F", "/") + "?name=" + SafetyUtil.getSecureKey();
// if (upLoadPath.endsWith("/") || upLoadPath.endsWith("\\")) {
// upLoadPath = upLoadPath.substring(0, upLoadPath.length() - 1);
// }
// String filePath = idCardNegative.substring(0, idCardNegative.lastIndexOf("/"));
// String fileName = idCardNegative.substring(idCardNegative.lastIndexOf("/") + 1);
// if (filePath.startsWith("/") || filePath.startsWith("\\")) {
// filePath = filePath.substring(1);
// }
// try {
// FileDownloader.downloadFile(url, upLoadPath + File.separator + filePath, fileName);
// if (StringUtils.isNotBlank(infoMediaData.getId())) {
// infoMediaData.setIdCardNegative(idCardNegative);
// }
// if (StringUtils.isNotBlank(appMediaData.getId())) {
// appMediaData.setIdCardNegative(idCardNegative);
// }
// } catch (Exception e) {
// e.printStackTrace();
// MediaAsyncErrorLog mediaAsyncErrorLog = new MediaAsyncErrorLog();
// mediaAsyncErrorLog.setMediaid(idCardNegative);
// mediaAsyncErrorLogService.save(mediaAsyncErrorLog);
// throw new RuntimeException("其它机构审核员工信息通过后通知本机构修改员工信息-身份证反面文件拉取错误,员工id" + dto.getEmployeeId());
// }
// }
// }
// }
// //健康证正面
// {
// if (StringUtils.isNotBlank(healthCertificatePositive)) {
// if (StringUtils.isNotBlank(healthCertificatePositive)) {
// String url = baseUrl + "/sys/common/open/static/" + URLEncoder.encode(healthCertificatePositive, StandardCharsets.UTF_8).replace("%2F", "/") + "?name=" + SafetyUtil.getSecureKey();
// if (upLoadPath.endsWith("/") || upLoadPath.endsWith("\\")) {
// upLoadPath = upLoadPath.substring(0, upLoadPath.length() - 1);
// }
// String filePath = healthCertificatePositive.substring(0, healthCertificatePositive.lastIndexOf("/"));
// String fileName = healthCertificatePositive.substring(healthCertificatePositive.lastIndexOf("/") + 1);
// if (filePath.startsWith("/") || filePath.startsWith("\\")) {
// filePath = filePath.substring(1);
// }
// try {
// FileDownloader.downloadFile(url, upLoadPath + File.separator + filePath, fileName);
// if (StringUtils.isNotBlank(infoMediaData.getId())) {
// infoMediaData.setHealthCertificatePositive(healthCertificatePositive);
// }
// if (StringUtils.isNotBlank(appMediaData.getId())) {
// appMediaData.setHealthCertificatePositive(healthCertificatePositive);
// }
// } catch (Exception e) {
// e.printStackTrace();
// MediaAsyncErrorLog mediaAsyncErrorLog = new MediaAsyncErrorLog();
// mediaAsyncErrorLog.setMediaid(healthCertificatePositive);
// mediaAsyncErrorLogService.save(mediaAsyncErrorLog);
// throw new RuntimeException("其它机构审核员工信息通过后通知本机构修改员工信息-健康证正面文件拉取错误,员工id" + dto.getEmployeeId());
// }
// }
// }
// }
// //健康证反面
// {
// if (StringUtils.isNotBlank(healthCertificateNegative)) {
// if (StringUtils.isNotBlank(healthCertificateNegative)) {
// String url = baseUrl + "/sys/common/open/static/" + URLEncoder.encode(healthCertificateNegative, StandardCharsets.UTF_8).replace("%2F", "/") + "?name=" + SafetyUtil.getSecureKey();
// if (upLoadPath.endsWith("/") || upLoadPath.endsWith("\\")) {
// upLoadPath = upLoadPath.substring(0, upLoadPath.length() - 1);
// }
// String filePath = healthCertificateNegative.substring(0, healthCertificateNegative.lastIndexOf("/"));
// String fileName = healthCertificateNegative.substring(healthCertificateNegative.lastIndexOf("/") + 1);
// if (filePath.startsWith("/") || filePath.startsWith("\\")) {
// filePath = filePath.substring(1);
// }
// try {
// FileDownloader.downloadFile(url, upLoadPath + File.separator + filePath, fileName);
// if (StringUtils.isNotBlank(infoMediaData.getId())) {
// infoMediaData.setHealthCertificateNegative(healthCertificateNegative);
// }
// if (StringUtils.isNotBlank(appMediaData.getId())) {
// appMediaData.setHealthCertificateNegative(healthCertificateNegative);
// }
// } catch (Exception e) {
// e.printStackTrace();
// MediaAsyncErrorLog mediaAsyncErrorLog = new MediaAsyncErrorLog();
// mediaAsyncErrorLog.setMediaid(healthCertificateNegative);
// mediaAsyncErrorLogService.save(mediaAsyncErrorLog);
// throw new RuntimeException("其它机构审核员工信息通过后通知本机构修改员工信息-健康证反面文件拉取错误,员工id" + dto.getEmployeeId());
// }
// }
// }
// }
// //银行卡正面
// {
// if (StringUtils.isNotBlank(bankPositive)) {
// if (StringUtils.isNotBlank(bankPositive)) {
// String url = baseUrl + "/sys/common/open/static/" + URLEncoder.encode(bankPositive, StandardCharsets.UTF_8).replace("%2F", "/") + "?name=" + SafetyUtil.getSecureKey();
// if (upLoadPath.endsWith("/") || upLoadPath.endsWith("\\")) {
// upLoadPath = upLoadPath.substring(0, upLoadPath.length() - 1);
// }
// String filePath = bankPositive.substring(0, bankPositive.lastIndexOf("/"));
// String fileName = bankPositive.substring(bankPositive.lastIndexOf("/") + 1);
// if (filePath.startsWith("/") || filePath.startsWith("\\")) {
// filePath = filePath.substring(1);
// }
// try {
// FileDownloader.downloadFile(url, upLoadPath + File.separator + filePath, fileName);
// if (StringUtils.isNotBlank(infoMediaData.getId())) {
// infoMediaData.setBankPositive(bankPositive);
// }
// if (StringUtils.isNotBlank(appMediaData.getId())) {
// appMediaData.setBankPositive(bankPositive);
// }
// } catch (Exception e) {
// e.printStackTrace();
// MediaAsyncErrorLog mediaAsyncErrorLog = new MediaAsyncErrorLog();
// mediaAsyncErrorLog.setMediaid(bankPositive);
// mediaAsyncErrorLogService.save(mediaAsyncErrorLog);
// throw new RuntimeException("其它机构审核员工信息通过后通知本机构修改员工信息-银行卡正面文件拉取错误,员工id" + dto.getEmployeeId());
// }
// }
// }
// }
// //银行卡反面
// {
// if (StringUtils.isNotBlank(bankNegative)) {
// if (StringUtils.isNotBlank(bankNegative)) {
// String url = baseUrl + "/sys/common/open/static/" + URLEncoder.encode(bankNegative, StandardCharsets.UTF_8).replace("%2F", "/") + "?name=" + SafetyUtil.getSecureKey();
// if (upLoadPath.endsWith("/") || upLoadPath.endsWith("\\")) {
// upLoadPath = upLoadPath.substring(0, upLoadPath.length() - 1);
// }
// String filePath = bankNegative.substring(0, bankNegative.lastIndexOf("/"));
// String fileName = bankNegative.substring(bankNegative.lastIndexOf("/") + 1);
// if (filePath.startsWith("/") || filePath.startsWith("\\")) {
// filePath = filePath.substring(1);
// }
// try {
// FileDownloader.downloadFile(url, upLoadPath + File.separator + filePath, fileName);
// if (StringUtils.isNotBlank(infoMediaData.getId())) {
// infoMediaData.setBankNegative(bankNegative);
// }
// if (StringUtils.isNotBlank(appMediaData.getId())) {
// appMediaData.setBankNegative(bankNegative);
// }
// } catch (Exception e) {
// e.printStackTrace();
// MediaAsyncErrorLog mediaAsyncErrorLog = new MediaAsyncErrorLog();
// mediaAsyncErrorLog.setMediaid(bankNegative);
// mediaAsyncErrorLogService.save(mediaAsyncErrorLog);
// throw new RuntimeException("其它机构审核员工信息通过后通知本机构修改员工信息-银行卡反面文件拉取错误,员工id" + dto.getEmployeeId());
// }
// }
// }
// }
// //资质证(多张使用逗号分隔）
// {
// if (StringUtils.isNotBlank(qualification)) {
// List<String> list = Arrays.asList(qualification.split(","));
// for (int i = 0; i < list.size(); i++) {
// String qua = list.get(i);
// if (StringUtils.isNotBlank(qua)) {
// String url = baseUrl + "/sys/common/open/static/" + URLEncoder.encode(qua, StandardCharsets.UTF_8).replace("%2F", "/") + "?name=" + SafetyUtil.getSecureKey();
// if (upLoadPath.endsWith("/") || upLoadPath.endsWith("\\")) {
// upLoadPath = upLoadPath.substring(0, upLoadPath.length() - 1);
// }
// String filePath = qua.substring(0, qua.lastIndexOf("/"));
// String fileName = qua.substring(qua.lastIndexOf("/") + 1);
// if (filePath.startsWith("/") || filePath.startsWith("\\")) {
// filePath = filePath.substring(1);
// }
// try {
// FileDownloader.downloadFile(url, upLoadPath + File.separator + filePath, fileName);
// } catch (Exception e) {
// e.printStackTrace();
// MediaAsyncErrorLog mediaAsyncErrorLog = new MediaAsyncErrorLog();
// mediaAsyncErrorLog.setMediaid(qualification);
// mediaAsyncErrorLogService.save(mediaAsyncErrorLog);
// throw new RuntimeException("其它机构审核员工信息通过后通知本机构修改员工信息-资质证文件拉取错误,员工id" + dto.getEmployeeId() + "；文件：" + qua);
// }
// }
// }
// if (StringUtils.isNotBlank(infoMediaData.getId())) {
// infoMediaData.setQualification(qualification);
// }
// if (StringUtils.isNotBlank(appMediaData.getId())) {
// appMediaData.setQualification(qualification);
// }
// }
// }
// //无犯罪证明
// {
// if (StringUtils.isNotBlank(noCrimeCertificate)) {
// if (StringUtils.isNotBlank(noCrimeCertificate)) {
// String url = baseUrl + "/sys/common/open/static/" + URLEncoder.encode(noCrimeCertificate, StandardCharsets.UTF_8).replace("%2F", "/") + "?name=" + SafetyUtil.getSecureKey();
// if (upLoadPath.endsWith("/") || upLoadPath.endsWith("\\")) {
// upLoadPath = upLoadPath.substring(0, upLoadPath.length() - 1);
// }
// String filePath = noCrimeCertificate.substring(0, noCrimeCertificate.lastIndexOf("/"));
// String fileName = noCrimeCertificate.substring(noCrimeCertificate.lastIndexOf("/") + 1);
// if (filePath.startsWith("/") || filePath.startsWith("\\")) {
// filePath = filePath.substring(1);
// }
// try {
// FileDownloader.downloadFile(url, upLoadPath + File.separator + filePath, fileName);
// if (StringUtils.isNotBlank(infoMediaData.getId())) {
// infoMediaData.setNoCrimeCertificate(noCrimeCertificate);
// }
// if (StringUtils.isNotBlank(appMediaData.getId())) {
// appMediaData.setNoCrimeCertificate(noCrimeCertificate);
// }
// } catch (Exception e) {
// e.printStackTrace();
// MediaAsyncErrorLog mediaAsyncErrorLog = new MediaAsyncErrorLog();
// mediaAsyncErrorLog.setMediaid(noCrimeCertificate);
// mediaAsyncErrorLogService.save(mediaAsyncErrorLog);
// throw new RuntimeException("其它机构审核员工信息通过后通知本机构修改员工信息-无犯罪证明文件拉取错误,员工id" + dto.getEmployeeId());
// }
// }
// }
// }
// if (StringUtils.isNotBlank(infoMediaData.getId())) {
// employeesInfoService.updateById(infoMediaData);
// }
// if (StringUtils.isNotBlank(appMediaData.getId())) {
// employeesApplyService.updateById(appMediaData);
// }
// }
// }).start();
return;
}
//条件三 如果不满足条件一、二 否则判断是否获取过身份证 - 只更新身份证字段和资源
if (!downMedia && empApply != null && "0".equals(empApply.getApplyType())) {
QueryWrapper<BizEmployeesMedia> mqw = new QueryWrapper<>();
@ -822,72 +270,12 @@ public class EmployeesMQListener {
bizEmployeesMedia.setCardZmPath("2");
bizEmployeesMedia.setCardFmPath("2");
employeesMediaService.update(bizEmployeesMedia, mqw);
// new Thread(() -> {
//去管理平台拉取资源
{
// JSONObject opeOpenUrl = sysConfigApi.getByKeyByDS("master", "ope_open_url");
// String baseUrl = opeOpenUrl.getString("configValue");
// if (baseUrl.endsWith("/")) {
// baseUrl = baseUrl.substring(0, baseUrl.length() - 1);
// }
//身份证正面
// {
// if (StringUtils.isNotBlank(idCardPositive)) {
// if (StringUtils.isNotBlank(idCardPositive)) {
// String url = baseUrl + "/sys/common/open/static/" + URLEncoder.encode(idCardPositive, StandardCharsets.UTF_8).replace("%2F", "/") + "?name=" + SafetyUtil.getSecureKey();
// if (upLoadPath.endsWith("/") || upLoadPath.endsWith("\\")) {
// upLoadPath = upLoadPath.substring(0, upLoadPath.length() - 1);
// }
// String filePath = idCardPositive.substring(0, idCardPositive.lastIndexOf("/"));
// String fileName = idCardPositive.substring(idCardPositive.lastIndexOf("/") + 1);
// if (filePath.startsWith("/") || filePath.startsWith("\\")) {
// filePath = filePath.substring(1);
// }
// try {
// FileDownloader.downloadFile(url, upLoadPath + File.separator + filePath, fileName);
employeesApply2.setIdCardPositive(idCardPositive);
// bizEmployeesMedia.setCardZmPath("2");
// } catch (Exception e) {
// e.printStackTrace();
// MediaAsyncErrorLog mediaAsyncErrorLog = new MediaAsyncErrorLog();
// mediaAsyncErrorLog.setMediaid(idCardPositive);
// mediaAsyncErrorLogService.save(mediaAsyncErrorLog);
// throw new RuntimeException("其它机构审核员工信息通过后通知本机构修改员工信息-身份证正面文件拉取错误,员工id" + dto.getEmployeeId());
// }
// }
// }
// }
//身份证反面
// {
// if (StringUtils.isNotBlank(idCardNegative)) {
// if (StringUtils.isNotBlank(idCardNegative)) {
// String url = baseUrl + "/sys/common/open/static/" + URLEncoder.encode(idCardNegative, StandardCharsets.UTF_8).replace("%2F", "/") + "?name=" + SafetyUtil.getSecureKey();
// if (upLoadPath.endsWith("/") || upLoadPath.endsWith("\\")) {
// upLoadPath = upLoadPath.substring(0, upLoadPath.length() - 1);
// }
// String filePath = idCardNegative.substring(0, idCardNegative.lastIndexOf("/"));
// String fileName = idCardNegative.substring(idCardNegative.lastIndexOf("/") + 1);
// if (filePath.startsWith("/") || filePath.startsWith("\\")) {
// filePath = filePath.substring(1);
// }
// try {
// FileDownloader.downloadFile(url, upLoadPath + File.separator + filePath, fileName);
employeesApply2.setIdCardNegative(idCardNegative);
// bizEmployeesMedia.setCardFmPath("2");
// } catch (Exception e) {
// e.printStackTrace();
// MediaAsyncErrorLog mediaAsyncErrorLog = new MediaAsyncErrorLog();
// mediaAsyncErrorLog.setMediaid(idCardNegative);
// mediaAsyncErrorLogService.save(mediaAsyncErrorLog);
// throw new RuntimeException("其它机构审核员工信息通过后通知本机构修改员工信息-身份证反面文件拉取错误,员工id" + dto.getEmployeeId());
// }
// }
// }
// }
employeesApplyService.updateById(employeesApply2);
// employeesMediaService.update(bizEmployeesMedia, mqw);
}
// }).start();
}
}
}
@ -919,32 +307,6 @@ public class EmployeesMQListener {
BizEmployeesInfo employeesInfo = employeesInfoService.getOne(qw);
SysUserEntity user = sysUserAPI.getOne(employeeId);
if (user == null) {
// user = new SysUserEntity();
// user.setUsername(employeesInfo.getTel());
// user.setRealname(employeesInfo.getName());
// String salt = oConvertUtils.randomGen(8);
// String passwordEncode = PasswordUtil.encrypt(user.getUsername(), "123456", salt);
// user.setPassword(passwordEncode);
// user.setSalt(salt);
// String avatar = employeesInfo.getHeadPath();
// user.setAvatar(avatar);
// Date birthday = employeesInfo.getDateOfBirth();
// user.setBirthday(birthday);
// String sex = employeesInfo.getSex();
// if(sex.equals("男")){
// user.setSex(1);
// }else if(sex.equals("女")){
// user.setSex(2);
// }else{
// user.setSex(0);
// }
// user.setPhone(employeesInfo.getTel());
// user.setOrgCode(employeesInfo.getSysOrgCode());
// user.setStatus(1);
// user.setDelFlag(CommonConstant.DEL_FLAG_0);
// user.setCreateTime(new Date());//设置创建时间
// user.setEmployeesId(employeeId);
// sysUserAPI.save(user);
//审核通过 - 给员工添加账号
JSONObject deptInfo = sysBaseAPI.getDeptInfo();
@ -1078,9 +440,6 @@ public class EmployeesMQListener {
errorHandler = "employeesMQErrorHandler"
)
public void handleSysUserInfo(SysUserMQDto dto) {
// String employeeId = dto.getEmployeeId();
// QueryWrapper<SysUserEntity> queryWrapper = new QueryWrapper<>();
// queryWrapper.eq("employees_id", employeeId);
SysUserEntity user = sysUserAPI.getOne(dto.getEmployeeId());
if (user != null) {
SysUserMQDto sysUserMQDto = new SysUserMQDto();
@ -1119,7 +478,6 @@ public class EmployeesMQListener {
/**
* 更新机构负责人用户表employees_id
*
*/
@RabbitListener(
bindings = @QueueBinding(
@ -1141,7 +499,6 @@ public class EmployeesMQListener {
bizEmployeesInfo.setHouseAddress(dto.getHouseAddress());//地址
bizEmployeesInfo.setIdCardPositive(dto.getIdCardPositive());//身份证正面
bizEmployeesInfo.setIdCardNegative(dto.getIdCardNegative());//身份证反面
// bizEmployeesInfo.set(dto.getIssuingAuthority());//身份证发证机构
bizEmployeesInfo.setStartTime(dto.getStartTime());
bizEmployeesInfo.setEndTime(dto.getEndTime());
bizEmployeesInfo.setTel(dto.getTel());