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

添加平台构建工单

This commit is contained in:
yangjun 2025-07-11 08:36:37 +08:00
parent 2927e92e02
commit 80e7a3058d
9 changed files with 77 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/workorder/entity/WorkOrderEntity.java
View File

@ -51,4 +51,6 @@ public class WorkOrderEntity implements Serializable {
private String tel;
/**工单提交人邮件地址*/
private String email;
/**工单类型 1平台构建*/
private String workType;
}

3
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/controller/WorkOrderController.java
View File

@ -98,10 +98,9 @@ public class WorkOrderController extends JeecgController<WorkOrder, IWorkOrderSe
*/
@AutoLog(value = "工单表-编辑")
@ApiOperation(value="工单表-编辑", notes="工单表-编辑")
@RequiresPermissions("workorder:nu_work_order:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody WorkOrder workOrder) {
workOrderService.updateById(workOrder);
workOrderService.updateMqById(workOrder);
return Result.OK("编辑成功!");
}

6
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/entity/WorkOrder.java
View File

@ -110,4 +110,10 @@ public class WorkOrder implements Serializable {
@Excel(name = "工单提交人邮件地址", width = 15)
@ApiModelProperty(value = "工单提交人邮件地址")
private java.lang.String email;
/**状态 1平台构建*/
@Dict(dicCode = "work_type")
@Excel(name = "工单类型", width = 15)
@ApiModelProperty(value = "工单类型")
private java.lang.String workType;
}

1
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/service/IWorkOrderService.java
View File

@ -11,4 +11,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface IWorkOrderService extends IService<WorkOrder> {
void updateMqById(WorkOrder workOrder);
}

15
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/service/impl/WorkOrderServiceImpl.java
View File

@ -1,11 +1,14 @@
package com.nu.modules.workorder.service.impl;
import com.nu.dto.WorkOrderMQDto;
import com.nu.modules.workorder.api.IWorkOrderApi;
import com.nu.modules.workorder.entity.WorkOrder;
import com.nu.modules.workorder.entity.WorkOrderEntity;
import com.nu.modules.workorder.mapper.WorkOrderMapper;
import com.nu.modules.workorder.service.IWorkOrderService;
import com.nu.utils.RabbitMQUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@ -19,10 +22,22 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@Service
public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder> implements IWorkOrderService, IWorkOrderApi {
@Autowired
private RabbitMQUtil rabbitMQUtil;
@Override
public int createWorkOrder(WorkOrderEntity workOrderEntity) {
WorkOrder workOrder = new WorkOrder();
BeanUtils.copyProperties(workOrderEntity,workOrder);
return baseMapper.insert(workOrder);
}
@Override
public void updateMqById(WorkOrder workOrder) {
baseMapper.updateById(workOrder);
WorkOrderMQDto workOrderMQDto = new WorkOrderMQDto();
BeanUtils.copyProperties(workOrder,workOrderMQDto);
rabbitMQUtil.sendToExchange("nu.workOrder.reply", "nu.workOrder.reply", workOrderMQDto);
}
}

45
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/orginfo/listener/OrgInfoMQListener.java
View File

@ -7,8 +7,11 @@ import com.nu.modules.orginfo.service.IOrgInfoService;
import com.nu.modules.workorder.api.IWorkOrderApi;
import com.nu.modules.workorder.entity.WorkOrderEntity;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.common.system.entity.SysDepartEntity;
import org.jeecg.common.system.vo.SysDepartModel;
import org.springframework.amqp.core.ExchangeTypes;
import org.springframework.amqp.rabbit.annotation.Exchange;
import org.springframework.amqp.rabbit.annotation.Queue;
@ -37,6 +40,7 @@ public class OrgInfoMQListener {
* 2、向机构附加信息表中插入数据
* @param dto
*/
@AutoLog(value = "管理平台提取加盟审核工单")
@RabbitListener(
bindings = @QueueBinding(
value = @Queue(name = "hldy.orgApply.build"),
@ -49,21 +53,33 @@ public class OrgInfoMQListener {
OrgInfo orgInfo = new OrgInfo();
BeanUtils.copyProperties(dto,orgInfo);
orgInfo.setPkId(dto.getId());
//向机构附加信息表中插入数据
orgInfoService.save(orgInfo);
//在系统机构表中创建机构信息
SysDepartEntity sysDepart = new SysDepartEntity();
sysDepart.setId(dto.getId());
sysDepart.setCreateBy("admin");
sysDepart.setDepartName(dto.getComName());
sysDepart.setDepartOrder(0);
sysDepart.setOrgCategory("1");
sysDepart.setOrgType("1");
sysDepart.setDelFlag("0");
sysDepart.setIzLeaf(1);
sysDepart.setPlatType("ywjg");
String orgCode = sysBaseAPI.addOrg(sysDepart);
OrgInfo orgInfo1 = orgInfoService.getById(dto.getId());
//数据库没有值的时候才新增一条记录
if(orgInfo1==null || StringUtils.isBlank(orgInfo1.getId())){
//向机构附加信息表中插入数据
orgInfoService.save(orgInfo);
}
SysDepartModel departModel = sysBaseAPI.selectDepartById(dto.getId());
String orgCode = departModel.getOrgCode();
//数据库没有值的时候才新增一条记录
if(departModel==null || StringUtils.isBlank(departModel.getId())){
//在系统机构表中创建机构信息
SysDepartEntity sysDepart = new SysDepartEntity();
sysDepart.setId(dto.getId());
sysDepart.setCreateBy("admin");
sysDepart.setDepartName(dto.getComName());
sysDepart.setDepartOrder(0);
sysDepart.setOrgCategory("1");
sysDepart.setOrgType("1");
sysDepart.setDelFlag("0");
sysDepart.setIzLeaf(1);
sysDepart.setPlatType("ywjg");
orgCode = sysBaseAPI.addOrg(sysDepart);
}
//新增工单
WorkOrderEntity workOrderEntity = new WorkOrderEntity();
@ -81,6 +97,7 @@ public class OrgInfoMQListener {
workOrderEntity.setCreateTime(new Date());
workOrderEntity.setTel(dto.getOperateTelephone());
workOrderEntity.setEmail(dto.getOperateEmail());
workOrderEntity.setWorkType("1");//1平台构建
workOrderApi.createWorkOrder(workOrderEntity);
}

2
nursing-unit-common/src/main/java/com/nu/dto/WorkOrderMQDto.java
View File

@ -51,4 +51,6 @@ public class WorkOrderMQDto implements Serializable {
private String tel;
/**工单提交人邮件地址*/
private String email;
/**状态 1平台构建*/
private String workType;
}

9
nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java
View File

@ -628,4 +628,13 @@ public interface ISysBaseAPI extends CommonAPI {
JSONObject getOrgInfo(String orgCode);
String addOrg(SysDepartEntity sysDepart);
/**
* 通过部门id获取部门全部信息
*
* @param id 部门id
* @return SysDepartModel对象
*/
SysDepartModel selectDepartById(String id);
}

10
nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java
View File

@ -1923,6 +1923,16 @@ public class SysBaseApiImpl implements ISysBaseAPI {
return code+"";
}
@Override
public SysDepartModel selectDepartById(String id) {
SysDepart depart = sysDepartService.getDepartById(id);
SysDepartModel sysDepartModel = new SysDepartModel();
if(depart!=null){
BeanUtils.copyProperties(depart, sysDepartModel);
}
return sysDepartModel;
}
@Nullable
private JSONObject queryOrgInfo(String orgCode) {
QueryWrapper<SysDepart> qw = new QueryWrapper<>();