|
|
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.huaxu.client.UserCenterClient;
|
|
|
import com.huaxu.common.FileUploadUtil;
|
|
|
+import com.huaxu.entity.Message;
|
|
|
import com.huaxu.model.AjaxMessage;
|
|
|
import com.huaxu.model.LoginUser;
|
|
|
import com.huaxu.model.Pagination;
|
|
|
@@ -21,10 +22,9 @@ import com.huaxu.process.entity.ProcessDefinition;
|
|
|
import com.huaxu.process.service.WorkFlowService;
|
|
|
import com.huaxu.process.utils.Action;
|
|
|
import com.huaxu.task.entity.PlanManage;
|
|
|
-import com.huaxu.task.entity.TaskManage;
|
|
|
-import com.huaxu.task.entity.UserEntity;
|
|
|
import com.huaxu.task.service.PlanManageService;
|
|
|
import com.huaxu.util.DatesUtil;
|
|
|
+import com.huaxu.util.MessageSendUtil;
|
|
|
import com.huaxu.util.UserUtil;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
@@ -62,6 +62,9 @@ public class WorkOrderManageController {
|
|
|
@Autowired
|
|
|
UserCenterClient userCenterClient;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private MessageSendUtil messageSendUtil;
|
|
|
+
|
|
|
@Value("${UMIS.sys_config_path}")
|
|
|
private String baseDir;
|
|
|
|
|
|
@@ -85,6 +88,25 @@ public class WorkOrderManageController {
|
|
|
workOrderManage.setTaskNo(DatesUtil.formatDate(new Date(),"yyyyMMddHHmmss")+String.valueOf((int) (Math.random()*(9999-1000)+1000)));
|
|
|
workOrderManageService.insertSelective(workOrderManage);
|
|
|
int result =workOrderManage.getId();//返回新增数据的id
|
|
|
+
|
|
|
+ //发消息
|
|
|
+ Message message=new Message();
|
|
|
+ message.setStatus(1);
|
|
|
+ message.setCreateBy(currentUser.getUsername());
|
|
|
+ message.setTenantId(currentUser.getTenantId());
|
|
|
+ message.setMessageContent(workOrderManage.getTaskDesc());
|
|
|
+ message.setMessageId(UUID.randomUUID().toString());
|
|
|
+ message.setMessageType(3);
|
|
|
+ message.setMessageTemplateId(3);
|
|
|
+ message.setChannel(0);
|
|
|
+ message.setUrl(String.valueOf(result));
|
|
|
+ //获取需要发消息的用户
|
|
|
+ List<Long> users=userCenterClient.findUserIdsForOrg();
|
|
|
+ for(Long user : users){
|
|
|
+ message.setUserId(user.intValue());
|
|
|
+ messageSendUtil.send(message);
|
|
|
+ }
|
|
|
+
|
|
|
return new AjaxMessage<>(ResultStatus.OK, result);
|
|
|
}
|
|
|
/**
|
yuejiaying