From 6888584781c77de6854b62f93a57dcce53240cf9 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期一, 24 二月 2025 15:51:38 +0800
Subject: [PATCH] 清除标准库部分接口
---
basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java | 2
inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPlanVO.java | 4
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java | 73 ------------
cnas-personnel/src/main/java/com/ruoyi/personnel/task/PersonTrainingSchedule.java | 65 ++++++++++
basic-server/src/main/java/com/ruoyi/basic/service/StandardMethodListService.java | 5
basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java | 33 -----
basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService.java | 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java | 3
basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java | 3
basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java | 9 +
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java | 29 ----
cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalPlanController.java | 2
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java | 78 +++++-------
13 files changed, 114 insertions(+), 196 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
index 327b8f3..45851ec 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
@@ -57,14 +57,6 @@
return Result.success(standardTreeService.addStandardTree(standardTree));
}
- @ApiOperation(value = "缁欐爣鍑嗘爲娣诲姞妫�楠屾爣鍑�")
- @PostMapping("/addStandardMethodList")
- public Result addStandardMethodList(@RequestBody Map<String, Object> map) {
- Integer standardId = (Integer) map.get("standardId");
- String tree = (String) map.get("tree");
- return Result.success(standardMethodListService.addStandardMethodList(standardId, tree));
- }
-
@ApiOperation(value = "鏍规嵁鏍囧噯鏍戣繘琛屾爣鍑嗘煡璇�")
@GetMapping("/selectsStandardMethodByFLSSM")
public Result selectsStandardMethodByFLSSM(String tree) {
@@ -87,27 +79,6 @@
return Result.success(standardProductListService.updateSection(list));
}
- @ApiOperation(value = "鍒犻櫎鏍囧噯鏍戜笅鐨勬楠屾爣鍑�")
- @DeleteMapping("/delStandardMethodByFLSSM")
- public Result delStandardMethodByFLSSM(Integer id) {
- return Result.success(standardMethodListService.delStandardMethodByFLSSM(id));
- }
-
- @ApiOperation(value = "鍒犻櫎鏍囧噯鏍戜笅鐨勬楠岄」鐩�")
- @DeleteMapping("/delStandardProductByIds")
- public Result delStandardProductByIds(String ids) {
- JSONArray lists = JSON.parseArray(ids);
- return Result.success(standardProductListService.delStandardProduct(lists));
- }
-
- @ApiOperation(value = "鏂板鏍囧噯鏍戜笅鐨勬楠岄」鐩�")
- @PostMapping("/addStandardProduct")
- public Result addStandardProduct(@RequestBody Map<String, String> map) {
- String ids = map.get("ids");
- String tree = map.get("tree");
- return Result.success(standardTreeService.addStandardProduct(ids, tree));
- }
-
@ApiOperation(value = "鍒犻櫎鏍囧噯鏍戠殑灞傜骇")
@DeleteMapping("/delStandardTree")
public Result delStandardTree(String tree) {
@@ -122,8 +93,8 @@
@ApiOperation(value = "閫氳繃妫�楠屾爣鍑嗘煡璇㈡楠岄」鐩�")
@GetMapping("/selectStandardProductListByMethodId")
- public Result selectStandardProductListByMethodId(Integer id, String tree, Integer page) {
- return Result.success(standardProductListService.selectStandardProductListByMethodId(id, tree, page));
+ public Result selectStandardProductListByMethodId(Integer id, String tree) {
+ return Result.success(standardProductListService.selectStandardProductListByMethodId(id, tree));
}
@ApiOperation(value = "鎵归噺鏌ヨ妫�楠岄」鐩�")
diff --git a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java
index fc0aa9f..e732efb 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java
@@ -39,9 +39,6 @@
List<SampleTypeDto> getStandardTree2();
- List<SampleDto> getStandardTree3(String sampleType);
-
-
String getLaboratory(String str);
Integer getStructureItemParameterId(String sampleType, String item, String itemChild, String inspectionItemClass);
diff --git a/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java b/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java
index 1c1b79f..392fe36 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java
@@ -153,7 +153,7 @@
@ApiModelProperty("鍨嬪彿")
private String model;
- @ApiModelProperty("鍨嬪彿")
+ @ApiModelProperty("妯℃澘id")
private Integer templateId;
@ApiModelProperty("")
@@ -187,6 +187,7 @@
private String tree;
+ @ApiModelProperty("妫�楠岄」id")
private Integer structureItemParameterId;
@ApiModelProperty(value = "妫�楠岄」鍒嗙被")
@@ -218,4 +219,10 @@
*/
@ApiModelProperty("瀵间綋绫诲瀷")
private String conductorType;
+
+ @ApiModelProperty("structure_test_object琛╥d")
+ private Integer structureTestObjectId;
+
+ @ApiModelProperty("product 浜у搧id")
+ private Integer productId;
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/StandardMethodListService.java b/basic-server/src/main/java/com/ruoyi/basic/service/StandardMethodListService.java
index 14ee117..2f6a810 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/StandardMethodListService.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/StandardMethodListService.java
@@ -13,13 +13,8 @@
*/
public interface StandardMethodListService extends IService<StandardMethodList> {
- int addStandardMethodList(Integer standardId, String tree);
Map<String, List<?>> selectsStandardMethodByFLSSM(String tree);
-
- Map<String, List<?>> selectsStandardMethodByFLSSM2(String tree);
-
- int delStandardMethodByFLSSM(Integer id);
List<StandardMethodList> selectStandardMethodEnum();
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService.java b/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService.java
index 39e0754..f2eff64 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService.java
@@ -20,11 +20,9 @@
int upStandardProductList(StandardProductList list);
- int delStandardProduct(JSONArray list);
-
List<StandardProductList> selectStandardProductList(InsSampleReceiveDto insSample);
- Map<String, Object> selectStandardProductListByMethodId(Integer id, String tree, Integer page);
+ Map<String, Object> selectStandardProductListByMethodId(Integer id, String tree);
IPage<StandardProductList> selectStandardProductByMethodId(Integer id, String tree, Integer page, String laboratory, String item, String items);
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java b/basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java
index 39d08e7..0ad0f47 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java
@@ -23,8 +23,6 @@
int delStandardTree(String tree);
- int addStandardProduct(String ids, String tree);
-
List<SampleTypeDto> getStandardTree2();
int upStandardProducts(Map<String, Object> product);
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java
index 5ab1ed5..aa95f5d 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java
@@ -29,48 +29,6 @@
private StandardProductListMapper standardProductListMapper;
- @Override
- public int addStandardMethodList(Integer standardId, String tree) {
- String[] trees = tree.split(" - ");
- Map<String, String> map = standardMethodListMapper.selectStandardMethodById(standardId);
- StandardMethodList list = new StandardMethodList();
- list.setCode(map.get("code"));
- list.setName(map.get("name"));
- list.setRemark(map.get("remark"));
- list.setFactory(trees[0]);
- try {
- list.setLaboratory(trees[1]);
- }catch (Exception e){}
- try {
- list.setSampleType(trees[2]);
- }catch (Exception e){}
- try {
- list.setSample(trees[3]);
- }catch (Exception e){}
- try {
- list.setModel(trees[4]);
- }catch (Exception e){}
- standardMethodListMapper.insert(list);
- List<StandardProductList> standardProductLists = standardMethodListMapper.selectParameterList(list.getCode());
- for (StandardProductList standardProductList : standardProductLists) {
- standardProductList.setStandardMethodListId(list.getId());
- standardProductList.setFactory(trees[0]);
- try {
- standardProductList.setLaboratory(trees[1]);
- }catch (Exception e){}
- try {
- standardProductList.setSampleType(trees[2]);
- }catch (Exception e){}
- try {
- standardProductList.setSample(trees[3]);
- }catch (Exception e){}
- try {
- standardProductList.setModel(trees[4]);
- }catch (Exception e){}
- standardProductListMapper.insert(standardProductList);
- }
- return 1;
- }
@Override
public Map<String, List<?>> selectsStandardMethodByFLSSM(String tree) {
@@ -103,37 +61,6 @@
return map;
}
- @Override
- public Map<String, List<?>> selectsStandardMethodByFLSSM2(String tree) {
- String[] trees = tree.split(" - ");
- List<StandardMethodList> standardMethodLists = null;
- switch (trees.length){
- case 5:
- standardMethodLists = standardMethodListMapper.selectStandardMethodLists2(trees[0],trees[1],trees[2],trees[3],trees[4]);
- break;
- case 4:
- standardMethodLists = standardMethodListMapper.selectStandardMethodLists2(trees[0],trees[1],trees[2],trees[3],null);
- break;
- case 3:
- standardMethodLists = standardMethodListMapper.selectStandardMethodLists2(trees[0],trees[1],trees[2],null,null);
- break;
- case 2:
- standardMethodLists = standardMethodListMapper.selectStandardMethodLists2(trees[0],trees[1],null,null,null);
- break;
- case 1:
- standardMethodLists = standardMethodListMapper.selectStandardMethodLists2(trees[0],null,null,null,null);
- break;
- }
- Map<String, List<?>> map = new HashMap<>();
- map.put("standardMethodList", standardMethodLists);
- return map;
- }
-
- @Override
- public int delStandardMethodByFLSSM(Integer id) {
- standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate().eq(StandardProductList::getStandardMethodListId, id));
- return standardMethodListMapper.deleteById(id);
- }
@Override
public List<StandardMethodList> selectStandardMethodEnum() {
return standardMethodListMapper.selectListEnum();
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
index 5b0b1cd..bafa2a1 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
@@ -57,10 +57,6 @@
return standardProductListMapper.updateById(list);
}
- @Override
- public int delStandardProduct(JSONArray list) {
- return standardProductListMapper.deleteBatchIds(list);
- }
@Override
public List<StandardProductList> selectStandardProductList(InsSampleReceiveDto insSample) {
@@ -263,13 +259,9 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public Map<String, Object> selectStandardProductListByMethodId(Integer id, String tree, Integer page) {
+ public Map<String, Object> selectStandardProductListByMethodId(Integer id, String tree) {
String[] trees = tree.split(" - ");
- try {
- String tree1 = trees[2];
- } catch (Exception e) {
- throw new BaseException("鎿嶄綔澶揩,绯荤粺浼犲弬閿欒!!!!");
- }
+ // 鍒ゆ柇鏄惁鎷栨嫿
boolean isDrag = false;
List<StandardProductList> list = new ArrayList<>();
if (trees.length == 3) {
@@ -419,38 +411,36 @@
}
}
}
- if (page == 1) {
- Integer userId = SecurityUtils.getUserId().intValue();
-// CompletableFuture.supplyAsync(() -> {
- if (trees.length == 5) {
- standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate()
- .eq(StandardProductList::getStandardMethodListId, id)
- .eq(StandardProductList::getTree, tree));
- } else {
- standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate()
- .eq(StandardProductList::getStandardMethodListId, id)
- .like(StandardProductList::getTree, tree));
- }
- try {
- standardProductListService2.saveBatch(list.stream().map(a -> {
- a.setFactory(trees[0]);
- a.setLaboratory(trees[1]);
- a.setSampleType(trees[2]);
- a.setCreateUser(userId);
- a.setUpdateUser(userId);
- a.setStandardMethodListId(id);
- return a;
- }).collect(Collectors.toList()));
- } catch (Exception e) {
- // 澶勭悊閲嶅 ID 鐨勮褰曪紝閲嶆柊鐢熸垚 ID 骞剁户缁皾璇曟彃鍏�
- for (StandardProductList productList : list) {
- productList.setId(IdWorker.getId());
- }
- }
-
+ Integer userId = SecurityUtils.getUserId().intValue();
+ if (trees.length == 5) {
+ standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate()
+ .eq(StandardProductList::getStandardMethodListId, id)
+ .eq(StandardProductList::getTree, tree));
+ } else {
+ standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate()
+ .eq(StandardProductList::getStandardMethodListId, id)
+ .like(StandardProductList::getTree, tree));
}
- Map<String, Object> map = new HashMap<>();
+
+ try {
+ List<StandardProductList> productLists = list.stream().map(a -> {
+ a.setFactory(trees[0]);
+ a.setLaboratory(trees[1]);
+ a.setSampleType(trees[2]);
+ a.setCreateUser(userId);
+ a.setUpdateUser(userId);
+ a.setStandardMethodListId(id);
+ return a;
+ }).collect(Collectors.toList());
+ standardProductListService2.saveBatch(productLists);
+ } catch (Exception e) {
+ // 澶勭悊閲嶅 ID 鐨勮褰曪紝閲嶆柊鐢熸垚 ID 骞剁户缁皾璇曟彃鍏�
+ for (StandardProductList productList : list) {
+ productList.setId(IdWorker.getId());
+ }
+ }
+
Collections.sort(list, (o1, o2) -> {
String field1 = o1.getManHourGroup();
String field2 = o2.getManHourGroup();
@@ -475,11 +465,9 @@
list.sort((o1, o2) -> (o1.getSort() == null ? 0 : o1.getSort())
- (o2.getSort() == null ? 0 : o2.getSort()));
}
- try {
- map.put("productList", list.subList((page - 1) * 300, page * 300));
- } catch (IndexOutOfBoundsException e) {
- map.put("productList", list.subList((page - 1) * 300, list.size()));
- }
+
+ Map<String, Object> map = new HashMap<>();
+ map.put("productList", list);
map.put("total", list.size());
return map;
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java
index 3fe74d1..29c4b90 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java
@@ -127,35 +127,6 @@
}
@Override
- @Transactional(rollbackFor = Exception.class)
- public int addStandardProduct(String ids, String tree) {
- String[] trees = tree.split(" - ");
- JSONArray jsonArray = JSON.parseArray(ids);
- for (Object o : jsonArray) {
- StandardProductList standardProductList = standardTreeMapper.selectStandardProductById(Integer.parseInt("" + o));
- standardProductList.setFactory(trees[0]);
- try {
- standardProductList.setLaboratory(trees[1]);
- } catch (Exception e) {
- }
- try {
- standardProductList.setSampleType(trees[2]);
- } catch (Exception e) {
- }
- try {
- standardProductList.setSample(trees[3]);
- } catch (Exception e) {
- }
- try {
- standardProductList.setModel(trees[4]);
- } catch (Exception e) {
- }
- standardProductListMapper.insert(standardProductList);
- }
- return 1;
- }
-
- @Override
public List<SampleTypeDto> getStandardTree2() {
return standardTreeMapper.getStandardTree2();
}
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalPlanController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalPlanController.java
index fd9c35d..c3d2c87 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalPlanController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalPlanController.java
@@ -76,7 +76,7 @@
*/
@ApiOperation(value = "鍐呭骞村害璁″垝鍒犻櫎")
- @GetMapping("/delInternalPlan")
+ @DeleteMapping("/delInternalPlan")
public Result delInternalPlan(Integer planId){
return Result.success(internalPlanService.delInternalPlan(planId));
}
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/task/PersonTrainingSchedule.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/task/PersonTrainingSchedule.java
new file mode 100644
index 0000000..4e87b34
--- /dev/null
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/task/PersonTrainingSchedule.java
@@ -0,0 +1,65 @@
+package com.ruoyi.personnel.task;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.core.domain.entity.User;
+import com.ruoyi.common.utils.WxCpUtils;
+import com.ruoyi.personnel.mapper.PersonTrainingDetailedMapper;
+import com.ruoyi.personnel.pojo.PersonTrainingDetailed;
+import com.ruoyi.system.mapper.UserMapper;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+/**
+ * 鍩硅璁″垝浣跨敤鎻愰啋璁板綍鎻愰啋
+ */
+@Component
+public class PersonTrainingSchedule {
+ @Resource
+ private PersonTrainingDetailedMapper personTrainingDetailedMapper;
+ @Resource
+ private UserMapper userMapper;
+ @Resource
+ private ThreadPoolTaskExecutor threadPoolTaskExecutor;
+
+ /**
+ * 鎻愰啋濉啓璁惧浣跨敤璁板綍
+ */
+// @Scheduled(cron = "0/5 * * * * *")
+ @Scheduled(cron = "0 0 9 1 * *") // 姣忔湀涓�鍙锋墽琛�
+ public void task1() {
+ // 鏌ヨ褰撴湀鍩硅璁″垝
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.M");
+ String format = LocalDateTime.now().format(formatter);
+ List<PersonTrainingDetailed> personTrainingDetaileds = personTrainingDetailedMapper.selectList(Wrappers.<PersonTrainingDetailed>lambdaQuery()
+ .eq(PersonTrainingDetailed::getTrainingDate, format));
+
+ for (PersonTrainingDetailed personTrainingDetailed : personTrainingDetaileds) {
+ threadPoolTaskExecutor.execute(() -> {
+ // 鏌ヨ鍩硅璁插笀
+ User user = userMapper.selectById(personTrainingDetailed.getTrainingLecturerId());
+ // 浼佷笟寰俊閫氱煡鍩硅
+ String message = "";
+ message += "浜哄憳鍩硅璁″垝鎻愰啋閫氱煡";
+ message += "\n鍩硅鐩爣: " + personTrainingDetailed.getTrainingObjectives();
+ message += "\n鍩硅鍐呭: " + personTrainingDetailed.getTrainingContent();
+ message += "\n鍙傚姞瀵硅薄: " + personTrainingDetailed.getParticipants();
+ message += "\n鍩硅鏃ユ湡: " + personTrainingDetailed.getTrainingDate();
+ message += "\n璁″垝褰撴湀杩涜鍩硅";
+
+ //鍙戦�佷紒涓氬井淇℃秷鎭�氱煡
+ try {
+ WxCpUtils.inform(user.getAccount(), message, null);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ });
+ }
+ }
+
+}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPlanVO.java b/inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPlanVO.java
index fe6ff0c..d1748f2 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPlanVO.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPlanVO.java
@@ -7,7 +7,7 @@
public class InsOrderPlanVO{
- private String id;
+ private Integer id;
@ApiModelProperty("濮旀墭缂栧彿")
private String entrustCode;
@@ -73,6 +73,6 @@
private String tempUrlPdf;
@ApiModelProperty("鎶ュ憡id")
- private String insReportId;
+ private Integer insReportId;
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java
index c5fb7e2..4bdb129 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java
@@ -26,7 +26,8 @@
private UserService userService;
/**
- * type : 1: 鑾峰彇妫�娴嬩汉鍛樹俊鎭�
+ * todo: type : 1: 鑾峰彇妫�娴嬩汉鍛樹俊鎭�
+ type : 2: 鑾峰彇褰撳墠閮ㄩ棬(瀹為獙瀹や汉鍛�)
* @param user
* @param type
* @return
--
Gitblit v1.9.3