hfxc226 2 жил өмнө
parent
commit
20a9b07cbf

+ 1 - 23
platform-common/src/main/resources/repairEmail.vm

@@ -1,23 +1 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-</head>
-<body>
-<div style="margin: 0 auto; font-size: 15px; color: #000; font-family: 'SimSun'; position: relative">
-    <div class="content" style="line-height: 28px">
-        <div style="text-align:center;">有一条新的报修消息</div>
-    </div>
-    <div style="text-align:center">
-        <p style="padding:0px;margin: 10px 0;">维修单号:${no}</p>
-        <p style="padding:0px;margin: 10px 0;">设备名称: ${sbName}</p>
-        <p style="padding:0px;margin: 10px 0;">设备编号:${sbNo}</p>
-        <p style="padding:0px;margin: 10px 0;">位置:${sbCph}</p>
-        <p style="padding:0px;margin: 10px 0;">报修人:${actualUser}</p>
-        <p style="padding:0px;margin: 10px 0;">故障描述:${repairDesc}</p>
-    </div>
-</div>
-</body>
-</html>
+有一条新的报修消息,维修单号:${no},设备名称: ${sbName},设备编号:${sbNo},位置:${sbCph},报修人:${actualUser},故障描述:${repairDesc}

+ 3 - 3
platform-rest/src/main/java/com/platform/rest/controller/yongyou/YongyouController.java

@@ -45,7 +45,7 @@ public class YongyouController {
     private final YongyouService yongyouService;
 
     /**
-     * 查询用友存量分页数据
+     * 查询用友备件分页数据
      *
      * @param sparePartInfoDTO 备件查询条件DTO
      * @param pageNum          当前页码
@@ -53,7 +53,7 @@ public class YongyouController {
      * @return R
      */
     @GetMapping("/spare/page")
-    public R<AbstractPageResultBean<SparePartInfoVO>> query(SparePartInfoDTO sparePartInfoDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
+    public R<AbstractPageResultBean<SparePartInfoVO>> querySpare(SparePartInfoDTO sparePartInfoDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
         return new R<>(yongyouService.selectPageList(sparePartInfoDTO, pageNum, pageSize));
     }
 
@@ -66,7 +66,7 @@ public class YongyouController {
      * @return R
      */
     @GetMapping("/spareStore/page")
-    public R<AbstractPageResultBean<SpareStoreVO>> query(SpareStoreDTO spareStoreDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
+    public R<AbstractPageResultBean<SpareStoreVO>> querySpareStore(SpareStoreDTO spareStoreDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
         return new R<>(yongyouService.selectPageList(spareStoreDTO, pageNum, pageSize));
     }
 

+ 1 - 7
platform-rest/src/main/resources/templates/repairEmail.ftl

@@ -1,7 +1 @@
-有新的报修单等待处理。
-维修单号:${no}<br/>
-设备名称:${sbName}\n
-设备编号:${sbNo}\r
-位置:${sbCph}
-报修人:${actualUser}
-故障描述:${repairDesc}
+有新的报修单等待处理,维修单号:${no},设备名称:${sbName},设备编号:${sbNo},位置:${sbCph},报修人:${actualUser},故障描述:${repairDesc}

+ 1 - 1
platform-service/src/main/java/com/platform/service/yongyou/impl/YongyouServiceImpl.java

@@ -96,7 +96,7 @@ public class YongyouServiceImpl implements YongyouService {
         String responseStr = handler.handler();
         LoginResponse response = JSONObject.parseObject(responseStr, LoginResponse.class);
         if(!response.getResult()){
-            throw new BusinessException(response.getMsg());
+            throw new BusinessException(response.getMsg() + "," + response.getData().getMsg());
         }
         Login login = response.getData();
         String token = login.getToken();