From 1f61cb05c376263b5746d734946576b6eb699723 Mon Sep 17 00:00:00 2001 From: ruanqi Date: Tue, 17 Oct 2023 18:03:47 +0800 Subject: [PATCH] first --- .../base/controller/BaseController.java | 28 ++++++-- .../spring/modules/base/dao/BaseMapper.java | 18 +++-- .../base/data/PlmFieldFunctionListData.java | 9 +++ .../modules/base/data/PlmFieldListData.java | 9 +++ .../base/entity/PlmFieldFunctionList.java | 69 +++++++++++++++++++ .../modules/base/entity/PlmFieldList.java | 56 +++++++++++++++ .../modules/base/service/BaseService.java | 27 ++++++-- .../base/service/Impl/BaseServiceImpl.java | 13 ++-- src/main/resources/mapper/base/BaseMapper.xml | 11 +++ 9 files changed, 224 insertions(+), 16 deletions(-) create mode 100644 src/main/java/com/spring/modules/base/data/PlmFieldFunctionListData.java create mode 100644 src/main/java/com/spring/modules/base/data/PlmFieldListData.java create mode 100644 src/main/java/com/spring/modules/base/entity/PlmFieldFunctionList.java create mode 100644 src/main/java/com/spring/modules/base/entity/PlmFieldList.java diff --git a/src/main/java/com/spring/modules/base/controller/BaseController.java b/src/main/java/com/spring/modules/base/controller/BaseController.java index dc98c96c..5d0a932c 100644 --- a/src/main/java/com/spring/modules/base/controller/BaseController.java +++ b/src/main/java/com/spring/modules/base/controller/BaseController.java @@ -1,10 +1,7 @@ package com.spring.modules.base.controller; import com.spring.common.utils.R; -import com.spring.modules.base.data.AccessProjectData; -import com.spring.modules.base.data.BuData; -import com.spring.modules.base.data.BuUserData; -import com.spring.modules.base.data.SaveAccessSiteData; +import com.spring.modules.base.data.*; import com.spring.modules.base.entity.CompanyData; import com.spring.modules.base.entity.*; import com.spring.modules.base.service.BaseService; @@ -330,4 +327,27 @@ public class BaseController extends AbstractController { baseService.saveAccessSiteForSite(data); return R.ok(); } + + /** + * @Description TODO + * @Title searchFieldFunctionList + * @param data + * @author rq + * @date 2023/10/17 16:49 + * @return R + * @throw + */ + @PostMapping(value="/searchFieldFunctionList") + @ResponseBody + public R searchFieldFunctionList(){ + List rows = baseService.searchFieldFunctionList(); + return R.ok().put("rows", rows); + } + + @PostMapping(value="/searchFieldListWithFunction") + @ResponseBody + public R searchFieldListWithFunction(@RequestBody PlmFieldListData inData){ + List rows = baseService.searchFieldListWithFunction(inData); + return R.ok().put("rows", rows); + } } diff --git a/src/main/java/com/spring/modules/base/dao/BaseMapper.java b/src/main/java/com/spring/modules/base/dao/BaseMapper.java index c25cc1c9..9e3b10bc 100644 --- a/src/main/java/com/spring/modules/base/dao/BaseMapper.java +++ b/src/main/java/com/spring/modules/base/dao/BaseMapper.java @@ -2,10 +2,7 @@ package com.spring.modules.base.dao; import com.spring.modules.app.entity.UserEntity; -import com.spring.modules.base.data.AccessProjectData; -import com.spring.modules.base.data.BuData; -import com.spring.modules.base.data.BuUserData; -import com.spring.modules.base.data.SaveAccessSiteData; +import com.spring.modules.base.data.*; import com.spring.modules.base.entity.AccessSiteData; import com.spring.modules.base.entity.CompanyData; import com.spring.modules.base.entity.SiteData; @@ -320,4 +317,17 @@ public interface BaseMapper { * @throw */ void saveAccessSite(AccessSite inData); + + /** + * @Description TODO + * @Title searchFieldFunctionList + * @param + * @author rq + * @date 2023/10/17 16:54 + * @return List + * @throw + */ + List searchFieldFunctionList(); + + List searchFieldListWithFunction(PlmFieldListData inData); } diff --git a/src/main/java/com/spring/modules/base/data/PlmFieldFunctionListData.java b/src/main/java/com/spring/modules/base/data/PlmFieldFunctionListData.java new file mode 100644 index 00000000..f3b72604 --- /dev/null +++ b/src/main/java/com/spring/modules/base/data/PlmFieldFunctionListData.java @@ -0,0 +1,9 @@ +package com.spring.modules.base.data; + +import com.spring.modules.base.entity.PlmFieldFunctionList; +import org.apache.ibatis.type.Alias; + +@Alias("PlmFieldFunctionListData") +public class PlmFieldFunctionListData extends PlmFieldFunctionList { + +} diff --git a/src/main/java/com/spring/modules/base/data/PlmFieldListData.java b/src/main/java/com/spring/modules/base/data/PlmFieldListData.java new file mode 100644 index 00000000..49476e58 --- /dev/null +++ b/src/main/java/com/spring/modules/base/data/PlmFieldListData.java @@ -0,0 +1,9 @@ +package com.spring.modules.base.data; + +import com.spring.modules.base.entity.PlmFieldList; +import org.apache.ibatis.type.Alias; + +@Alias("PlmFieldListData") +public class PlmFieldListData extends PlmFieldList { + +} diff --git a/src/main/java/com/spring/modules/base/entity/PlmFieldFunctionList.java b/src/main/java/com/spring/modules/base/entity/PlmFieldFunctionList.java new file mode 100644 index 00000000..4c3a435c --- /dev/null +++ b/src/main/java/com/spring/modules/base/entity/PlmFieldFunctionList.java @@ -0,0 +1,69 @@ +package com.spring.modules.base.entity; + +public class PlmFieldFunctionList { + /** + * 功能编码 + */ + private String functionId; + + /** + * 功能名称 + */ + private String functionName; + + /** + * 功能分组 + */ + private String functionGroup; + + /** + * 分组排序 + */ + private Integer orderGroup; + + /** + * 功能排序 + */ + private Integer orderFunction; + + public String getFunctionId() { + return functionId; + } + + public void setFunctionId(String functionId) { + this.functionId = functionId; + } + + public String getFunctionName() { + return functionName; + } + + public void setFunctionName(String functionName) { + this.functionName = functionName; + } + + public String getFunctionGroup() { + return functionGroup; + } + + public void setFunctionGroup(String functionGroup) { + this.functionGroup = functionGroup; + } + + public Integer getOrderGroup() { + return orderGroup; + } + + public void setOrderGroup(Integer orderGroup) { + this.orderGroup = orderGroup; + } + + public Integer getOrderFunction() { + return orderFunction; + } + + public void setOrderFunction(Integer orderFunction) { + this.orderFunction = orderFunction; + } +} + diff --git a/src/main/java/com/spring/modules/base/entity/PlmFieldList.java b/src/main/java/com/spring/modules/base/entity/PlmFieldList.java new file mode 100644 index 00000000..b960124f --- /dev/null +++ b/src/main/java/com/spring/modules/base/entity/PlmFieldList.java @@ -0,0 +1,56 @@ +package com.spring.modules.base.entity; + +public class PlmFieldList { + /** + * 字段id + */ + private String fieldId; + + /** + * 字段描述 + */ + private String fieldDesc; + + /** + * 功能Id + */ + private String functionId; + + /** + * 字段名 + */ + private String fieldName; + + public String getFieldId() { + return fieldId; + } + + public void setFieldId(String fieldId) { + this.fieldId = fieldId; + } + + public String getFieldDesc() { + return fieldDesc; + } + + public void setFieldDesc(String fieldDesc) { + this.fieldDesc = fieldDesc; + } + + public String getFunctionId() { + return functionId; + } + + public void setFunctionId(String functionId) { + this.functionId = functionId; + } + + public String getFieldName() { + return fieldName; + } + + public void setFieldName(String fieldName) { + this.fieldName = fieldName; + } +} + diff --git a/src/main/java/com/spring/modules/base/service/BaseService.java b/src/main/java/com/spring/modules/base/service/BaseService.java index 6db4cdba..5c777a86 100644 --- a/src/main/java/com/spring/modules/base/service/BaseService.java +++ b/src/main/java/com/spring/modules/base/service/BaseService.java @@ -1,9 +1,6 @@ package com.spring.modules.base.service; -import com.spring.modules.base.data.AccessProjectData; -import com.spring.modules.base.data.BuData; -import com.spring.modules.base.data.BuUserData; -import com.spring.modules.base.data.SaveAccessSiteData; +import com.spring.modules.base.data.*; import com.spring.modules.base.entity.CompanyData; import com.spring.modules.base.entity.*; import com.spring.modules.base.utils.ResponseData; @@ -206,4 +203,26 @@ public interface BaseService { * @throw */ void saveAccessSiteForSite(SaveAccessSiteData inData); + + /** + * @Description TODO + * @Title searchFieldFunctionList + * @param + * @author rq + * @date 2023/10/17 16:51 + * @return List + * @throw + */ + List searchFieldFunctionList(); + + /** + * @Description TODO + * @Title searchFieldListWithFunction + * @param inData + * @author rq + * @date 2023/10/17 17:50 + * @return List + * @throw + */ + List searchFieldListWithFunction(PlmFieldListData inData); } diff --git a/src/main/java/com/spring/modules/base/service/Impl/BaseServiceImpl.java b/src/main/java/com/spring/modules/base/service/Impl/BaseServiceImpl.java index 79e45ccc..c49a6030 100644 --- a/src/main/java/com/spring/modules/base/service/Impl/BaseServiceImpl.java +++ b/src/main/java/com/spring/modules/base/service/Impl/BaseServiceImpl.java @@ -5,10 +5,7 @@ package com.spring.modules.base.service.Impl; import com.spring.common.constant.SysMsgConstant; import com.spring.modules.base.dao.BaseMapper; -import com.spring.modules.base.data.AccessProjectData; -import com.spring.modules.base.data.BuData; -import com.spring.modules.base.data.BuUserData; -import com.spring.modules.base.data.SaveAccessSiteData; +import com.spring.modules.base.data.*; import com.spring.modules.base.entity.CompanyData; import com.spring.modules.base.entity.*; import com.spring.modules.base.service.BaseService; @@ -247,5 +244,13 @@ public class BaseServiceImpl implements BaseService { } } + @Override + public List searchFieldFunctionList(){ + return baseMapper.searchFieldFunctionList(); + } + @Override + public List searchFieldListWithFunction(PlmFieldListData inData){ + return baseMapper.searchFieldListWithFunction(inData); + } } diff --git a/src/main/resources/mapper/base/BaseMapper.xml b/src/main/resources/mapper/base/BaseMapper.xml index 190d4c35..0a077935 100644 --- a/src/main/resources/mapper/base/BaseMapper.xml +++ b/src/main/resources/mapper/base/BaseMapper.xml @@ -212,4 +212,15 @@ insert into AccessSite (UserID,Site) values(#{userid},#{site}) + + + + \ No newline at end of file