Merge remote-tracking branch 'origin/master'

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/message/BpmMessageServiceImpl.java

@@ -16,6 +16,7 @@ import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
@@ -47,6 +48,8 @@ public class BpmMessageServiceImpl implements BpmMessageService {
     private WebProperties webProperties;
     @Autowired
     private NotifyMessageSendApi notifyMessageSendApi;
+    @Value("${system.url}")
+    private String systemUrl;
 
     @Override
     public void sendMessageWhenProcessInstanceApprove(BpmMessageSendWhenProcessInstanceApproveReqDTO reqDTO) {
@@ -91,7 +94,7 @@ public class BpmMessageServiceImpl implements BpmMessageService {
             notifyMessageSendApi.sendSingleMessageToAdmin(new NotifySendSingleToUserReqDTO()
                     .setUserId(reqDTO.getAssigneeUserId()).setTemplateCode(templateCode).setTemplateParams(templateParams));
             msg = "您有新的故障上报流程待处理，请审批。"+"["+ DateUtil.format(new Date(),"yyyy-MM-dd hh:mm:ss")+"]";
-            url="https://iot.deepoil.cc/dingding?id="+reqDTO.getProcessInstanceId()+"&type=failureReport&userId="+reqDTO.getAssigneeUserId();
+            url=systemUrl + "dingding?id="+reqDTO.getProcessInstanceId()+"&type=failureReport&userId="+reqDTO.getAssigneeUserId();
         } else if ("委外维修工单流程".equals(reqDTO.getProcessInstanceName())){
             String templateCode = "maintain-out";
             templateParams.put("businessType", "maintainOut");
@@ -100,7 +103,7 @@ public class BpmMessageServiceImpl implements BpmMessageService {
             notifyMessageSendApi.sendSingleMessageToAdmin(new NotifySendSingleToUserReqDTO()
                     .setUserId(reqDTO.getAssigneeUserId()).setTemplateCode(templateCode).setTemplateParams(templateParams));
             msg = "您有新的委外维修流程，请审批。"+"["+ DateUtil.format(new Date(),"yyyy-MM-dd hh:mm:ss")+"]";
-            url="https://iot.deepoil.cc/dingding?id="+reqDTO.getProcessInstanceId()+"&type=maintainOut&userId="+reqDTO.getAssigneeUserId();
+            url=systemUrl + "dingding?id="+reqDTO.getProcessInstanceId()+"&type=maintainOut&userId="+reqDTO.getAssigneeUserId();
         }
         dingtalkSendApi.send(user.getMobile(), msg,"link",url);
     }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/inspect/item/IotInspectItemController.java

@@ -13,6 +13,8 @@ import cn.iocoder.yudao.module.pms.dal.dataobject.IotDeviceDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectItemDO;
 import cn.iocoder.yudao.module.pms.service.IotDeviceService;
 import cn.iocoder.yudao.module.pms.service.inspect.IotInspectItemService;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -43,6 +45,8 @@ public class IotInspectItemController {
     private IotInspectItemService iotInspectItemService;
     @Autowired
     private IotDeviceService iotDeviceService;
+    @Autowired
+    private AdminUserApi adminUserApi;
 
     @PostMapping("/create")
     @Operation(summary = "创建巡检项")
@@ -82,6 +86,14 @@ public class IotInspectItemController {
     @PreAuthorize("@ss.hasPermission('rq:iot-inspect-item:query')")
     public CommonResult<PageResult<IotInspectItemRespVO>> getIotInspectItemPage(@Valid IotInspectItemPageReqVO pageReqVO) {
         PageResult<IotInspectItemDO> pageResult = iotInspectItemService.getIotInspectItemPage(pageReqVO);
+        pageResult.getList().forEach(item->{
+            if (Objects.nonNull(item.getCreator())) {
+                AdminUserRespDTO user = adminUserApi.getUser(Long.valueOf(item.getCreator()));
+                if (Objects.nonNull(user)) {
+                    item.setCreateName(user.getNickname());
+                }
+            }
+        });
         return success(BeanUtils.toBean(pageResult, IotInspectItemRespVO.class));
     }
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/inspect/item/vo/IotInspectItemRespVO.java

@@ -62,4 +62,6 @@ public class IotInspectItemRespVO {
     private String urls;
     @Schema(description = "设备编码")
     private String deviceCode;
+
+    private String createName;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/inspect/IotInspectItemDO.java

@@ -70,4 +70,6 @@ public class IotInspectItemDO extends BaseDO {
 
     private String urls;
     private String deviceCode;
+
+    private String createName;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/message/PmsMessage.java

@@ -9,6 +9,7 @@ import cn.iocoder.yudao.module.system.api.dingtalk.DingtalkSendApi;
 import cn.iocoder.yudao.module.system.api.notify.NotifyMessageSendApi;
 import cn.iocoder.yudao.module.system.api.notify.dto.NotifySendSingleToUserReqDTO;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -27,6 +28,8 @@ public class PmsMessage {
     private DingtalkSendApi dingtalkSendApi;
     @Resource
     private IotOpeationFillService iotOpeationFillService;
+    @Value("${system.url}")
+    private String systemUrl;
 
     public void sendMessage(Long businessId, String name, String businessType, Long userId, String mobile){
 
@@ -81,11 +84,11 @@ public class PmsMessage {
                 ZonedDateTime zonedDateTime = fillDO.getCreateTime().atZone(zoneId);
                 Instant instant = zonedDateTime.toInstant();
                 long timestamp = instant.toEpochMilli();
-                url="https://iot.deepoil.cc/dingding?deptId="+fillDO.getDeptId()+"&userId="+userId
+                url=systemUrl + "dingding?deptId="+fillDO.getDeptId()+"&userId="+userId
                         +"&createTime="+timestamp+"&id="
                         +businessId+"&orderStatus="+fillDO.getOrderStatus()+"&type="+businessType+"&userName="+fillDO.getUserName()+"&orderName="+fillDO.getOrderName();
             }else{
-                url="https://iot.deepoil.cc/dingding?id="+businessId+"&type="+businessType+"&userId="+userId;
+                url=systemUrl + "dingding?id="+businessId+"&type="+businessType+"&userId="+userId;
             }
 
             dingtalkSendApi.send(mobile, msg,"link", url);

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dingtalk/DingtalkSendServiceImpl.java

@@ -42,6 +42,8 @@ public class DingtalkSendServiceImpl implements DingtalkSendApi {
 
     @Value("${dingtalk.URL_GET_USERINFO_BYMOBILE}")
     private String getUserInfoByMobile;
+    @Value("${system.url}")
+    private String systemUrl;
 
     @Override
     public NotifySendResponse send(String sendAccount, String sendContent, String type, String jumpUrl) {
@@ -77,7 +79,7 @@ public class DingtalkSendServiceImpl implements DingtalkSendApi {
             DingTalkMsgParams dingTalkMsgParams = new DingTalkMsgParams();
             dingTalkMsgParams.setMessageUrl(jumpUrl);
             dingTalkMsgParams.setTitle("DeepOil-PMS消息提醒");
-            dingTalkMsgParams.setPicUrl("https://iot.deepoil.cc/images/logo.png");
+            dingTalkMsgParams.setPicUrl(systemUrl + "images/logo.png");
             OapiMessageCorpconversationAsyncsendV2Request.Msg msg = this.createOapiMessageMsg(dingTalkMsgParams, sendContent, type);
             req.setMsg(msg);
             OapiMessageCorpconversationAsyncsendV2Response rsp = dingTalkClient.execute(req, accessToken);

yudao-server/src/main/resources/application-dev.yaml

@@ -272,8 +272,5 @@ yanfan:
 # 插件配置
 pf4j:
   pluginsDir: ${user.home}/plugins # 插件目录
-
-
-
-
-
+system:
+  url: https://iot.deepoil.cc/

yudao-server/src/main/resources/application-test.yaml

@@ -273,7 +273,8 @@ yanfan:
 pf4j:
   pluginsDir: ${user.home}/plugins # 插件目录
 
-
+system:
+  url: https://iot.deepoil.cc/