From 10e199f950f5c74b25e446433ceb51cffe675be4 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期一, 30 十月 2023 09:57:07 +0800
Subject: [PATCH] Changes
---
mes-basic/src/main/java/com/chinaztt/mes/basic/controller/PartController.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/PartController.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/PartController.java
index 82fe12b..603c3c3 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/PartController.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/PartController.java
@@ -25,12 +25,14 @@
import com.chinaztt.mes.basic.excel.PartData;
import com.chinaztt.mes.basic.excel.PartUploadListener;
import com.chinaztt.mes.basic.service.PartService;
+import com.chinaztt.mes.common.util.JsonUtil;
import com.chinaztt.mes.common.wrapper.QueryWrapperUtil;
import com.chinaztt.ztt.admin.api.entity.SysDictItem;
import com.chinaztt.ztt.admin.api.feign.RemoteDictService;
import com.chinaztt.ztt.common.core.util.R;
import com.chinaztt.ztt.common.log.annotation.SysLog;
import com.chinaztt.ztt.common.security.annotation.Inner;
+import com.chinaztt.ztt.common.security.util.SecurityUtils;
import com.xxl.job.core.handler.annotation.XxlJob;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -72,6 +74,9 @@
@GetMapping("/page")
@PreAuthorize("@pms.hasPermission('basic_part_view')")
public R getPartPage(Page page, Part part, Long bomId) {
+ //System.out.println(bomId);
+ //System.out.println(part);
+ System.out.println(JsonUtil.jsonToString(page));
return R.ok(partService.getPartPage(page, QueryWrapperUtil.gen(part), bomId));
}
/**
@@ -88,6 +93,25 @@
}
partService.syncPart();
return R.ok();
+ }
+
+ //@InitBinder
+ //protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
+ // //System.out.println(request.getParameter("date"));
+ // DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+ // CustomDateEditor editor = new CustomDateEditor(df, true);//true琛ㄧず鍏佽涓虹┖锛宖alse鍙嶄箣
+ // binder.registerCustomEditor(Date.class, editor);
+ //}
+
+ @ApiOperation(value = "鍚屾Ifs", notes = "鍚屾Ifs")
+ @PostMapping("/syncNewIfs")
+ //@XxlJob("syncPart")
+ public R syncNewIfs(String date) {
+ String key = "syncPart_lock"+ SecurityUtils.getUser().getId();
+ if (redisTemplate.hasKey(key)) {
+ throw new RuntimeException("鏈夊悓姝ヤ换鍔℃鍦ㄥ鐞�");
+ }
+ return R.ok(partService.syncNewIfs(date));
}
/**
* 鍒嗛〉鏌ヨ宸插叧鑱旀娴嬫ā鏉跨殑闆朵欢
@@ -106,7 +130,7 @@
/**
* 鏍规嵁闆朵欢鍙峰拰闆朵欢鎻忚堪鏌ヨ搴撳瓨淇℃伅鎺ュ彛
*
- * @param part 闆朵欢
+ * @param 闆朵欢
* @return
*/
@ApiOperation(value = "鏍规嵁闆朵欢鍙峰拰闆朵欢鎻忚堪鏌ヨ搴撳瓨淇℃伅鎺ュ彛", notes = "鏍规嵁闆朵欢鍙峰拰闆朵欢鎻忚堪鏌ヨ搴撳瓨淇℃伅鎺ュ彛")
--
Gitblit v1.9.3