From ce10da906c58596fce43bffa6a6d177268ca177b Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 30 四月 2024 00:54:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/resources/mapper/SealMapper.xml | 2
cnas-server/src/main/java/com/yuanchu/mom/controller/SealController.java | 6
cnas-server/src/main/java/com/yuanchu/mom/controller/StandardMethodController.java | 9
framework/src/main/java/com/yuanchu/mom/common/AllController.java | 51 +++++---
inspect-server/src/main/java/com/yuanchu/mom/controller/WarehouseController.java | 25 ++--
inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java | 11 +
cnas-server/src/main/java/com/yuanchu/mom/controller/DepartmentController.java | 10
cnas-server/src/main/resources/mapper/StandardMethodMapper.xml | 40 +++---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java | 15 +-
user-server/src/main/java/com/yuanchu/mom/controller/UserController.java | 13 +-
cnas-server/src/main/java/com/yuanchu/mom/service/impl/SealServiceImpl.java | 1
inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java | 9
user-server/src/main/java/com/yuanchu/mom/controller/RoleController.java | 15 +-
cnas-server/src/main/java/com/yuanchu/mom/controller/CertificationController.java | 8
cnas-server/src/main/java/com/yuanchu/mom/pojo/Seal.java | 1
cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java | 9
user-server/src/main/java/com/yuanchu/mom/controller/EnumController.java | 12 +
user-server/src/main/java/com/yuanchu/mom/controller/SystemLogController.java | 3
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java | 13 +
cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java | 22 ++-
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java | 12 +
inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java | 17 +-
cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java | 9
framework/src/main/java/com/yuanchu/mom/annotation/ValueClassify.java | 9 +
24 files changed, 183 insertions(+), 139 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java
index af6e52b..513b097 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.dto.PageTestObjectDto;
import com.yuanchu.mom.pojo.Product;
import com.yuanchu.mom.pojo.StructureItemParameter;
@@ -32,7 +33,7 @@
private CapacityScopeService capacityScopeService;
private ProductService productService;
-
+ @ValueClassify("鑳藉姏鑼冨洿")
@ApiOperation(value = "鑳藉姏鑼冨洿-鑾峰彇椤圭洰妫�楠屽弬鏁板垪琛�")
@PostMapping("/selectItemParameterList")
public Result selectItemParameterList(@RequestBody Map<String, Object> data) throws Exception {
@@ -40,25 +41,25 @@
StructureItemParameter itemParameter = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), StructureItemParameter.class);
return Result.success(capacityScopeService.selectItemParameterList(page, itemParameter));
}
-
+ @ValueClassify("鑳藉姏鑼冨洿")
@ApiOperation(value = "鑳藉姏鑼冨洿-娣诲姞椤圭洰妫�楠屽弬鏁�")
@PostMapping("/addItemParameter")
public Result addItemParameter(@RequestBody StructureItemParameter itemParameter) {
return Result.success(capacityScopeService.addItemParameter(itemParameter));
}
-
+ @ValueClassify(value="鑳藉姏鑼冨洿")
@ApiOperation(value = "鑳藉姏鑼冨洿-鍒犻櫎椤圭洰妫�楠屽弬鏁�")
@PostMapping("/delItemParameter")
public Result<?> delItemParameter(Integer id) {
return Result.success(capacityScopeService.delItemParameter(id));
}
-
+ @ValueClassify(value="鑳藉姏鑼冨洿")
@ApiOperation(value = "鑳藉姏鑼冨洿-淇敼椤圭洰妫�楠屽弬鏁�")
@PostMapping("/upItemParameter")
public Result<?> upItemParameter(@RequestBody StructureItemParameter itemParameter) {
return Result.success(capacityScopeService.upItemParameter(itemParameter));
}
-
+ @ValueClassify(value="鑳藉姏鑼冨洿")
@ApiOperation(value = "鑳藉姏鑼冨洿-鑾峰彇妫�楠屽璞�")
@PostMapping("/selectTestObjectList")
public Result selectTestObjectList(@RequestBody Map<String, Object> data) throws Exception {
@@ -66,19 +67,19 @@
PageTestObjectDto pageTestObjectDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), PageTestObjectDto.class);
return Result.success(capacityScopeService.selectTestObjectList(page, pageTestObjectDto));
}
-
+ @ValueClassify(value="鑳藉姏鑼冨洿")
@ApiOperation(value = "鑳藉姏鑼冨洿-娣诲姞妫�楠屽璞�")
@PostMapping("/addTestObject")
public Result addTestObject(@RequestBody StructureTestObject testObject) {
return Result.success(capacityScopeService.addTestObject(testObject));
}
-
+ @ValueClassify(value="鑳藉姏鑼冨洿")
@ApiOperation(value = "鑳藉姏鑼冨洿-鍒犻櫎妫�楠屽璞�")
@PostMapping("/delTestObject")
public Result<?> delTestObject(Integer id) {
return Result.success(capacityScopeService.delTestObject(id));
}
-
+ @ValueClassify(value="鑳藉姏鑼冨洿")
@ApiOperation(value = "鑳藉姏鑼冨洿-淇敼妫�楠屽璞�")
@PostMapping("/upTestObject")
public Result upTestObject(@RequestBody StructureTestObject testObject) {
@@ -91,13 +92,13 @@
public Result selectTestObjectByName() {
return Result.success(capacityScopeService.selectTestObjectByName());
}
-
+ @ValueClassify(value="鑳藉姏鑼冨洿")
@ApiOperation(value = "鑳藉姏鑼冨洿-璁惧閲岄潰閫夋嫨妫�楠岄」鐩�(鏍戝舰缁撴瀯)")
@PostMapping("/getInsProduction")
public Result getInsProduction(){
return Result.success(capacityScopeService.getInsProduction());
}
-
+ @ValueClassify(value="鑳藉姏鑼冨洿")
@ApiOperation(value = "缁存姢妫�楠屽璞＄殑浜у搧")
@PostMapping("/selectProductListByObjectId")
public Result selectProductListByObjectId(@RequestBody Map<String, Object> data) throws Exception {
@@ -106,6 +107,7 @@
return Result.success(productService.selectProductListByObjectId(page, product));
}
+
@ApiOperation(value = "娣诲姞浜у搧")
@PostMapping("/addProduct")
@ValueAuth
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/CertificationController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/CertificationController.java
index 926449b..fef26e1 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/CertificationController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/CertificationController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.pojo.Certification;
import com.yuanchu.mom.pojo.Device;
import com.yuanchu.mom.service.CertificationService;
@@ -25,22 +26,21 @@
public class CertificationController {
private CertificationService certificationService;
-
+ @ValueClassify("瀹為獙瀹よ祫璐�")
@ApiOperation(value = "璧勮川璇存槑-鏌ヨ璧勮川鏄庣粏鍒楄〃")
@PostMapping("/getCertificationDetail")
public Result getCertificationDetail(@RequestBody Map<String, Object> data) throws Exception {
- System.out.println(data);
Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
Certification certification = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Certification.class);
return Result.success(certificationService.getCertificationDetail(page, certification));
}
-
+ @ValueClassify("瀹為獙瀹よ祫璐�")
@ApiOperation(value = "璧勮川璇存槑-娣诲姞璧勮川鏄庣粏鍒楄〃")
@PostMapping("/addCertificationDetail")
public Result addCertificationDetail(@RequestBody Certification certification) {
return Result.success(certificationService.addCertificationDetail(certification));
}
-
+ @ValueClassify("瀹為獙瀹よ祫璐�")
@ApiOperation(value = "璧勮川璇存槑-鍒犻櫎璧勮川鏄庣粏鍒楄〃")
@PostMapping("/delCertificationDetail")
public Result<?> delCertificationDetail( String ids) {
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/DepartmentController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/DepartmentController.java
index 444c062..37c8f72 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/DepartmentController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/DepartmentController.java
@@ -1,6 +1,7 @@
package com.yuanchu.mom.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.dto.UserDto;
import com.yuanchu.mom.dto.UserPageDto;
import com.yuanchu.mom.pojo.Department;
@@ -31,25 +32,25 @@
public class DepartmentController {
DepartmentService departmentService;
-
+ @ValueClassify("浜哄憳鏄庣粏")
@ApiOperation(value = "浜哄憳鏄庣粏-娣诲姞閮ㄩ棬")
@PostMapping("/addDepartment")
public Result addDepartment(@RequestBody Department department) {
return Result.success(departmentService.addDepartment(department));
}
-
+ @ValueClassify("浜哄憳鏄庣粏")
@ApiOperation(value = "浜哄憳鏄庣粏-鑾峰彇閮ㄩ棬鏍�")
@GetMapping("/selectDepartment")
public Result selectDepartment() {
return Result.success(departmentService.selectDepartment());
}
-
+ @ValueClassify("浜哄憳鏄庣粏")
@ApiOperation(value = "浜哄憳鏄庣粏-鍒犻櫎閮ㄩ棬")
@PostMapping("/delDepartment")
public Result delDepartment(Integer id) {
return Result.success(departmentService.delDepartment(id));
}
-
+ @ValueClassify("浜哄憳鏄庣粏")
@ApiOperation(value = "浜哄憳鏄庣粏-鏍规嵁閫夋嫨鐨勬爲灞曠ず鐩稿叧鐨勪汉鍛�")
@PostMapping("/showUserById")
public Result showUserById(@RequestBody Map<String, Object> data) throws Exception {
@@ -57,6 +58,5 @@
UserDto user = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), UserDto.class);
return Result.success(departmentService.showUserById(page, user));
}
-
}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
index be6dbe7..3d93f74 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
@@ -4,6 +4,7 @@
import cn.hutool.core.lang.UUID;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.dto.DeviceDto;
import com.yuanchu.mom.pojo.Device;
import com.yuanchu.mom.service.DeviceService;
@@ -36,7 +37,7 @@
@Value("${file.path}")
private String filePath;
-
+ @ValueClassify("璁惧宸ュ叿鏄庣粏")
@ApiOperation(value = "鏌ヨ璁惧璇︽儏鍒楄〃")
@PostMapping("/selectDeviceParameter")
public Result selectDeviceParameter(@RequestBody Map<String, Object> data) throws Exception {
@@ -44,19 +45,19 @@
DeviceDto itemParameter = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), DeviceDto.class);
return Result.success(deviceService.selectDeviceParameter(page, itemParameter));
}
-
+ @ValueClassify("璁惧宸ュ叿鏄庣粏")
@ApiOperation(value = "娣诲姞璁惧璇︽儏鍙傛暟")
@PostMapping("/addDeviceParameter")
public Result addDeviceParameter(@RequestBody Device itemParameter) {
return Result.success(deviceService.addDeviceParameter(itemParameter));
}
-
+ @ValueClassify("璁惧宸ュ叿鏄庣粏")
@ApiOperation(value = "鍒犻櫎璁惧璇︽儏鍙傛暟")
@PostMapping("/delDeviceParameter")
public Result<?> delDeviceParameter(Integer id) {
return Result.success(deviceService.delDeviceParameter(id));
}
-
+ @ValueClassify("璁惧宸ュ叿鏄庣粏")
@ApiOperation(value = "淇敼璁惧璇︽儏鍙傛暟")
@PostMapping("/upDeviceParameter")
public Result<?> upDeviceParameter(@RequestBody Device itemParameter) {
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java
index fbcae21..c008538 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java
@@ -4,6 +4,7 @@
import cn.hutool.core.lang.UUID;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.pojo.Laboratory;
import com.yuanchu.mom.service.LaboratoryService;
import com.yuanchu.mom.utils.JackSonUtil;
@@ -30,7 +31,7 @@
@Resource
private LaboratoryService laboratoryService;
-
+ @ValueClassify("鍦烘墍鎴栬鏂�")
@ApiOperation(value = "鏌ヨ瀹為獙瀹ょ鐞嗗垪琛�")
@PostMapping("/selectItemParameter")
public Result selectItemParameter(@RequestBody Map<String, Object> data) throws Exception {
@@ -38,19 +39,19 @@
Laboratory itemParameter = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Laboratory.class);
return Result.success(laboratoryService.selectItemParameter(page, itemParameter));
}
-
+ @ValueClassify("鍦烘墍鎴栬鏂�")
@ApiOperation(value = "娣诲姞瀹為獙瀹ゅ弬鏁�")
@PostMapping("/addParameter")
public Result addParameter(@RequestBody Laboratory itemParameter) {
return Result.success(laboratoryService.addParameter(itemParameter));
}
-
+ @ValueClassify("鍦烘墍鎴栬鏂�")
@ApiOperation(value = "鍒犻櫎瀹為獙瀹ゅ弬鏁�")
@PostMapping("/delParameter")
public Result<?> delParameter(Integer id) {
return Result.success(laboratoryService.delParameter(id));
}
-
+ @ValueClassify("鍦烘墍鎴栬鏂�")
@ApiOperation(value = "淇敼瀹為獙瀹ゅ弬鏁�")
@PostMapping("/upParameter")
public Result<?> upParameter(@RequestBody Laboratory itemParameter) {
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/SealController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/SealController.java
index 8ac9dfd..70d9846 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/SealController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/SealController.java
@@ -1,5 +1,6 @@
package com.yuanchu.mom.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.pojo.Laboratory;
import com.yuanchu.mom.pojo.Seal;
import com.yuanchu.mom.service.SealService;
@@ -27,9 +28,11 @@
@ApiOperation(value = "鍒犻櫎鍗扮珷")
@PostMapping("/deleteSeal")
+
public Result deleteSeal(@RequestBody Integer id) {
return Result.success(sealService.delSeal(id));
}
+ @ValueClassify("鍦烘墍鎴栬鏂�")
@ApiOperation(value = "娣诲姞鍗扮珷鍙傛暟")
@PostMapping("/addSeal")
public Result addSeal(@RequestBody Seal seal) {
@@ -43,15 +46,16 @@
}
}
+
@ApiOperation(value = "淇敼鍗扮珷鍙傛暟")
@PostMapping("/upSeal")
public Result upSeal(@RequestBody Seal seal){
return Result.success(sealService.upSeal(seal));
}
+ @ValueClassify("鍦烘墍鎴栬鏂�")
@ApiOperation(value="鏌ヨ鍗扮珷鍒楄〃")
@PostMapping("/selectSeal")
public Result selectSeal(@RequestBody Map<String, Object> data) throws Exception {
- System.out.println(data);
Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
Seal seal = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Seal.class);
return Result.success(sealService.selectSeal(page,seal));
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/StandardMethodController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/StandardMethodController.java
index a33c94c..aeb628b 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/StandardMethodController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/StandardMethodController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.pojo.StandardMethod;
import com.yuanchu.mom.pojo.StructureItemParameter;
import com.yuanchu.mom.service.StandardMethodService;
@@ -23,7 +24,7 @@
public class StandardMethodController {
private StandardMethodService standardMethodService;
-
+ @ValueClassify("瀹為獙瀹ょ殑妫�娴嬭兘鍔涙。妗�")
@ApiOperation(value = "鑾峰彇鏍囧噯鏂规硶鍒楄〃")
@PostMapping("/selectStandardMethodList")
public Result selectStandardMethodList(@RequestBody Map<String, Object> data) throws Exception {
@@ -38,19 +39,19 @@
public Result selectStandardMethods(){
return Result.success(standardMethodService.selectStandardMethods());
}
-
+ @ValueClassify("瀹為獙瀹ょ殑妫�娴嬭兘鍔涙。妗�")
@ApiOperation(value = "娣诲姞鏍囧噯鏂规硶")
@PostMapping("/addStandardMethod")
public Result addStandardMethod(@RequestBody StandardMethod standardMethod) {
return Result.success(standardMethodService.addStandardMethod(standardMethod));
}
-
+ @ValueClassify("瀹為獙瀹ょ殑妫�娴嬭兘鍔涙。妗�")
@ApiOperation(value = "鍒犻櫎鏍囧噯鏂规硶")
@PostMapping("/delStandardMethod")
public Result<?> delStandardMethod(Integer id) {
return Result.success(standardMethodService.delStandardMethod(id));
}
-
+ @ValueClassify("瀹為獙瀹ょ殑妫�娴嬭兘鍔涙。妗�")
@ApiOperation(value = "淇敼鏍囧噯鏂规硶")
@PostMapping("/upStandardMethod")
public Result<?> upStandardMethod(@RequestBody StandardMethod standardMethod) {
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Seal.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Seal.java
index d9eef20..59c8ed3 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Seal.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Seal.java
@@ -21,7 +21,6 @@
@TableId(type = IdType.AUTO)
private Integer id;
-
@ApiModelProperty(value = "瀹為獙瀹d")
private Integer labId;
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/SealServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/SealServiceImpl.java
index 01791b1..a132642 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/SealServiceImpl.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/SealServiceImpl.java
@@ -40,7 +40,6 @@
Map<String, Object> map = new HashMap<>();
map.put("head", PrintChina.printChina(Seal.class));
map.put("body", sealMapper.selectSeal(page, QueryWrappers.queryWrappers(seal)));
-
return map;
}
@Override
diff --git a/cnas-server/src/main/resources/mapper/SealMapper.xml b/cnas-server/src/main/resources/mapper/SealMapper.xml
index 37965da..0e1dc5f 100644
--- a/cnas-server/src/main/resources/mapper/SealMapper.xml
+++ b/cnas-server/src/main/resources/mapper/SealMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.SealMapper">
<select id="selectSeal" resultType="com.yuanchu.mom.pojo.Seal">
- select l.id,s.lab_id,l.laboratory_name ,s.address, s.type as type,s.create_time
+ select l.id,s.lab_id,l.laboratory_name ,s.address, s.type as Type,s.create_time
from seal s LEFT JOIN laboratory l on s.lab_id=l.id
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
diff --git a/cnas-server/src/main/resources/mapper/StandardMethodMapper.xml b/cnas-server/src/main/resources/mapper/StandardMethodMapper.xml
index b65d510..df2e6af 100644
--- a/cnas-server/src/main/resources/mapper/StandardMethodMapper.xml
+++ b/cnas-server/src/main/resources/mapper/StandardMethodMapper.xml
@@ -17,26 +17,26 @@
<select id="selectStandardMethodList" resultType="com.yuanchu.mom.pojo.StandardMethod">
select * from (
- select sm.id,
- sm.code,
- sm.name,
- sm.structure_test_object_id,
- sto.specimen_name sample_type,
- sm.remark,
- u1.name create_user_name,
- sm.create_time,
- u2.name update_user_name,
- sm.update_time,
- sm.is_product,
- sm.field,
- sm.name_en,
- sm.is_use,
- sm.qualification_id
- from standard_method sm
- left join user u1 on sm.create_user = u1.id
- left join user u2 on sm.update_user = u2.id
- left join structure_test_object sto on sm.structure_test_object_id = sto.id
- ) a
+ select sm.id,
+ sm.code,
+ sm.name,
+ sm.structure_test_object_id,
+ sto.specimen_name sample_type,
+ sm.remark,
+ u1.name create_user_name,
+ sm.create_time,
+ u2.name update_user_name,
+ sm.update_time,
+ sm.is_product,
+ sm.field,
+ sm.name_en,
+ sm.is_use,
+ sm.qualification_id
+ from standard_method sm
+ left join user u1 on sm.create_user = u1.id
+ left join user u2 on sm.update_user = u2.id
+ left join structure_test_object sto on sm.structure_test_object_id = sto.id
+ ) a
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
diff --git a/framework/src/main/java/com/yuanchu/mom/annotation/ValueClassify.java b/framework/src/main/java/com/yuanchu/mom/annotation/ValueClassify.java
new file mode 100644
index 0000000..0f27e3a
--- /dev/null
+++ b/framework/src/main/java/com/yuanchu/mom/annotation/ValueClassify.java
@@ -0,0 +1,9 @@
+package com.yuanchu.mom.annotation;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ValueClassify {
+ String value() default "";
+}
diff --git a/framework/src/main/java/com/yuanchu/mom/common/AllController.java b/framework/src/main/java/com/yuanchu/mom/common/AllController.java
index f850b67..89a1ecd 100644
--- a/framework/src/main/java/com/yuanchu/mom/common/AllController.java
+++ b/framework/src/main/java/com/yuanchu/mom/common/AllController.java
@@ -1,8 +1,10 @@
package com.yuanchu.mom.common;
import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.mapper.AuthMapper;
import io.swagger.annotations.ApiOperation;
+import org.springframework.boot.autoconfigure.freemarker.FreeMarkerAutoConfiguration;
import org.springframework.stereotype.Component;
import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.method.HandlerMethod;
@@ -11,6 +13,7 @@
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
+import java.lang.reflect.Method;
import java.util.Map;
@Component
@@ -28,31 +31,39 @@
for (HandlerMethod value : methodMap.values()) {
ApiOperation annotation = value.getMethodAnnotation(ApiOperation.class);
ValueAuth valueAuth = value.getMethodAnnotation(ValueAuth.class);
- if (valueAuth==null){
- if (annotation != null) {
+ ValueClassify valueClassify = value.getMethodAnnotation(ValueClassify.class);
+ if (valueAuth == null) {
+ if (valueClassify !=null) {
+ String type = valueClassify.value();
String remark = annotation.value();
- String type = "淇敼";
- if (remark.contains("鑾峰彇")||remark.contains("鏌ヨ")){
- type = "鏌ヨ";
- } else if(remark.contains("鍒犻櫎")){
- type = "鍒犻櫎";
- } else if(remark.contains("娣诲姞")||remark.contains("鏂板")||remark.contains("璁ら")){
- type = "娣诲姞";
- } else if(remark.contains("瀵煎叆")){
- type = "瀵煎叆";
- } else if(remark.contains("瀵煎嚭")){
- type = "瀵煎嚭";
- }
- try {
- authMapper.insertPower(value.getMethod().getName(), remark, type);
- }catch (Exception e){
- System.err.println(value.getMethod());
+ authMapper.insertPower(value.getMethod().getName(),remark,type);
+ }else{
+ if (annotation != null) {
+ String remark = annotation.value();
+ String type = "淇敼";
+ if (remark.contains("鑾峰彇") || remark.contains("鏌ヨ")) {
+ type = "鏌ヨ";
+ } else if (remark.contains("鍒犻櫎")) {
+ type = "鍒犻櫎";
+ } else if (remark.contains("娣诲姞") || remark.contains("鏂板") || remark.contains("璁ら")) {
+ type = "娣诲姞";
+ } else if (remark.contains("瀵煎叆")) {
+ type = "瀵煎叆";
+ } else if (remark.contains("瀵煎嚭")) {
+ type = "瀵煎嚭";
+ }
+ try {
+ authMapper.insertPower(value.getMethod().getName(), remark, type);
+ } catch (Exception e) {
+ System.err.println(value.getMethod());
+ e.printStackTrace();
+ }
}
}
+ }
}
+ System.out.println("********************鏉冮檺鑿滃崟瀹屾垚********************");
}
- System.out.println("********************鏉冮檺鑿滃崟瀹屾垚********************");
- }
@PostConstruct
public void pingStart() {
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
index 9a4a237..f5db78a 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
@@ -5,6 +5,7 @@
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.dto.CostStatisticsDto;
import com.yuanchu.mom.dto.SampleOrderDto;
import com.yuanchu.mom.dto.SampleProductDto;
@@ -41,6 +42,7 @@
private InsOrderTemplateService insOrderTemplateService;
//鑾峰彇妫�楠屼笅鍗曟暟鎹�
+ @ValueClassify("妫�楠屼笅鍗�")
@ApiOperation(value = "鏌ヨ妫�楠屼笅鍗曟暟鎹�")
@PostMapping("/selectInsOrderParameter")
public Result selectInsOrderParameter(@RequestBody Map<String, Object> data) throws Exception {
@@ -48,13 +50,13 @@
SampleOrderDto sampleOrderDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), SampleOrderDto.class);
return Result.success(insOrderService.selectInsOrderParameter(page, sampleOrderDto));
}
-
+ @ValueClassify("妫�楠屼笅鍗�")
@ApiOperation(value = "妫�楠屽垎閰�")
@PostMapping("/upInsOrder")
public Result<?> upInsOrder(Integer orderId, Integer sampleId, String appointed, Integer userId) {
return Result.success(insOrderService.upInsOrder(orderId, sampleId, appointed, userId));
}
-
+ @ValueClassify("妫�楠屼笅鍗�")
@ApiOperation(value = "娣诲姞妫�楠屼笅鍗曟暟鎹�")
@PostMapping("/addInsOrder")
public Result<?> addInsOrder(@RequestBody Map<String, Object> map) {
@@ -78,7 +80,7 @@
public Result<?> getInsOrder(Integer orderId) {
return Result.success(insOrderService.getInsOrder(orderId));
}
-
+ @ValueClassify("妫�楠屼笅鍗�")
@ApiOperation(value = "瀹℃牳妫�楠屽崟杩涜鐘舵�佷慨鏀�")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "妫�楠屽崟id", dataTypeClass = Integer.class),
@@ -88,7 +90,7 @@
public Result<?> upInsOrderOfState(@RequestBody InsOrder insOrder) {
return Result.success(insOrderService.upInsOrderOfState(insOrder));
}
-
+ @ValueClassify("妫�楠屼笅鍗�")
@ApiOperation(value = "娣诲姞妫�楠屽崟妯℃澘")
@PostMapping("/addInsOrderTemplate")
public Result<?> addInsOrderTemplate(@RequestBody InsOrderTemplate insOrderTemplate) {
@@ -124,7 +126,7 @@
SampleProductDto2 sampleProductDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), SampleProductDto2.class);
return Result.success(insOrderService.selectSampleAndProductByOrderId(page, sampleProductDto));
}
-
+ @ValueClassify("璐圭敤缁熻")
@ApiOperation(value = "璐圭敤缁熻")
@PostMapping("/costStatistics")
public Result<?> costStatistics(@RequestBody Map<String, Object> data) throws Exception {
@@ -132,6 +134,7 @@
CostStatisticsDto costStatisticsDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), CostStatisticsDto.class);
return Result.success(insOrderService.costStatistics(page, costStatisticsDto));
}
+ @ValueClassify("鏍峰搧缂洪櫡鎸囨暟")
@ApiOperation(value = "鏍峰搧缂洪櫡鎸囨暟", tags = "鏍峰搧缂洪櫡鎸囨暟")
@PostMapping("/selectSampleDefects")
public Result selectSampleDefects(Integer size, Integer current, String inspectionItems, String orderNumber) {
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
index 3bd4dbc..dc3972f 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.dto.InsOrderPlanDTO;
import com.yuanchu.mom.service.InsOrderPlanService;
import com.yuanchu.mom.utils.JackSonUtil;
@@ -27,6 +28,7 @@
private InsOrderPlanService insOrderPlanService;
+ @ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "鑾峰彇妫�楠屼换鍔″垪琛�")
@PostMapping("/selectInsOrderPlanList")
public Result selectInsOrderPlanList(@RequestBody Map<String, Object> data) throws Exception {
@@ -35,31 +37,31 @@
InsOrderPlanDTO insOrderPlanDTO = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), InsOrderPlanDTO.class);
return Result.success(insOrderPlanService.selectInsOrderPlanList(page, insOrderPlanDTO));
}
-
+ @ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "璁ら浠诲姟璁″垝")
@PostMapping("/claimInsOrderPlan")
public Result claimInsOrderPlan(@RequestBody InsOrderPlanDTO data) {
return Result.success(insOrderPlanService.claimInsOrderPlan(data));
}
-
+ @ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "鎵ц妫�楠屾搷浣�")
@PostMapping("/doInsOrder")
public Result<?> doInsOrder(Integer id, String laboratory) {
return Result.success(insOrderPlanService.doInsOrder(id, laboratory));
}
-
+ @ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "浠诲姟浜ゆ帴")
@PostMapping("/upPlanUser")
public Result<?> upPlanUser(Integer userId, Integer orderId) {
return Result.success(insOrderPlanService.upPlanUser(userId, orderId));
}
-
+ @ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "澶嶆牳妫�楠屼换鍔�")
@PostMapping("/verifyPlan")
public Result<?> verifyPlan(Integer orderId, String laboratory, Integer type, String tell) {
return Result.success(insOrderPlanService.verifyPlan(orderId, laboratory, type, tell));
}
-
+ @ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "妫�楠屼换鍔℃彁浜�")
@PostMapping("/submitPlan")
public Result<?> submitPlan(Integer orderId, String laboratory) {
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java
index 06e17de..96621d7 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java
@@ -1,6 +1,8 @@
package com.yuanchu.mom.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.dto.ReportPageDto;
import com.yuanchu.mom.exception.ErrorException;
import com.yuanchu.mom.service.InsReportService;
@@ -28,7 +30,7 @@
@Value("${wordUrl}")
private String wordUrl;
-
+ @ValueClassify("鎶ュ憡缂栧埗")
@ApiOperation(value = "鏌ヨ妫�楠屾姤鍛婃暟鎹�")
@PostMapping("/pageInsReport")
public Result pageInsReport(@RequestBody Map<String, Object> data) throws Exception {
@@ -39,6 +41,7 @@
@ApiOperation(value = "鎶ュ憡涓婁紶")
@PostMapping("/inReport")
+ @ValueAuth
public Result inReport(MultipartFile file, Integer id) {
String urlString;
String pathName;
@@ -56,31 +59,31 @@
throw new ErrorException("鏂囦欢涓婁紶澶辫触");
}
}
-
+ @ValueClassify("鎶ュ憡缂栧埗")
@ApiOperation(value = "鎶ュ憡杩樺師")
@PostMapping("/upReportUrl")
public Result upReportUrl(Integer id) {
return Result.success(insReportService.upReportUrl(id));
}
-
+ @ValueClassify("鎶ュ憡缂栧埗")
@ApiOperation(value = "鎶ュ憡鍦ㄧ嚎缂栧埗")
@GetMapping("/upReportFile")
public Result upReportFile() {
return Result.success();
}
-
+ @ValueClassify("鎶ュ憡缂栧埗")
@ApiOperation(value = "鎻愪氦")
@PostMapping("/writeReport")
public Result writeReport(Integer id) {
return Result.success(insReportService.writeReport(id));
}
-
+ @ValueClassify("鎶ュ憡缂栧埗")
@ApiOperation(value = "瀹℃牳")
@PostMapping("/examineReport")
public Result examineReport(Integer id, Integer isExamine, String examineTell) {
return Result.success(insReportService.examineReport(id, isExamine, examineTell));
}
-
+ @ValueClassify("鎶ュ憡缂栧埗")
@ApiOperation(value = "鎵瑰噯")
@PostMapping("/ratifyReport")
public Result ratifyReport(Integer id, Integer isRatify, String ratifyTell) {
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java
index b4a356a..6fdbcdc 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.dto.SampleOrderDto;
import com.yuanchu.mom.service.ReportService;
import com.yuanchu.mom.utils.JackSonUtil;
@@ -22,31 +23,31 @@
public class ReportController {
private ReportService reportService;
-
+ @ValueClassify("涓汉棣栭〉")
@ApiOperation(value = "姣忔棩涓氬姟缁熻")
@GetMapping("/businessStatisticsByDay")
public Result businessStatisticsByDay(){
return Result.success(reportService.businessStatisticsByDay());
}
-
+ @ValueClassify("涓汉棣栭〉")
@ApiOperation(value = "妫�娴嬮」鐩粺璁�")
@GetMapping("/testProductByDay")
public Result testProductByDay(){
return Result.success(reportService.testProductByDay());
}
-
+ @ValueClassify("涓汉棣栭〉")
@ApiOperation(value = "棣栭〉-->鏃ュ巻浠诲姟鍥�")
@GetMapping("/calendarWorkByWeek")
public Result calendarWorkByWeek(){
return Result.success(reportService.calendarWorkByWeek());
}
-
+ @ValueClassify("涓汉棣栭〉")
@ApiOperation(value = "棣栭〉-->娣诲姞鏃ョ▼")
@PostMapping("/addSchedule")
public Result addSchedule(String time, String text){
return Result.success(reportService.addSchedule(time,text));
}
-
+ @ValueClassify("涓汉棣栭〉")
@ApiOperation(value = "棣栭〉-->鎴戠殑鏃ョ▼")
@PostMapping("/ScheduleByMe")
public Result ScheduleByMe(String date){
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java
index 655e5f0..1c6e8ef 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.pojo.StandardTemplate;
import com.yuanchu.mom.service.StandardTemplateService;
import com.yuanchu.mom.utils.JackSonUtil;
@@ -21,7 +22,7 @@
public class StandardTemplateController {
private StandardTemplateService standardTemplateService;
-
+ @ValueClassify("鍘熷璁板綍妯℃澘")
@ApiOperation(value = "鑾峰彇鍘熷璁板綍妯℃澘鍒楄〃")
@PostMapping("/selectStandardTemplatePageList")
public Result selectStandardTemplatePageList(@RequestBody Map<String, Object> data) throws Exception {
@@ -29,19 +30,19 @@
StandardTemplate standardTemplate = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), StandardTemplate.class);
return Result.success(standardTemplateService.selectStandardTemplatePageList(page, standardTemplate));
}
-
+ @ValueClassify("鍘熷璁板綍妯℃澘")
@ApiOperation(value = "娣诲姞鍘熷璁板綍妯℃澘")
@PostMapping("/addStandardTemplate")
public Result addStandardTemplate(@RequestBody StandardTemplate standardTemplate) {
return Result.success(standardTemplateService.addStandardTemplate(standardTemplate));
}
-
+ @ValueClassify("鍘熷璁板綍妯℃澘")
@ApiOperation(value = "淇敼鍘熷璁板綍妯℃澘")
@PostMapping("/upStandardTemplate")
public Result<?> upStandardTemplate(@RequestBody StandardTemplate standardTemplate) {
return Result.success(standardTemplateService.upStandardTemplate(standardTemplate));
}
-
+ @ValueClassify("鍘熷璁板綍妯℃澘")
@ApiOperation(value = "鍒犻櫎鍘熷璁板綍妯℃澘")
@PostMapping("/delStandardTemplate")
public Result<?> delStandardTemplate(Integer id) {
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
index b6aa6d5..75cb990 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.pojo.InsSample;
import com.yuanchu.mom.pojo.StandardProductList;
import com.yuanchu.mom.pojo.StandardTree;
@@ -24,19 +25,19 @@
private StandardMethodListService standardMethodListService;
private StandardProductListService standardProductListService;
-
+ @ValueClassify("鏍囧噯搴�")
@ApiOperation(value = "鑾峰彇鏍囧噯鏍�")
@GetMapping("/selectStandardTreeList")
public Result selectStandardTreeList(){
return Result.success(standardTreeService.selectStandardTreeList());
}
-
+ @ValueClassify("鏍囧噯搴�")
@ApiOperation(value = "娣诲姞鏍囧噯鏍�")
@PostMapping("/addStandardTree")
public Result addStandardTree(@RequestBody StandardTree standardTree){
return Result.success(standardTreeService.addStandardTree(standardTree));
}
-
+ @ValueClassify("鏍囧噯搴�")
@ApiOperation(value = "缁欐爣鍑嗘爲娣诲姞妫�楠屾爣鍑�")
@PostMapping("/addStandardMethodList")
public Result addStandardMethodList(String tree, Integer standardId){
@@ -49,32 +50,32 @@
public Result selectsStandardMethodByFLSSM(String tree){
return Result.success(standardMethodListService.selectsStandardMethodByFLSSM(tree));
}
-
+ @ValueClassify("鏍囧噯搴�")
@ApiOperation(value = "淇敼鏍囧噯搴撲腑鐨勮姹傚��")
@PostMapping("/upStandardProductList")
public Result upStandardProductList(@RequestBody StandardProductList list){
return Result.success(standardProductListService.upStandardProductList(list));
}
-
+ @ValueClassify("鏍囧噯搴�")
@ApiOperation(value = "鍒犻櫎鏍囧噯鏍戜笅鐨勬楠屾爣鍑�")
@PostMapping("/delStandardMethodByFLSSM")
public Result delStandardMethodByFLSSM(Integer id){
return Result.success(standardMethodListService.delStandardMethodByFLSSM(id));
}
-
+ @ValueClassify("鏍囧噯搴�")
@ApiOperation(value = "鍒犻櫎鏍囧噯鏍戜笅鐨勬楠岄」鐩�")
@PostMapping("/delStandardProductByIds")
public Result delStandardProductByIds(String ids){
JSONArray lists = JSON.parseArray(ids);
return Result.success(standardProductListService.delStandardProduct(lists));
}
-
+ @ValueClassify("鏍囧噯搴�")
@ApiOperation(value = "鏂板鏍囧噯鏍戜笅鐨勬楠岄」鐩�")
@PostMapping("/addStandardProduct")
public Result addStandardProduct(String ids, String tree){
return Result.success(standardTreeService.addStandardProduct(ids, tree));
}
-
+ @ValueClassify("鏍囧噯搴�")
@ApiOperation(value = "鍒犻櫎鏍囧噯鏍戠殑灞傜骇")
@PostMapping("/delStandardTree")
public Result delStandardTree(String tree){
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/WarehouseController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/WarehouseController.java
index 19873c8..8363521 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/WarehouseController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/WarehouseController.java
@@ -1,6 +1,7 @@
package com.yuanchu.mom.controller;
import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.pojo.Warehouse;
import com.yuanchu.mom.pojo.WarehouseShelf;
import com.yuanchu.mom.service.WarehouseService;
@@ -19,19 +20,19 @@
public class WarehouseController {
private WarehouseService warehouseService;
-
+ @ValueClassify("鏍峰搧绠＄悊")
@PostMapping("/addWarehouse")
@ApiOperation("娣诲姞浠撳簱")
public Result addWarehouse(String name) {
return Result.success(warehouseService.addWarehouse(name));
}
-
+ @ValueClassify("鏍峰搧绠＄悊")
@GetMapping("/selectWarehouse")
@ApiOperation("鏌ヨ浠撳簱")
public Result selectWarehouse() {
return Result.success(warehouseService.selectWarehouse());
}
-
+ @ValueClassify("鏍峰搧绠＄悊")
@PostMapping("/addShelf")
@ApiOperation("娣诲姞璐ф灦")
@ApiImplicitParams({
@@ -43,60 +44,60 @@
public Result addShelf(@RequestBody WarehouseShelf warehouseShelf) {
return Result.success(warehouseService.addShelf(warehouseShelf));
}
-
+ @ValueClassify("鏍峰搧绠＄悊")
@PostMapping("/delWarehouse")
@ApiOperation("鍒犻櫎浠撳簱")
public Result delWarehouse(Integer id) {
return Result.success(warehouseService.delWarehouse(id));
}
-
+ @ValueClassify("鏍峰搧绠＄悊")
@PostMapping("/upWarehouse")
@ApiOperation("淇敼浠撳簱")
public Result upWarehouse(@RequestBody Warehouse warehouse) {
return Result.success(warehouseService.upWarehouse(warehouse));
}
-
+ @ValueClassify("鏍峰搧绠＄悊")
@PostMapping("/delShelf")
@ApiOperation("鍒犻櫎璐ф灦")
public Result delShelf(Integer id) {
return Result.success(warehouseService.delShelf(id));
}
-
+ @ValueClassify("鏍峰搧绠＄悊")
@PostMapping("/upShelf")
@ApiOperation("淇敼璐ф灦")
public Result upShelf(@RequestBody WarehouseShelf warehouseShelf) {
return Result.success(warehouseService.upShelf(warehouseShelf));
}
-
+ @ValueClassify("鏍峰搧绠＄悊")
@GetMapping("/getWarehouse")
@ApiOperation("鏌ヨ璐ф灦涓嬬殑瀛樻斁淇℃伅")
@ValueAuth
public Result getWarehouse(Integer shelfId) {
return Result.success(warehouseService.getWarehouse(shelfId));
}
-
+ @ValueClassify("鏍峰搧绠＄悊")
@PostMapping("/inWarehouse")
@ApiOperation("鏍峰搧鍏ュ簱")
public Result inWarehouse(String trees, String sampleCode) {
return Result.success(warehouseService.inWarehouse(trees, sampleCode));
}
-
+ @ValueClassify("鏍峰搧绠＄悊")
@PostMapping("/outWarehouse")
@ApiOperation("鏍峰搧鍑哄簱")
public Result outWarehouse(String sampleCode) {
return Result.success(warehouseService.outWarehouse(sampleCode));
}
+ @ValueClassify("鏍峰搧绠＄悊")
@PostMapping("/getSampleRecord")
@ApiOperation("鏌ヨ鏍峰搧璇︾粏璁板綍")
public Result getSampleRecord(Integer id) {
return Result.success(warehouseService.getSampleRecord(id));
}
-
+ @ValueClassify("鏍峰搧绠＄悊")
@PostMapping("/searchSampleId")
@ApiOperation("閫氳繃鏍峰搧缂栧彿杩涜妫�绱�")
public Result searchSampleId(String sampleCode) {
return Result.success(warehouseService.searchSampleId(sampleCode));
}
-
}
diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/EnumController.java b/user-server/src/main/java/com/yuanchu/mom/controller/EnumController.java
index 77aa7da..1efa47b 100644
--- a/user-server/src/main/java/com/yuanchu/mom/controller/EnumController.java
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/EnumController.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.dto.RolePowerDto;
import com.yuanchu.mom.pojo.Enums;
import com.yuanchu.mom.service.EnumService;
@@ -23,6 +24,7 @@
private EnumService enumService;
+ @ValueClassify("鏁版嵁瀛楀吀")
@ApiOperation(value = "鑾峰彇鏋氫妇鍒楄〃")
@PostMapping("/selectEnumList")
public Result selectEnumList(@RequestBody Map<String, Object> data) throws Exception {
@@ -30,32 +32,32 @@
Enums enums = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Enums.class);
return Result.success(enumService.selectEnumList(page, enums));
}
-
+ @ValueClassify("鏁版嵁瀛楀吀")
@ApiOperation(value = "娣诲姞鏋氫妇")
@PostMapping("/addEnum")
public Result addEnum(@RequestBody Enums enums) {
return Result.success(enumService.addEnum(enums));
}
-
+ @ValueClassify("鏁版嵁瀛楀吀")
@ApiOperation(value = "淇敼鏋氫妇")
@PostMapping("/upEnum")
public Result<?> upEnum(@RequestBody Enums enums) {
return Result.success(enumService.upEnum(enums));
}
-
+ @ValueClassify("鏁版嵁瀛楀吀")
@ApiOperation(value = "鍒犻櫎鏋氫妇")
@PostMapping("/delEnum")
public Result<?> delEnum(Integer id) {
return Result.success(enumService.delEnum(id));
}
-
+ @ValueClassify("鏁版嵁瀛楀吀")
@ApiOperation(value = "閫氳繃鍒嗙被鏌ヨ鏋氫妇")
@PostMapping("/selectEnumByCategory")
@ValueAuth
public Result<?> selectEnumByCategory(String category){
return Result.success(enumService.selectEnumByCategory(category));
}
-
+ @ValueClassify("鏁版嵁瀛楀吀")
@ApiOperation(value = "鑾峰彇鏁版嵁瀛楀吀鐨勫垎绫�")
@PostMapping("/getDic")
public Result<?> getDic(){
diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/RoleController.java b/user-server/src/main/java/com/yuanchu/mom/controller/RoleController.java
index 5774f37..430fcc0 100644
--- a/user-server/src/main/java/com/yuanchu/mom/controller/RoleController.java
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/RoleController.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.dto.RolePowerDto;
import com.yuanchu.mom.pojo.Role;
import com.yuanchu.mom.service.PowerService;
@@ -27,14 +28,14 @@
private RoleService roleService;
private PowerService powerService;
-
+ @ValueClassify("瑙掕壊绠＄悊")
@ApiOperation(value = "鑾峰彇瑙掕壊鍒楄〃鏋氫妇")
@GetMapping("/selectRoleList")
public Result selectRoleList(){
return Result.success(roleService.selectList());
}
-
+ @ValueClassify("瑙掕壊绠＄悊")
@ApiOperation(value = "鑾峰彇瑙掕壊鍒楄〃")
@PostMapping("/selectRoleLists")
public Result selectRoleLists(@RequestBody Map<String, Object> data) throws Exception {
@@ -42,33 +43,33 @@
Role role = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Role.class);
return Result.success(roleService.selectUserList(page, role));
}
-
+ @ValueClassify("瑙掕壊绠＄悊")
@ApiOperation(value = "鍒犻櫎瑙掕壊鍒楄〃")
@PostMapping("/delRole")
public Result delRole(Integer id){
return Result.success(roleService.delRole(id));
}
-
+ @ValueClassify("瑙掕壊绠＄悊")
@ApiOperation(value = "閫氳繃瑙掕壊id鏌ヨ鏉冮檺鍒楄〃")
@PostMapping("/selectPowerByRoleId")
public Result<?> selectPowerByRoleId(Integer id) {
return Result.success(powerService.selectPowerByRoleId(id));
}
-
+ @ValueClassify("瑙掕壊绠＄悊")
@ApiOperation(value = "鑾峰彇鑿滃崟")
@GetMapping("/selectMenuList")
@ValueAuth
public Result<?> selectMenuList() {
return Result.success(roleService.selectMenuList());
}
-
+ @ValueClassify("瑙掕壊绠＄悊")
@ApiOperation(value = "娣诲姞瑙掕壊")
@PostMapping("/addRole")
public Result<?> addRole(String str) {
RolePowerDto powers = JSON.parseObject(str, RolePowerDto.class);
return Result.success(roleService.addRole(powers));
}
-
+ @ValueClassify("瑙掕壊绠＄悊")
@ApiOperation(value = "淇敼瑙掕壊淇℃伅")
@PostMapping("/upRole")
public Result<?> upRole(String str) {
diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/SystemLogController.java b/user-server/src/main/java/com/yuanchu/mom/controller/SystemLogController.java
index db2368c..b2e483b 100644
--- a/user-server/src/main/java/com/yuanchu/mom/controller/SystemLogController.java
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/SystemLogController.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.pojo.PageSystemLogDto;
import com.yuanchu.mom.service.SystemLogService;
import com.yuanchu.mom.utils.JackSonUtil;
@@ -27,7 +28,7 @@
public class SystemLogController {
private SystemLogService systemLogService;
-
+ @ValueClassify("绯荤粺鏃ュ織")
@ApiOperation(value = "鑾峰彇绯荤粺鏃ュ織鍒楄〃")
@PostMapping("/selectSystemLogList")
public Result selectSystemLogList(@RequestBody Map<String, Object> data) throws Exception {
diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java b/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
index a645ff0..edb5726 100644
--- a/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.dto.Custom;
import com.yuanchu.mom.dto.UserPageDto;
import com.yuanchu.mom.pojo.User;
@@ -90,7 +91,7 @@
}
return Result.fail(map.get("info"));
}
-
+ @ValueClassify("鐢ㄦ埛绠＄悊")
@ApiOperation(value = "鑾峰彇鐢ㄦ埛鍒楄〃")
@PostMapping("/selectUserList")
public Result selectUserList(@RequestBody Map<String, Object> data) throws Exception {
@@ -98,7 +99,7 @@
UserPageDto user = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), UserPageDto.class);
return Result.success(userService.selectUserList(page, user));
}
-
+ @ValueClassify("鐢ㄦ埛绠＄悊")
@ApiOperation(value = "淇敼鐢ㄦ埛淇℃伅")
@PostMapping("/updateUser")
public Result<?> updateUser(@RequestBody User user) {
@@ -106,7 +107,7 @@
else user.setPassword(DigestUtils.md5DigestAsHex(user.getPassword().getBytes()));
return Result.success(userService.updateUser(user));
}
-
+ @ValueClassify("鐢ㄦ埛绠＄悊")
@ApiOperation(value = "娣诲姞鐢ㄦ埛淇℃伅")
@PostMapping("/addUser")
public Result<?> addUser(@RequestBody User user) {
@@ -121,7 +122,7 @@
public Result<?> getUserMenu() {
return Result.success(userService.getUserMenu());
}
-
+ @ValueClassify("鐢ㄦ埛绠＄悊")
@ApiOperation(value = "鑾峰彇瀹㈡埛鍒楄〃")
@PostMapping("/selectCustomPageList")
public Result selectCustomPageList(@RequestBody Map<String, Object> data) throws Exception {
@@ -129,13 +130,13 @@
Custom custom = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Custom.class);
return Result.success(customService.selectCustomPageList(page, custom));
}
-
+ @ValueClassify("鐢ㄦ埛绠＄悊")
@ApiOperation(value = "鍒犻櫎瀹㈡埛淇℃伅")
@PostMapping("/delCustomById")
public Result<?> delCustomById(Integer id) {
return Result.success(customService.delCustomById(id));
}
-
+ @ValueClassify("鐢ㄦ埛绠＄悊")
@ApiOperation(value = "鏂板瀹㈡埛淇℃伅")
@PostMapping("/addCustom")
public Result<?> addCustom(@RequestBody Custom custom) {
--
Gitblit v1.9.3