From 7441edd0a36eb1797d11579a8ae019553d2e8290 Mon Sep 17 00:00:00 2001 From: yuanwei Date: Tue, 9 Jan 2024 15:25:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=99=A8=E6=A2=B0?= =?UTF-8?q?=E5=85=AC=E5=91=8A=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/anno/AnncmntDevController.java | 128 ++++++++++ .../auth/SysCustomConfigController.java | 225 ++++++++++++++++++ .../auth/SysCustomConfigDetailController.java | 115 +++++++++ .../glxp/api/dao/auth/SysCustomConfigDao.java | 26 ++ .../dao/auth/SysCustomConfigDetailDao.java | 28 +++ .../auth/SysCustomConfigDetailEntity.java | 188 +++++++++++++++ .../entity/auth/SysCustomConfigEntity.java | 49 ++++ .../api/req/anno/AnncmntDevEntityRequest.java | 136 +++++++++++ .../auth/SysCustomConfigDetailRequest.java | 12 + .../api/req/auth/SysCustomConfigRequest.java | 13 + .../SysCustomConfigFromDetailResponse.java | 12 + .../api/res/auth/SysCustomConfigResponse.java | 18 ++ .../auth/ISysCustomConfigDetailService.java | 23 ++ .../service/auth/ISysCustomConfigService.java | 21 ++ .../SysCustomConfigDetailServiceImpl.java | 52 ++++ .../auth/impl/SysCustomConfigServiceImpl.java | 56 +++++ .../mapper/auth/SysCustomConfigDao.xml | 64 +++++ .../mapper/auth/SysCustomConfigDetailDao.xml | 133 +++++++++++ 18 files changed, 1299 insertions(+) create mode 100644 src/main/java/com/glxp/api/controller/anno/AnncmntDevController.java create mode 100644 src/main/java/com/glxp/api/controller/auth/SysCustomConfigController.java create mode 100644 src/main/java/com/glxp/api/controller/auth/SysCustomConfigDetailController.java create mode 100644 src/main/java/com/glxp/api/dao/auth/SysCustomConfigDao.java create mode 100644 src/main/java/com/glxp/api/dao/auth/SysCustomConfigDetailDao.java create mode 100644 src/main/java/com/glxp/api/entity/auth/SysCustomConfigDetailEntity.java create mode 100644 src/main/java/com/glxp/api/entity/auth/SysCustomConfigEntity.java create mode 100644 src/main/java/com/glxp/api/req/anno/AnncmntDevEntityRequest.java create mode 100644 src/main/java/com/glxp/api/req/auth/SysCustomConfigDetailRequest.java create mode 100644 src/main/java/com/glxp/api/req/auth/SysCustomConfigRequest.java create mode 100644 src/main/java/com/glxp/api/res/auth/SysCustomConfigFromDetailResponse.java create mode 100644 src/main/java/com/glxp/api/res/auth/SysCustomConfigResponse.java create mode 100644 src/main/java/com/glxp/api/service/auth/ISysCustomConfigDetailService.java create mode 100644 src/main/java/com/glxp/api/service/auth/ISysCustomConfigService.java create mode 100644 src/main/java/com/glxp/api/service/auth/impl/SysCustomConfigDetailServiceImpl.java create mode 100644 src/main/java/com/glxp/api/service/auth/impl/SysCustomConfigServiceImpl.java create mode 100644 src/main/resources/mybatis/mapper/auth/SysCustomConfigDao.xml create mode 100644 src/main/resources/mybatis/mapper/auth/SysCustomConfigDetailDao.xml diff --git a/src/main/java/com/glxp/api/controller/anno/AnncmntDevController.java b/src/main/java/com/glxp/api/controller/anno/AnncmntDevController.java new file mode 100644 index 0000000..29ddcd5 --- /dev/null +++ b/src/main/java/com/glxp/api/controller/anno/AnncmntDevController.java @@ -0,0 +1,128 @@ +package com.glxp.api.controller.anno; + + +import cn.hutool.core.lang.func.Func; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; +import com.glxp.api.controller.BaseController; +import com.glxp.api.entity.anno.AnncmntDevEntity; +import com.glxp.api.entity.auth.SysCustomConfigDetailEntity; +import com.glxp.api.req.anno.AnncmntDevEntityRequest; +import com.glxp.api.req.auth.SysCustomConfigDetailRequest; +import com.glxp.api.req.system.DeleteRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.anno.AnncmntDevService; +import com.glxp.api.util.BeanCopyUtils; +import com.glxp.api.util.StringUtils; +import lombok.RequiredArgsConstructor; +import org.apache.poi.ss.formula.functions.T; +import org.springframework.validation.BindingResult; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import javax.validation.Valid; +import java.util.List; + +/** + * 用户信息 + * + */ +@ApiIgnore +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/anno/anncmnt/dev") +public class AnncmntDevController extends BaseController { + + private final AnncmntDevService anncmntDevService; + + + @GetMapping("/list") + public BaseResponse list(AnncmntDevEntityRequest request, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + IPage page = new Page(request.getPage(),request.getLimit()); + IPage pages = anncmntDevService.page(page, getQueryWrapper(request)); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pages.getTotal()); + pageSimpleResponse.setList(pages.getRecords()); + + return ResultVOUtils.success(pageSimpleResponse); + } + + @AuthRuleAnnotation("") + @PostMapping("/save") + @Log(title = "器械公告管理", businessType = BusinessType.INSERT) + public BaseResponse save(@RequestBody AnncmntDevEntity entity, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + boolean b = anncmntDevService.save(entity); + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + return ResultVOUtils.success("添加成功！"); + } + + @AuthRuleAnnotation("") + @PostMapping("/edit") + @Log(title = "器械公告管理", businessType = BusinessType.UPDATE) + public BaseResponse edit(@RequestBody @Valid AnncmntDevEntity entity, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + if (entity.getId() == null) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + AnncmntDevEntity originEntity = anncmntDevService.getById(entity.getId()); + if (originEntity == null) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + boolean b = anncmntDevService.updateById(entity); + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + + return ResultVOUtils.success("修改成功！"); + + + } + + @AuthRuleAnnotation("") + @PostMapping("/delete") + @Log(title = "器械公告管理", businessType = BusinessType.DELETE) + public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) { + + if (StringUtils.isEmpty(deleteRequest.getId())) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + boolean b = anncmntDevService.removeById(deleteRequest.getId()); + + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + return ResultVOUtils.success(); + } + + public static QueryWrapper getQueryWrapper(AnncmntDevEntityRequest request) { + AnncmntDevEntity entity = new AnncmntDevEntity(); + BeanCopyUtils.copy(request, entity); + return new QueryWrapper(entity); + } + +} diff --git a/src/main/java/com/glxp/api/controller/auth/SysCustomConfigController.java b/src/main/java/com/glxp/api/controller/auth/SysCustomConfigController.java new file mode 100644 index 0000000..dda1160 --- /dev/null +++ b/src/main/java/com/glxp/api/controller/auth/SysCustomConfigController.java @@ -0,0 +1,225 @@ +package com.glxp.api.controller.auth; + + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.beust.jcommander.internal.Lists; +import com.beust.jcommander.internal.Maps; +import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; +import com.glxp.api.controller.BaseController; +import com.glxp.api.entity.auth.SysCustomConfigDetailEntity; +import com.glxp.api.entity.auth.SysCustomConfigEntity; +import com.glxp.api.req.auth.SysCustomConfigDetailRequest; +import com.glxp.api.req.auth.SysCustomConfigRequest; +import com.glxp.api.req.system.DeleteRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.auth.SysCustomConfigFromDetailResponse; +import com.glxp.api.res.auth.SysCustomConfigResponse; +import com.glxp.api.service.auth.ISysCustomConfigDetailService; +import com.glxp.api.service.auth.ISysCustomConfigService; +import com.glxp.api.util.StringUtils; +import lombok.RequiredArgsConstructor; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.validation.BindingResult; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import javax.validation.Valid; +import java.util.*; +import java.util.stream.Collectors; + +/** + * 用户信息 + * + */ +@ApiIgnore +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/system/custom/config") +public class SysCustomConfigController extends BaseController { + + private final ISysCustomConfigService sysCustomConfigService; + + private final ISysCustomConfigDetailService sysCustomConfigDetailService; + + @GetMapping("/list") + public BaseResponse list(SysCustomConfigRequest request, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List list = sysCustomConfigService.filterSysCustomConfig(request); + PageInfo authAdminPageInfo = new PageInfo<>(list); + PageSimpleResponse authAdminPageSimpleResponse = new PageSimpleResponse<>(); + authAdminPageSimpleResponse.setTotal(authAdminPageInfo.getTotal()); + authAdminPageSimpleResponse.setList(list); + + return ResultVOUtils.success(authAdminPageSimpleResponse); + } + + @AuthRuleAnnotation("") + @PostMapping("/save") + @Log(title = "界面配置管理", businessType = BusinessType.INSERT) + public BaseResponse save(@RequestBody SysCustomConfigEntity entity, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + boolean b = sysCustomConfigService.insertSysCustomConfig(entity); + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + return ResultVOUtils.success("添加成功！"); + } + + @AuthRuleAnnotation("") + @PostMapping("/edit") + @Log(title = "界面配置管理", businessType = BusinessType.UPDATE) + public BaseResponse edit(@RequestBody @Valid SysCustomConfigEntity entity, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + if (entity.getId() == null) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + SysCustomConfigEntity originEntity = sysCustomConfigService.selectById(entity.getId()); + if (originEntity == null) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + boolean b = sysCustomConfigService.updateSysCustomConfig(entity); + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + + return ResultVOUtils.success("修改成功！"); + + + } + + @AuthRuleAnnotation("") + @PostMapping("/delete") + @Log(title = "界面配置管理", businessType = BusinessType.DELETE) + public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) { + + if (StringUtils.isEmpty(deleteRequest.getId())) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + boolean b = sysCustomConfigService.deleteById(deleteRequest.getId()); + sysCustomConfigDetailService.deleteByConfigId(deleteRequest.getId()); + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + return ResultVOUtils.success(); + } + + + @AuthRuleAnnotation("") + @PostMapping("/getConfigs") + @Log(title = "界面配置管理") + public BaseResponse getConfigs(@RequestBody SysCustomConfigRequest request,BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List list = sysCustomConfigService.filterSysCustomConfig(request); + if (CollectionUtil.isEmpty(list)) { + return ResultVOUtils.error(ResultEnum.DATA_NOT); + } + SysCustomConfigEntity sysCustomConfigEntity = list.get(0); + SysCustomConfigDetailRequest detailRequest = new SysCustomConfigDetailRequest(); + detailRequest.setConfigId(sysCustomConfigEntity.getId().toString()); + detailRequest.setIsShow("1"); +// detailRequest.setType(request.getType()); + List detailList = sysCustomConfigDetailService.filterSysCustomConfigDetail(detailRequest); + Map> map = detailList.stream().collect( + Collectors.groupingBy(SysCustomConfigDetailEntity::getType)); + List tableList = map.get("1") == null? Lists.newArrayList():map.get("1"); + List queryList = map.get("2") == null? Lists.newArrayList():map.get("2"); + List fromList = map.get("3") == null? Lists.newArrayList():map.get("3"); + + List fromSortList = fromList.stream().sorted(Comparator.comparing(SysCustomConfigDetailEntity::getLineNumber)).collect(Collectors.toList()); + + Map> fromMap = fromSortList.stream().collect( + Collectors.groupingBy(SysCustomConfigDetailEntity::getLineNumber,LinkedHashMap::new,Collectors.toList())); + List fromDetailList = Lists.newArrayList(); + for (Map.Entry> entry : fromMap.entrySet()) { + SysCustomConfigFromDetailResponse sysCustomConfigFromDetailResponse = new SysCustomConfigFromDetailResponse(); + sysCustomConfigFromDetailResponse.setNumber(entry.getKey()); + List entities = entry.getValue(); + entities.stream().forEach(s->{ + if(StringUtils.isNotEmpty(s.getCheckRules())){ + String replacedJsonString = s.getCheckRules().replaceAll("(\\w+)(\\s*:\\s*)", "\"$1\"$2"); + JSONArray object = JSONArray.parseArray(replacedJsonString); + s.setCheckRulesObj(object); + } + if(StringUtils.isNotEmpty(s.getLableRule())){ + JSONObject objectLaber = JSONObject.parseObject(s.getLableRule()); + List mapList = Lists.newArrayList(); + Iterator it = objectLaber.keySet().iterator(); + String inputType = s.getInputType(); + while(it.hasNext()) { + Map mapTemp = Maps.newHashMap(); + String key = (String) it.next(); + String value = objectLaber.getString(key); + mapTemp.put("label", value); + if("number".equals(inputType)){ + mapTemp.put("value", Integer.parseInt(key)); + }else{ + mapTemp.put("value", key); + } + mapList.add(mapTemp); + } + s.setLableRuleObj(mapList); + } + }); + sysCustomConfigFromDetailResponse.setList(entities); + fromDetailList.add(sysCustomConfigFromDetailResponse); + } + + tableList.stream().forEach(s->{ + if(StringUtils.isNotEmpty(s.getLableRule())) { + JSONObject objectLaber = JSONObject.parseObject(s.getLableRule()); + s.setLableRuleObj(objectLaber); + } + if(StringUtils.isNotEmpty(s.getButtonRule())){ + JSONArray objectButton = JSONArray.parseArray(s.getButtonRule()); + s.setButtonRulObj(objectButton); + } + }); + queryList.stream().forEach(s->{ + if(StringUtils.isNotEmpty(s.getLableRule())){ + JSONObject objectLaber = JSONObject.parseObject(s.getLableRule()); + List mapList = Lists.newArrayList(); + Iterator it = objectLaber.keySet().iterator(); + while(it.hasNext()) { + Map mapTemp = Maps.newHashMap(); + String key = (String) it.next(); + String value = objectLaber.getString(key); + mapTemp.put("label", value); + mapTemp.put("value", key); + mapList.add(mapTemp); + } + s.setLableRuleObj(mapList); + } + }); + SysCustomConfigResponse sysCustomConfigResponse = new SysCustomConfigResponse(); + BeanUtil.copyProperties(sysCustomConfigEntity, sysCustomConfigResponse); + sysCustomConfigResponse.setTableList(tableList); + sysCustomConfigResponse.setQueryList(queryList); + sysCustomConfigResponse.setFromList(fromDetailList); + return ResultVOUtils.success(sysCustomConfigResponse); + } +} diff --git a/src/main/java/com/glxp/api/controller/auth/SysCustomConfigDetailController.java b/src/main/java/com/glxp/api/controller/auth/SysCustomConfigDetailController.java new file mode 100644 index 0000000..5c884b5 --- /dev/null +++ b/src/main/java/com/glxp/api/controller/auth/SysCustomConfigDetailController.java @@ -0,0 +1,115 @@ +package com.glxp.api.controller.auth; + + +import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; +import com.glxp.api.controller.BaseController; +import com.glxp.api.entity.auth.SysCustomConfigDetailEntity; +import com.glxp.api.req.auth.SysCustomConfigDetailRequest; +import com.glxp.api.req.system.DeleteRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.auth.ISysCustomConfigDetailService; +import com.glxp.api.util.StringUtils; +import lombok.RequiredArgsConstructor; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.validation.BindingResult; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import javax.validation.Valid; +import java.util.List; + +/** + * 用户信息 + * + */ +@ApiIgnore +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/system/custom/configDetail") +public class SysCustomConfigDetailController extends BaseController { + + private final ISysCustomConfigDetailService sysCustomConfigDetailService; + + + @GetMapping("/list") + public BaseResponse list(SysCustomConfigDetailRequest request, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List list = sysCustomConfigDetailService.filterSysCustomConfigDetail(request); + PageInfo authAdminPageInfo = new PageInfo<>(list); + PageSimpleResponse authAdminPageSimpleResponse = new PageSimpleResponse<>(); + authAdminPageSimpleResponse.setTotal(authAdminPageInfo.getTotal()); + authAdminPageSimpleResponse.setList(list); + + return ResultVOUtils.success(authAdminPageSimpleResponse); + } + + @AuthRuleAnnotation("") + @PostMapping("/save") + @Log(title = "界面配置管理", businessType = BusinessType.INSERT) + public BaseResponse save(@RequestBody SysCustomConfigDetailEntity entity, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + boolean b = sysCustomConfigDetailService.insertSysCustomConfigDetail(entity); + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + return ResultVOUtils.success("添加成功！"); + } + + @AuthRuleAnnotation("") + @PostMapping("/edit") + @Log(title = "界面配置管理", businessType = BusinessType.UPDATE) + public BaseResponse edit(@RequestBody @Valid SysCustomConfigDetailEntity entity, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + if (entity.getId() == null) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + SysCustomConfigDetailEntity originEntity = sysCustomConfigDetailService.selectById(entity.getId()); + if (originEntity == null) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + boolean b = sysCustomConfigDetailService.updateSysCustomConfigDetail(entity); + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + + return ResultVOUtils.success("修改成功！"); + + + } + + @AuthRuleAnnotation("") + @PostMapping("/delete") + @Log(title = "界面配置管理", businessType = BusinessType.DELETE) + public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) { + + if (StringUtils.isEmpty(deleteRequest.getId())) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + boolean b = sysCustomConfigDetailService.deleteById(deleteRequest.getId()); + + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + return ResultVOUtils.success(); + } + +} diff --git a/src/main/java/com/glxp/api/dao/auth/SysCustomConfigDao.java b/src/main/java/com/glxp/api/dao/auth/SysCustomConfigDao.java new file mode 100644 index 0000000..9b22251 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/auth/SysCustomConfigDao.java @@ -0,0 +1,26 @@ +package com.glxp.api.dao.auth; + + +import com.glxp.api.entity.auth.SysCustomConfigEntity; +import com.glxp.api.req.auth.SysCustomConfigRequest; +import com.glxp.api.req.system.DeleteRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface SysCustomConfigDao { + + List filterSysCustomConfig(SysCustomConfigRequest request); + + boolean insertSysCustomConfig(SysCustomConfigEntity entity); + + boolean updateSysCustomConfig(SysCustomConfigEntity entity); + + boolean deleteById(String id); + + SysCustomConfigEntity selectById(Long id); + + boolean deleteContact(DeleteRequest request); + +} diff --git a/src/main/java/com/glxp/api/dao/auth/SysCustomConfigDetailDao.java b/src/main/java/com/glxp/api/dao/auth/SysCustomConfigDetailDao.java new file mode 100644 index 0000000..ec55c38 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/auth/SysCustomConfigDetailDao.java @@ -0,0 +1,28 @@ +package com.glxp.api.dao.auth; + + +import com.glxp.api.entity.auth.SysCustomConfigDetailEntity; +import com.glxp.api.req.auth.SysCustomConfigDetailRequest; +import com.glxp.api.req.system.DeleteRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface SysCustomConfigDetailDao { + + List filterSysCustomConfigDetail(SysCustomConfigDetailRequest request); + + boolean insertSysCustomConfigDetail(SysCustomConfigDetailEntity entity); + + boolean updateSysCustomConfigDetail(SysCustomConfigDetailEntity entity); + + boolean deleteById(String id); + + boolean deleteByConfigId(String id); + + SysCustomConfigDetailEntity selectById(Long id); + + boolean deleteContact(DeleteRequest request); + +} diff --git a/src/main/java/com/glxp/api/entity/auth/SysCustomConfigDetailEntity.java b/src/main/java/com/glxp/api/entity/auth/SysCustomConfigDetailEntity.java new file mode 100644 index 0000000..93d9887 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/auth/SysCustomConfigDetailEntity.java @@ -0,0 +1,188 @@ +package com.glxp.api.entity.auth; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +/** + *

+ * + *

+ * + * @author 作者 + * @since 2023-02-07 + */ +@TableName("sys_custom_config_detail") +@Data +public class SysCustomConfigDetailEntity { + + + @TableId(value = "id", type = IdType.INPUT) + private Long id; + + /** + * 配置id + */ + @TableField("configId") + private Long configId; + /** + * 类型 1列表 2表单 3查询框 + */ + @TableField("type") + private String type; + + /** + * 是否显示 1显示 2隐藏 + */ + @TableField("isShow") + private String isShow; + + /** + * 列名 + */ + @TableField("columnName") + private String columnName; + + /** + * 列描述 + */ + @TableField("columnDesc") + private String columnDesc; + /** + * 列类型 + */ + @TableField("columnType") + private String columnType; + + /** + * 颜色规则 + */ + @TableField("colorRule") + private String colorRule; + + /** + * 字段替换规则 + */ + @TableField("lableRule") + private String lableRule; + + /** + * 字段替换规则 + */ + @TableField(exist = false) + private Object lableRuleObj; + + /** + * 按钮规则 + */ + @TableField("buttonRule") + private String buttonRule; + + /** + * 按钮规则 + */ + @TableField(exist = false) + private Object buttonRulObj; + + + /** + * 宽度 + */ + @TableField("width") + private Integer width; + + /** + * 是否排序 + */ + @TableField("sort") + private Boolean sort; + + + /** + * 是否缩略 + */ + @TableField("tooltip") + private Boolean tooltip; + + + /** + * 排序 + */ + @TableField("number") + private Integer number; + + + /** + * 行号 + */ + @TableField("lineNumber") + private Integer lineNumber; + + /** + * 点击事件 + */ + @TableField("clickFuc") + private String clickFuc; + + /** + * 禁用方法 + */ + @TableField("禁用方法") + private String disabledFuc; + + + /** + * eval表达式 + */ + @TableField("eval表达式") + private String expression; + + /** + * 大小 + */ + @TableField("size") + private String size; + + /** + * 样式 + */ + @TableField("style") + private String style; + + /** + * 是否禁用 + */ + @TableField("disabled") + private Boolean disabled; + + /** + * 验证规则 + */ + @TableField("checkRules") + private String checkRules; + /** + * 验证规则 + */ + @TableField(exist = false) + private Object checkRulesObj; + + /** + * input类型 + */ + @TableField("inputType") + private String inputType; + + /** + * 获取数据方法 + */ + @TableField("dataFuc") + private String dataFuc; + + /** + * 是否展示详细 1是 2否 + */ + @TableField("isShowXx") + private String isShowXx; +} diff --git a/src/main/java/com/glxp/api/entity/auth/SysCustomConfigEntity.java b/src/main/java/com/glxp/api/entity/auth/SysCustomConfigEntity.java new file mode 100644 index 0000000..0f9afde --- /dev/null +++ b/src/main/java/com/glxp/api/entity/auth/SysCustomConfigEntity.java @@ -0,0 +1,49 @@ +package com.glxp.api.entity.auth; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +/** + *

+ * + *

+ * + * @author 作者 + * @since 2023-02-07 + */ +@TableName("sys_custom_config") +@Data +public class SysCustomConfigEntity { + + + @TableId(value = "id", type = IdType.INPUT) + private Long id; + + /** + * 业务标识 + */ + @TableField("businessType") + private String businessType; + + /** + * 描述 + */ + @TableField("remark") + private String remark; + + /** + * 类型 1列表 2表单 + */ + @TableField("type") + private String type; + + /** + * 列表点击方法 + */ + @TableField("handleChangeFuc") + private String handleChangeFuc; + +} diff --git a/src/main/java/com/glxp/api/req/anno/AnncmntDevEntityRequest.java b/src/main/java/com/glxp/api/req/anno/AnncmntDevEntityRequest.java new file mode 100644 index 0000000..368a065 --- /dev/null +++ b/src/main/java/com/glxp/api/req/anno/AnncmntDevEntityRequest.java @@ -0,0 +1,136 @@ +package com.glxp.api.req.anno; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +import java.util.Date; + +@Data +public class AnncmntDevEntityRequest extends ListPageRequest { + + /** + * DI标识 + */ + private String nameCode; + + /** + * 产品名称 + */ + private String productName; + + /** + * 产品名称英文名称 + */ + private String enProductName; + + /** + * 注册/备案证号 + */ + private String regCertCode; + + /** + * 规格型号 + */ + private String modelSpec; + + /** + * 批次号 + */ + private String batchNo; + + /** + * 生产日期 + */ + private String productionDate; + + /** + * 失效日期 + */ + private String expireDate; + + /** + * 生产企业名称 + */ + private String manuName; + + /** + * 生产企业统一社会信用号 + */ + private String manuCertCoe; + + /** + * 生产企业英文名称 + */ + private String enManuName; + + /** + * 代理人代理企业名称 + */ + private String agentName; + + /** + * 代理人统一社会信用号 + */ + private String agentCertCode; + + /** + * 公告类型：1：注销注册证公告；2：暂停进口、经营和使用公告；3：项目整改/停产整改公告；4.注销生产许可证公告；5：产品召回公告 + */ + private String annType; + + /** + * 公告内容 + */ + private String annContent; + + /** + * 检查异常信息 + */ + private String errContent; + + /** + * 检查方式：1：远程非现场检查；2：监督抽检；3：飞行检查 + */ + private String checkType; + + /** + * 公告来源名称 + */ + private String sourceName; + + /** + * 公告来源地址 + */ + private String sourceUrl; + + /** + * 公告发布索引号 + */ + private String publicCode; + + /** + * 发布标题 + */ + private String publicTitle; + + /** + * 发布主题分类 + */ + private String publicSubject; + + /** + * 公告发布人（ex:国家药监局组织) + */ + private String publicName; + + /** + * 公告发布时间 + */ + private String publicTime; + + /** + * 备注 + */ + private String remark; +} diff --git a/src/main/java/com/glxp/api/req/auth/SysCustomConfigDetailRequest.java b/src/main/java/com/glxp/api/req/auth/SysCustomConfigDetailRequest.java new file mode 100644 index 0000000..8e134cb --- /dev/null +++ b/src/main/java/com/glxp/api/req/auth/SysCustomConfigDetailRequest.java @@ -0,0 +1,12 @@ +package com.glxp.api.req.auth; + + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +@Data +public class SysCustomConfigDetailRequest extends ListPageRequest { + private String configId; + private String type; + private String isShow; +} diff --git a/src/main/java/com/glxp/api/req/auth/SysCustomConfigRequest.java b/src/main/java/com/glxp/api/req/auth/SysCustomConfigRequest.java new file mode 100644 index 0000000..7abae6e --- /dev/null +++ b/src/main/java/com/glxp/api/req/auth/SysCustomConfigRequest.java @@ -0,0 +1,13 @@ +package com.glxp.api.req.auth; + + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +@Data +public class SysCustomConfigRequest extends ListPageRequest { + private String businessType; + + private String remark; + private String type; +} diff --git a/src/main/java/com/glxp/api/res/auth/SysCustomConfigFromDetailResponse.java b/src/main/java/com/glxp/api/res/auth/SysCustomConfigFromDetailResponse.java new file mode 100644 index 0000000..dcfe40c --- /dev/null +++ b/src/main/java/com/glxp/api/res/auth/SysCustomConfigFromDetailResponse.java @@ -0,0 +1,12 @@ +package com.glxp.api.res.auth; + +import com.glxp.api.entity.auth.SysCustomConfigDetailEntity; +import lombok.Data; + +import java.util.List; + +@Data +public class SysCustomConfigFromDetailResponse { + Integer number; + List list; +} diff --git a/src/main/java/com/glxp/api/res/auth/SysCustomConfigResponse.java b/src/main/java/com/glxp/api/res/auth/SysCustomConfigResponse.java new file mode 100644 index 0000000..fcf2fa5 --- /dev/null +++ b/src/main/java/com/glxp/api/res/auth/SysCustomConfigResponse.java @@ -0,0 +1,18 @@ +package com.glxp.api.res.auth; + +import com.glxp.api.entity.auth.SysCustomConfigDetailEntity; +import com.glxp.api.entity.auth.SysCustomConfigEntity; +import lombok.Data; + +import java.util.List; + +@Data +public class SysCustomConfigResponse extends SysCustomConfigEntity{ + + List tableList; + + List queryList; + + List fromList; + +} diff --git a/src/main/java/com/glxp/api/service/auth/ISysCustomConfigDetailService.java b/src/main/java/com/glxp/api/service/auth/ISysCustomConfigDetailService.java new file mode 100644 index 0000000..4c6592f --- /dev/null +++ b/src/main/java/com/glxp/api/service/auth/ISysCustomConfigDetailService.java @@ -0,0 +1,23 @@ +package com.glxp.api.service.auth; + +import com.glxp.api.entity.auth.SysCustomConfigDetailEntity; +import com.glxp.api.req.auth.SysCustomConfigDetailRequest; + +import java.util.List; + +public interface ISysCustomConfigDetailService { + + List filterSysCustomConfigDetail(SysCustomConfigDetailRequest request); + + + boolean insertSysCustomConfigDetail(SysCustomConfigDetailEntity entity); + + boolean updateSysCustomConfigDetail(SysCustomConfigDetailEntity entity); + + boolean deleteById(String id); + + boolean deleteByConfigId(String id); + + SysCustomConfigDetailEntity selectById(Long id); + +} diff --git a/src/main/java/com/glxp/api/service/auth/ISysCustomConfigService.java b/src/main/java/com/glxp/api/service/auth/ISysCustomConfigService.java new file mode 100644 index 0000000..5298c14 --- /dev/null +++ b/src/main/java/com/glxp/api/service/auth/ISysCustomConfigService.java @@ -0,0 +1,21 @@ +package com.glxp.api.service.auth; + +import com.glxp.api.entity.auth.SysCustomConfigEntity; +import com.glxp.api.req.auth.SysCustomConfigRequest; + +import java.util.List; + +public interface ISysCustomConfigService { + + List filterSysCustomConfig(SysCustomConfigRequest request); + + + boolean insertSysCustomConfig(SysCustomConfigEntity entity); + + boolean updateSysCustomConfig(SysCustomConfigEntity entity); + + boolean deleteById(String id); + + SysCustomConfigEntity selectById(Long id); + +} diff --git a/src/main/java/com/glxp/api/service/auth/impl/SysCustomConfigDetailServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/SysCustomConfigDetailServiceImpl.java new file mode 100644 index 0000000..afbc4da --- /dev/null +++ b/src/main/java/com/glxp/api/service/auth/impl/SysCustomConfigDetailServiceImpl.java @@ -0,0 +1,52 @@ +package com.glxp.api.service.auth.impl; + +import com.glxp.api.dao.auth.SysCustomConfigDetailDao; +import com.glxp.api.entity.auth.SysCustomConfigDetailEntity; +import com.glxp.api.req.auth.SysCustomConfigDetailRequest; +import com.glxp.api.service.auth.ISysCustomConfigDetailService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; + +@Service +@Transactional(rollbackFor = Exception.class) +public class SysCustomConfigDetailServiceImpl implements ISysCustomConfigDetailService { + + + @Resource + private SysCustomConfigDetailDao sysCustomConfigDetailDao; + + + @Override + public List filterSysCustomConfigDetail(SysCustomConfigDetailRequest request) { + return sysCustomConfigDetailDao.filterSysCustomConfigDetail(request); + } + + @Override + public boolean insertSysCustomConfigDetail(SysCustomConfigDetailEntity entity) { + return sysCustomConfigDetailDao.insertSysCustomConfigDetail(entity); + } + + @Override + public boolean updateSysCustomConfigDetail(SysCustomConfigDetailEntity entity) { + return sysCustomConfigDetailDao.updateSysCustomConfigDetail(entity); + } + + + @Override + public boolean deleteById(String id) { + return sysCustomConfigDetailDao.deleteById(id); + } + + @Override + public boolean deleteByConfigId(String id) { + return sysCustomConfigDetailDao.deleteByConfigId(id); + } + + @Override + public SysCustomConfigDetailEntity selectById(Long id) { + return sysCustomConfigDetailDao.selectById(id); + } +} diff --git a/src/main/java/com/glxp/api/service/auth/impl/SysCustomConfigServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/SysCustomConfigServiceImpl.java new file mode 100644 index 0000000..bc1ac48 --- /dev/null +++ b/src/main/java/com/glxp/api/service/auth/impl/SysCustomConfigServiceImpl.java @@ -0,0 +1,56 @@ +package com.glxp.api.service.auth.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.auth.SysCustomConfigDao; +import com.glxp.api.entity.auth.SysCustomConfigEntity; +import com.glxp.api.req.auth.SysCustomConfigRequest; +import com.glxp.api.service.auth.ISysCustomConfigService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +@Transactional(rollbackFor = Exception.class) +public class SysCustomConfigServiceImpl implements ISysCustomConfigService { + + + @Resource + private SysCustomConfigDao sysCustomConfigDao; + + + @Override + public List filterSysCustomConfig(SysCustomConfigRequest request) { + if (request == null) { + return Collections.emptyList(); + } + if (request.getPage() != null) { + int offset = (request.getPage() - 1) * request.getLimit(); + PageHelper.offsetPage(offset, request.getLimit()); + } + return sysCustomConfigDao.filterSysCustomConfig(request); + } + + @Override + public boolean insertSysCustomConfig(SysCustomConfigEntity entity) { + return sysCustomConfigDao.insertSysCustomConfig(entity); + } + + @Override + public boolean updateSysCustomConfig(SysCustomConfigEntity entity) { + return sysCustomConfigDao.updateSysCustomConfig(entity); + } + + + @Override + public boolean deleteById(String id) { + return sysCustomConfigDao.deleteById(id); + } + + @Override + public SysCustomConfigEntity selectById(Long id) { + return sysCustomConfigDao.selectById(id); + } +} diff --git a/src/main/resources/mybatis/mapper/auth/SysCustomConfigDao.xml b/src/main/resources/mybatis/mapper/auth/SysCustomConfigDao.xml new file mode 100644 index 0000000..ec84e51 --- /dev/null +++ b/src/main/resources/mybatis/mapper/auth/SysCustomConfigDao.xml @@ -0,0 +1,64 @@ + + + + + + + + + INSERT INTO sys_custom_config + (id,remark, businessType,type,handleChangeFuc) + values (#{id},#{remark}, #{businessType},#{type},#{handleChangeFuc}) + + + + UPDATE sys_custom_config + + + businessType=#{businessType}, + + + remark=#{remark}, + + + handleChangeFuc=#{handleChangeFuc}, + + + type=#{type}, + + + WHERE id = #{id} + + + + delete + from sys_custom_config + where id = #{id} + + + + + diff --git a/src/main/resources/mybatis/mapper/auth/SysCustomConfigDetailDao.xml b/src/main/resources/mybatis/mapper/auth/SysCustomConfigDetailDao.xml new file mode 100644 index 0000000..9bc006e --- /dev/null +++ b/src/main/resources/mybatis/mapper/auth/SysCustomConfigDetailDao.xml @@ -0,0 +1,133 @@ + + + + + + + + + INSERT INTO sys_custom_config_detail + (id,configId,type,isShow, columnName,columnDesc,columnType,colorRule,sort,lableRule,width,tooltip,buttonRule,number, + clickFuc,disabledFuc,expression,size,style,disabled,checkRules,inputType,lineNumber,dataFuc,isShowXx) + values (#{id},#{configId},#{type},#{isShow}, #{columnName},#{columnDesc},#{columnType},#{colorRule},#{sort}, + #{lableRule},#{width},#{tooltip},#{buttonRule},#{number},#{clickFuc},#{disabledFuc},#{expression},#{size},#{style}, + #{disabled}, #{checkRules}, #{inputType}, #{lineNumber}, #{dataFuc},#{isShowXx}) + + + + UPDATE sys_custom_config_detail + + + columnName=#{columnName}, + + + configId=#{configId}, + + + type=#{type}, + + + isShow=#{isShow}, + + + columnDesc=#{columnDesc}, + + + columnType=#{columnType}, + + + colorRule=#{colorRule}, + + + sort=#{sort}, + + + lableRule=#{lableRule}, + + + width=#{width}, + + + tooltip=#{tooltip}, + + + buttonRule=#{buttonRule}, + + + number=#{number}, + + + clickFuc=#{clickFuc}, + + + disabledFuc=#{disabledFuc}, + + + expression=#{expression}, + + + size=#{size}, + + + style=#{style}, + + + disabled=#{disabled}, + + + checkRules=#{checkRules}, + + + inputType=#{inputType}, + + + lineNumber=#{lineNumber}, + + + dataFuc=#{dataFuc}, + + + isShowXx=#{isShowXx}, + + + WHERE id = #{id} + + + + delete + from sys_custom_config_detail + where id = #{id} + + + + delete + from sys_custom_config_detail + where configId = #{configId} + + + + From f1a7437fa9207000383bd599f2512234295049e5 Mon Sep 17 00:00:00 2001 From: yuanwei Date: Wed, 10 Jan 2024 11:59:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=99=A8=E6=A2=B0?= =?UTF-8?q?=E5=85=AC=E5=91=8A=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/anno/AnncmntDevController.java | 9 ++++++++- .../com/glxp/api/entity/anno/AnncmntDevEntity.java | 4 ++-- .../glxp/api/req/anno/AnncmntDevEntityRequest.java | 14 ++++++++++++-- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/anno/AnncmntDevController.java b/src/main/java/com/glxp/api/controller/anno/AnncmntDevController.java index 29ddcd5..a25a9f3 100644 --- a/src/main/java/com/glxp/api/controller/anno/AnncmntDevController.java +++ b/src/main/java/com/glxp/api/controller/anno/AnncmntDevController.java @@ -122,7 +122,14 @@ public class AnncmntDevController extends BaseController { public static QueryWrapper getQueryWrapper(AnncmntDevEntityRequest request) { AnncmntDevEntity entity = new AnncmntDevEntity(); BeanCopyUtils.copy(request, entity); - return new QueryWrapper(entity); + QueryWrapper queryWrapper = new QueryWrapper(entity); + if(StringUtils.isNotBlank(request.getEndTime())){ + queryWrapper.le("publicTime",request.getEndTime()); + } + if(StringUtils.isNotBlank(request.getStartTime())){ + queryWrapper.ge("publicTime",request.getStartTime()); + } + return queryWrapper; } } diff --git a/src/main/java/com/glxp/api/entity/anno/AnncmntDevEntity.java b/src/main/java/com/glxp/api/entity/anno/AnncmntDevEntity.java index 46b488d..e130a48 100644 --- a/src/main/java/com/glxp/api/entity/anno/AnncmntDevEntity.java +++ b/src/main/java/com/glxp/api/entity/anno/AnncmntDevEntity.java @@ -102,7 +102,7 @@ public class AnncmntDevEntity implements Serializable { * 公告类型：1：注销注册证公告；2：暂停进口、经营和使用公告；3：项目整改/停产整改公告；4.注销生产许可证公告；5：产品召回公告 */ @TableField(value = "annType") - private Byte annType; + private Integer annType; /** * 公告内容 @@ -120,7 +120,7 @@ public class AnncmntDevEntity implements Serializable { * 检查方式：1：远程非现场检查；2：监督抽检；3：飞行检查 */ @TableField(value = "checkType") - private Byte checkType; + private Integer checkType; /** * 公告来源名称 diff --git a/src/main/java/com/glxp/api/req/anno/AnncmntDevEntityRequest.java b/src/main/java/com/glxp/api/req/anno/AnncmntDevEntityRequest.java index 368a065..64f6fd8 100644 --- a/src/main/java/com/glxp/api/req/anno/AnncmntDevEntityRequest.java +++ b/src/main/java/com/glxp/api/req/anno/AnncmntDevEntityRequest.java @@ -77,7 +77,7 @@ public class AnncmntDevEntityRequest extends ListPageRequest { /** * 公告类型：1：注销注册证公告；2：暂停进口、经营和使用公告；3：项目整改/停产整改公告；4.注销生产许可证公告；5：产品召回公告 */ - private String annType; + private Integer annType; /** * 公告内容 @@ -92,7 +92,7 @@ public class AnncmntDevEntityRequest extends ListPageRequest { /** * 检查方式：1：远程非现场检查；2：监督抽检；3：飞行检查 */ - private String checkType; + private Integer checkType; /** * 公告来源名称 @@ -133,4 +133,14 @@ public class AnncmntDevEntityRequest extends ListPageRequest { * 备注 */ private String remark; + + /** + * 开始时间 + */ + private String startTime; + + /** + * 结束时间 + */ + private String endTime; }