From 4533960ef98e10f1fca5b27adc97f9b050c4d182 Mon Sep 17 00:00:00 2001 From: yinglong zhang <1679309912@qq.com> Date: Tue, 29 Jun 2021 09:07:06 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E4=BF=AE=E6=94=B9=E4=BA=86=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E6=90=9C=E7=B4=A2=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/main/generate/CodeGen.java | 5 +- .../main/resources/application-dev.properties | 5 +- .../src/main/resources/application.properties | 4 +- adc-da-search/pom.xml | 5 ++ .../da/search/config/ElasticsearchConfig.java | 1 - .../config/ElasticsearchProperties.java | 34 +------- .../controller/SearchCenterController.java | 25 +++++- .../da/search/entity/BasicSearchEntity.java | 13 +++ .../da/search/entity/CommonSearchInfoEO.java | 22 +++++ .../search/service/SearchCenterService.java | 3 + .../service/impl/SearchCenterServiceImpl.java | 36 +++++++- .../controller/TsDictionaryController.java | 23 +++++ .../controller/TsDictypeController.java | 23 +++++ .../tsDictionaryType/dao/TsDicTypeDao.java | 19 +++++ .../tsDictionaryType/dao/TsDictionaryDao.java | 16 ++++ .../tsDictionaryType/entity/MenuType.java | 17 ++++ .../tsDictionaryType/entity/TsDicType.java | 84 +++++++++++++++++++ .../tsDictionaryType/entity/TsDictionary.java | 82 ++++++++++++++++++ .../tsDictionaryType/entity/TsSearchMenu.java | 20 +++++ .../service/ITsDicTypeService.java | 21 +++++ .../service/ITsDictionaryService.java | 16 ++++ .../service/impl/TsDicTypeServiceImpl.java | 27 ++++++ .../service/impl/TsDictionaryServiceImpl.java | 20 +++++ .../tsDictionaryType/TsDicTypeMapper.xml | 32 +++++++ .../tsDictionaryType/TsDictionaryMapper.xml | 5 ++ 25 files changed, 512 insertions(+), 46 deletions(-) create mode 100644 adc-da-search/src/main/java/com/adc/da/search/entity/BasicSearchEntity.java create mode 100644 adc-da-search/src/main/java/com/adc/da/search/entity/CommonSearchInfoEO.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/controller/TsDictionaryController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/controller/TsDictypeController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/dao/TsDicTypeDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/dao/TsDictionaryDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/entity/MenuType.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/entity/TsDicType.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/entity/TsDictionary.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/entity/TsSearchMenu.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/service/ITsDicTypeService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/service/ITsDictionaryService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/service/impl/TsDicTypeServiceImpl.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/service/impl/TsDictionaryServiceImpl.java create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/tsDictionaryType/TsDicTypeMapper.xml create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/tsDictionaryType/TsDictionaryMapper.xml diff --git a/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java b/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java index b3120d79..e17bf8a0 100644 --- a/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java +++ b/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java @@ -22,11 +22,12 @@ public class CodeGen { // x.x.x.x:3306/xxxx --MYSQL // 192.168.10.140:1521:foton_slrs_test - private static final String DB_IP="localhost:3306/foton_slrs_test"; + // foton_slrs_test@101.36.227.22 + private static final String DB_IP="101.36.227.22:33050/foton_slrs_test"; private static final String DB_USER="root"; - private static final String DB_PWD="Zxy20010202"; + private static final String DB_PWD="1q2w3e4r"; /** diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index afdb5624..b0d8ffe2 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -3,10 +3,9 @@ # 数据库配置 #============================================= spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver -spring.datasource.url = jdbc:mysql://localhost:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false +spring.datasource.url = jdbc:mysql:/101.36.227.22:33050/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false spring.datasource.username = root -spring.datasource.password = Zxy20010202 - +spring.datasource.password = 1q2w3e4r #============================================== # 应用设置 spring.application.name=FotonLAWSSystem diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index d0fa62ba..4cb8be56 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -139,8 +139,8 @@ upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg # ============================================================================= # elasticsearch 配置 # ============================================================================= -elasticsearch.clustername=laws -elasticsearch.ip=localhost +elasticsearch.clustername=elasticsearch +elasticsearch.ip=192.168.10.47 elasticsearch.port=9300 elasticsearch.poolSize=5 elas.flag=true \ No newline at end of file diff --git a/adc-da-search/pom.xml b/adc-da-search/pom.xml index 38d5f6b0..4c067f98 100644 --- a/adc-da-search/pom.xml +++ b/adc-da-search/pom.xml @@ -60,6 +60,11 @@ adc-da-base 3.0.0 + + com.adc + adc-da-slrs + 3.0.0 + com.adc diff --git a/adc-da-search/src/main/java/com/adc/da/search/config/ElasticsearchConfig.java b/adc-da-search/src/main/java/com/adc/da/search/config/ElasticsearchConfig.java index 26fec5b6..a86b7263 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/config/ElasticsearchConfig.java +++ b/adc-da-search/src/main/java/com/adc/da/search/config/ElasticsearchConfig.java @@ -50,7 +50,6 @@ public class ElasticsearchConfig { if (client != null) { client.close(); } - }*/ diff --git a/adc-da-search/src/main/java/com/adc/da/search/config/ElasticsearchProperties.java b/adc-da-search/src/main/java/com/adc/da/search/config/ElasticsearchProperties.java index d0f4b9d1..bedcc96c 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/config/ElasticsearchProperties.java +++ b/adc-da-search/src/main/java/com/adc/da/search/config/ElasticsearchProperties.java @@ -1,9 +1,12 @@ package com.adc.da.search.config; +import lombok.Data; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; @Component +@Data @ConfigurationProperties(prefix = "elasticsearch") public class ElasticsearchProperties { private String clustername; @@ -11,35 +14,4 @@ public class ElasticsearchProperties { private Integer port; private Integer poolSize; - public String getClustername() { - return clustername; - } - - public void setClustername(String clustername) { - this.clustername = clustername; - } - - public String getIp() { - return ip; - } - - public void setIp(String ip) { - this.ip = ip; - } - - public Integer getPort() { - return port; - } - - public void setPort(Integer port) { - this.port = port; - } - - public Integer getPoolSize() { - return poolSize; - } - - public void setPoolSize(Integer poolSize) { - this.poolSize = poolSize; - } } diff --git a/adc-da-search/src/main/java/com/adc/da/search/controller/SearchCenterController.java b/adc-da-search/src/main/java/com/adc/da/search/controller/SearchCenterController.java index 7a291e8a..d60a2cee 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/controller/SearchCenterController.java +++ b/adc-da-search/src/main/java/com/adc/da/search/controller/SearchCenterController.java @@ -7,6 +7,7 @@ import com.adc.da.excel.poi.excel.entity.enums.ExcelType; import com.adc.da.http.PageInfo; import com.adc.da.person.service.IPersonCollectEOService; import com.adc.da.search.dto.*; +import com.adc.da.search.entity.CommonSearchInfoEO; import com.adc.da.search.entity.SarAdvanceSearchVO; import com.adc.da.search.entity.SeniorSearchInfoEO; import com.adc.da.search.service.ElasticsearchService; @@ -14,6 +15,8 @@ import com.adc.da.search.service.SearchCenterService; import com.adc.da.exception.AdcDaBaseException; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; +import com.adc.da.slrs.tsDictionaryType.entity.TsSearchMenu; +import com.adc.da.slrs.tsDictionaryType.service.ITsDicTypeService; import com.adc.da.util.IOUtils; import com.alibaba.fastjson.JSONObject; @@ -23,10 +26,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Workbook; import org.elasticsearch.client.transport.TransportClient; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -52,6 +52,15 @@ public class SearchCenterController extends BaseController> @Autowired private ElasticsearchService elasticsearchService; + @Autowired + private ITsDicTypeService iTsDictypeService; + + @ApiOperation("获取筛选条件") + @PostMapping("/getMenu") + public ResponseMessage> getSearchMenu(){ + return Result.success(iTsDictypeService.getSearchMenu()); + } + /** * * @param searchInfoEO @@ -98,6 +107,14 @@ public class SearchCenterController extends BaseController> } } + @ApiOperation("根据多个key去查询") + @PostMapping("/searchByKey") + public void searchByKey(@RequestBody CommonSearchInfoEO commonSearchInfoEO){ + searchCenterService.searchByKey(commonSearchInfoEO); + } + + + @ApiOperation(value = "|SearchCenter|查询用于导出数据") @PostMapping(value="/searchIdToImport") public ResponseMessage searchIdToImport(SeniorSearchInfoEO searchInfoEO){ diff --git a/adc-da-search/src/main/java/com/adc/da/search/entity/BasicSearchEntity.java b/adc-da-search/src/main/java/com/adc/da/search/entity/BasicSearchEntity.java new file mode 100644 index 00000000..06379ba6 --- /dev/null +++ b/adc-da-search/src/main/java/com/adc/da/search/entity/BasicSearchEntity.java @@ -0,0 +1,13 @@ +package com.adc.da.search.entity; + +import lombok.Data; + +import java.util.List; + +@Data +public class BasicSearchEntity { + private String key; + private String sign; + private String value; + private List values; +} diff --git a/adc-da-search/src/main/java/com/adc/da/search/entity/CommonSearchInfoEO.java b/adc-da-search/src/main/java/com/adc/da/search/entity/CommonSearchInfoEO.java new file mode 100644 index 00000000..fcdbd922 --- /dev/null +++ b/adc-da-search/src/main/java/com/adc/da/search/entity/CommonSearchInfoEO.java @@ -0,0 +1,22 @@ +package com.adc.da.search.entity; + +import lombok.Data; + +import java.util.List; + +@Data +public class CommonSearchInfoEO { + + private List searchEntities; + + private String searchType; + + private String searchIndex; + + private String searchBox; + + private Integer currents; + + private Integer size; + +} diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/SearchCenterService.java b/adc-da-search/src/main/java/com/adc/da/search/service/SearchCenterService.java index 9e569ff4..328e50e4 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/SearchCenterService.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/SearchCenterService.java @@ -1,5 +1,6 @@ package com.adc.da.search.service; +import com.adc.da.search.entity.CommonSearchInfoEO; import com.adc.da.search.entity.SeniorSearchInfoEO; import org.elasticsearch.action.search.SearchResponse; @@ -27,4 +28,6 @@ public interface SearchCenterService { List> searchSarBykeyAndHighLightNumber(SeniorSearchInfoEO searchInfoEO) throws Exception; + void searchByKey(CommonSearchInfoEO commonSearchInfoEO); + } diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java index ec8b808b..6a2fd4a1 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java @@ -1,11 +1,10 @@ package com.adc.da.search.service.impl; import com.adc.da.person.dao.PersonSearchEODao; -import com.adc.da.search.entity.SarAdvanceSearchVO; -import com.adc.da.search.entity.SearchListDto; -import com.adc.da.search.entity.SeniorSearchInfoEO; +import com.adc.da.search.entity.*; import com.adc.da.search.service.SearchCenterService; import com.alibaba.fastjson.JSONArray; +import lombok.extern.slf4j.Slf4j; import net.sf.json.JSONObject; import org.apache.commons.lang3.StringUtils; import org.elasticsearch.action.search.SearchRequestBuilder; @@ -40,6 +39,7 @@ import java.text.SimpleDateFormat; import java.util.*; @Component +@Slf4j public class SearchCenterServiceImpl implements SearchCenterService { private final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(SearchCenterServiceImpl.class); @@ -1246,6 +1246,36 @@ public class SearchCenterServiceImpl implements SearchCenterService { searchInfoEO.getPager().setRowCount((int) response.getHits().getTotalHits()); return result; } + + @Override + public void searchByKey(CommonSearchInfoEO commonSearchInfoEO) { + + //写个假的根据字段查询 + SearchRequestBuilder searchRequestBuilder; + BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery(); + BoolQueryBuilder boolQueryShould = QueryBuilders.boolQuery(); + BoolQueryBuilder boolQueryMust = QueryBuilders.boolQuery(); + + for (BasicSearchEntity entity: commonSearchInfoEO.getSearchEntities()) { + if(entity.getKey()!=null&&entity.getValue()!=null&&(entity.getSign()==null||entity.getSign().equals("=")))boolQueryMust.must(QueryBuilders.wildcardQuery(entity.getKey(),"*"+entity.getValue()+"*")); + } + + searchRequestBuilder=client.prepareSearch(commonSearchInfoEO.getSearchIndex()) + .setSearchType(SearchType.DFS_QUERY_THEN_FETCH) + .setFrom((commonSearchInfoEO.getCurrents()-1)*commonSearchInfoEO.getSize()) + .setSize(commonSearchInfoEO.getSize()); + boolQueryBuilder.must(QueryBuilders.matchQuery("validFlag", 0)); + + boolQueryBuilder.must(boolQueryMust); + boolQueryShould.should(boolQueryShould); + + searchRequestBuilder.setQuery(boolQueryBuilder); + // 获取查询到的结果 + SearchResponse response = searchRequestBuilder.get(); + + log.info(response.getHits().toString()); + + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/controller/TsDictionaryController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/controller/TsDictionaryController.java new file mode 100644 index 00000000..1a0f7ff1 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/controller/TsDictionaryController.java @@ -0,0 +1,23 @@ +package com.adc.da.slrs.tsDictionaryType.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; +import com.adc.da.slrs.tsDictionaryType.entity.TsDictionary; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RestController; +import com.adc.da.base.web.BaseController; + +/** +*

+ * 前端控制器 + *

+* +* @author zyl +* @since 2021-06-28 +*/ +@RestController +@Api(description = "|TsDictionary|") +@RequestMapping("/tsDictionaryType/ts-dictionary") +public class TsDictionaryController extends BaseController { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/controller/TsDictypeController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/controller/TsDictypeController.java new file mode 100644 index 00000000..9c582262 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/controller/TsDictypeController.java @@ -0,0 +1,23 @@ +package com.adc.da.slrs.tsDictionaryType.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; +import com.adc.da.slrs.tsDictionaryType.entity.TsDicType; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RestController; +import com.adc.da.base.web.BaseController; + +/** +*

+ * 前端控制器 + *

+* +* @author zyl +* @since 2021-06-28 +*/ +@RestController +@Api(description = "|TsDictype|") +@RequestMapping("/tsDictionaryType/ts-dictype") +public class TsDictypeController extends BaseController { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/dao/TsDicTypeDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/dao/TsDicTypeDao.java new file mode 100644 index 00000000..604050f3 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/dao/TsDicTypeDao.java @@ -0,0 +1,19 @@ +package com.adc.da.slrs.tsDictionaryType.dao; + +import com.adc.da.slrs.tsDictionaryType.entity.TsDicType; +import com.adc.da.slrs.tsDictionaryType.entity.TsSearchMenu; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; + +/** + *

+ * Mapper 接口 + *

+ * + * @author zyl + * @since 2021-06-28 + */ +public interface TsDicTypeDao extends BaseMapper { + public List getSearchMenu(); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/dao/TsDictionaryDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/dao/TsDictionaryDao.java new file mode 100644 index 00000000..01c0d2e8 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/dao/TsDictionaryDao.java @@ -0,0 +1,16 @@ +package com.adc.da.slrs.tsDictionaryType.dao; + +import com.adc.da.slrs.tsDictionaryType.entity.TsDictionary; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author zyl + * @since 2021-06-28 + */ +public interface TsDictionaryDao extends BaseMapper { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/entity/MenuType.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/entity/MenuType.java new file mode 100644 index 00000000..c43b0985 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/entity/MenuType.java @@ -0,0 +1,17 @@ +package com.adc.da.slrs.tsDictionaryType.entity; + + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.RequiredArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +class MenuType{ + private String id; + private String dicId; + private String dicTypeName; + private String dicTypeCode; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/entity/TsDicType.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/entity/TsDicType.java new file mode 100644 index 00000000..9c5d8c4f --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/entity/TsDicType.java @@ -0,0 +1,84 @@ +package com.adc.da.slrs.tsDictionaryType.entity; + +import com.adc.da.base.entity.BaseEntity; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.TableId; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *

+ * + *

+ * + * @author zyl + * @since 2021-06-28 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="TsDicType对象", description="") +@TableName("ts_dictype") +public class TsDicType extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + @TableId("ID") + private String id; + + @ApiModelProperty(value = "数据字典ID") + @TableField("DIC_ID") + private String dicId; + + @ApiModelProperty(value = "数据内容") + @TableField("DIC_TYPE_NAME") + private String dicTypeName; + + @ApiModelProperty(value = "数据编码") + @TableField("DIC_TYPE_CODE") + private String dicTypeCode; + + @ApiModelProperty(value = "描述") + @TableField("DESCRIBES") + private String describes; + + @ApiModelProperty(value = "展示排序") + @TableField("SHOW_INDEX") + private BigDecimal showIndex; + + @ApiModelProperty(value = "关联的父级ID") + @TableField("PARENT_ID") + private String parentId; + + @ApiModelProperty(value = "树结构父级ID") + @TableField("TREE_PID") + private String treePid; + + @ApiModelProperty(value = "冗余字段") + @TableField("OTHERS") + private String others; + + @TableField("CREATION_USER") + private String creationUser; + + @ApiModelProperty(value = "是否有效") + @TableField("VALID_FLAG") + private String validFlag; + + @ApiModelProperty(value = "创建时间") + @TableField("CREATION_TIME") + private LocalDateTime creationTime; + + @ApiModelProperty(value = "修改时间") + @TableField("MODIFY_TIME") + private LocalDateTime modifyTime; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/entity/TsDictionary.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/entity/TsDictionary.java new file mode 100644 index 00000000..662fa8bd --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/entity/TsDictionary.java @@ -0,0 +1,82 @@ +package com.adc.da.slrs.tsDictionaryType.entity; + +import com.adc.da.base.entity.BaseEntity; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.TableId; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *

+ * + *

+ * + * @author zyl + * @since 2021-06-28 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="TsDictionary对象", description="") +public class TsDictionary extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + @TableId("ID") + private String id; + + @ApiModelProperty(value = "数据字典编码") + @TableField("DICTIONARY_CODE") + private String dictionaryCode; + + @ApiModelProperty(value = "数据字典名称") + @TableField("DICTIONARY_NAME") + private String dictionaryName; + + @ApiModelProperty(value = "数据字典排序序号") + @TableField("ORDER_NUM") + private BigDecimal orderNum; + + @ApiModelProperty(value = "是否启用（0是，1否）") + @TableField("ENABLE") + private String enable; + + @ApiModelProperty(value = "类型（SEL_OPTION下拉选项，TREE树形结构）") + @TableField("DICTION_TYPE") + private String dictionType; + + @ApiModelProperty(value = "是否有关联类别（0是，1否）") + @TableField("IS_RELATE") + private String isRelate; + + @ApiModelProperty(value = "关联类别ID") + @TableField("RELATE_DIC_ID") + private String relateDicId; + + @TableField("CREATION_USER") + private String creationUser; + + @ApiModelProperty(value = "是否有效") + @TableField("VALID_FLAG") + private String validFlag; + + @ApiModelProperty(value = "创建时间") + @TableField("CREATION_TIME") + private LocalDateTime creationTime; + + @ApiModelProperty(value = "修改时间") + @TableField("MODIFY_TIME") + private LocalDateTime modifyTime; + + @ApiModelProperty(value = "是否可编辑数据") + @TableField("IS_EDIT_DATA") + private String isEditData; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/entity/TsSearchMenu.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/entity/TsSearchMenu.java new file mode 100644 index 00000000..de5b50fa --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/entity/TsSearchMenu.java @@ -0,0 +1,20 @@ +package com.adc.da.slrs.tsDictionaryType.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class TsSearchMenu { + + private String dicId; + + private String dictionaryName; + + private String dictionaryCode; + + public List menuTypes; + +} \ No newline at end of file diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/service/ITsDicTypeService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/service/ITsDicTypeService.java new file mode 100644 index 00000000..31e5f3d3 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/service/ITsDicTypeService.java @@ -0,0 +1,21 @@ +package com.adc.da.slrs.tsDictionaryType.service; + +import com.adc.da.slrs.tsDictionaryType.entity.TsDicType; +import com.adc.da.slrs.tsDictionaryType.entity.TsSearchMenu; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author zyl + * @since 2021-06-28 + */ +public interface ITsDicTypeService extends IService { + + public List getSearchMenu(); + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/service/ITsDictionaryService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/service/ITsDictionaryService.java new file mode 100644 index 00000000..399eeefa --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/service/ITsDictionaryService.java @@ -0,0 +1,16 @@ +package com.adc.da.slrs.tsDictionaryType.service; + +import com.adc.da.slrs.tsDictionaryType.entity.TsDictionary; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author zyl + * @since 2021-06-28 + */ +public interface ITsDictionaryService extends IService { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/service/impl/TsDicTypeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/service/impl/TsDicTypeServiceImpl.java new file mode 100644 index 00000000..7870f248 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/service/impl/TsDicTypeServiceImpl.java @@ -0,0 +1,27 @@ +package com.adc.da.slrs.tsDictionaryType.service.impl; + +import com.adc.da.slrs.tsDictionaryType.entity.TsDicType; +import com.adc.da.slrs.tsDictionaryType.dao.TsDicTypeDao; +import com.adc.da.slrs.tsDictionaryType.entity.TsSearchMenu; +import com.adc.da.slrs.tsDictionaryType.service.ITsDicTypeService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 服务实现类 + *

+ * + * @author zyl + * @since 2021-06-28 + */ +@Service +public class TsDicTypeServiceImpl extends ServiceImpl implements ITsDicTypeService { + + @Override + public List getSearchMenu() { + return getBaseMapper().getSearchMenu(); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/service/impl/TsDictionaryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/service/impl/TsDictionaryServiceImpl.java new file mode 100644 index 00000000..099b50a9 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/service/impl/TsDictionaryServiceImpl.java @@ -0,0 +1,20 @@ +package com.adc.da.slrs.tsDictionaryType.service.impl; + +import com.adc.da.slrs.tsDictionaryType.entity.TsDictionary; +import com.adc.da.slrs.tsDictionaryType.dao.TsDictionaryDao; +import com.adc.da.slrs.tsDictionaryType.service.ITsDictionaryService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author zyl + * @since 2021-06-28 + */ +@Service +public class TsDictionaryServiceImpl extends ServiceImpl implements ITsDictionaryService { + +} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/tsDictionaryType/TsDicTypeMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/tsDictionaryType/TsDicTypeMapper.xml new file mode 100644 index 00000000..4f7e14b7 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/tsDictionaryType/TsDicTypeMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/tsDictionaryType/TsDictionaryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/tsDictionaryType/TsDictionaryMapper.xml new file mode 100644 index 00000000..b833a3d4 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/tsDictionaryType/TsDictionaryMapper.xml @@ -0,0 +1,5 @@ + + + + +