From 6d9e0878341226100c86efab50d179efedaf0017 Mon Sep 17 00:00:00 2001 From: tangw Date: Wed, 3 Dec 2025 10:38:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E7=94=9F=E7=89=A9=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/domain/entity/lis/ComConfigDict.java | 31 ++++ .../core/domain/entity/lis/XmTextResult.java | 2 +- .../work/LisWorkGermController.java | 6 + .../xtwh/ComConfigDictController.java | 108 +++++++++++++ .../liswork/mapper/LisWorkGermMapper.java | 1 + .../mapper/xtwh/ComConfigDictMapper.java | 86 ++++++++++ .../liswork/service/ComConfigDictService.java | 90 +++++++++++ .../impl/xtwh/ComConfigDictServiceImpl.java | 149 ++++++++++++++++++ .../resources/mapper/ComConfigDictMapper.xml | 137 ++++++++++++++++ .../resources/mapper/LisWorkGermMapper.xml | 4 + sql/lis8.0/updatedb_lis8.0.sql | 28 ++++ 11 files changed, 641 insertions(+), 1 deletion(-) create mode 100644 lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComConfigDict.java create mode 100644 liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComConfigDictController.java create mode 100644 liswork/src/main/java/com/czlis/liswork/mapper/xtwh/ComConfigDictMapper.java create mode 100644 liswork/src/main/java/com/czlis/liswork/service/ComConfigDictService.java create mode 100644 liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComConfigDictServiceImpl.java create mode 100644 liswork/src/main/resources/mapper/ComConfigDictMapper.xml diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComConfigDict.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComConfigDict.java new file mode 100644 index 0000000..176d498 --- /dev/null +++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComConfigDict.java @@ -0,0 +1,31 @@ +package com.czlis.common.core.domain.entity.lis; + + + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; +@Data +@NoArgsConstructor +@AllArgsConstructor +public class ComConfigDict { + + private Long configId; + private String configType; + private String configCode; + private String configName; + private String configOptiontype; + private String configDefvalue; + private Long configSort; + private String status; + private String createBy; + private Date createTime; + private String updateBy; + private Date updateTime; + private String remark; + + + +} diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmTextResult.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmTextResult.java index f1ae35d..7d79b80 100644 --- a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmTextResult.java +++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmTextResult.java @@ -8,7 +8,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor public class XmTextResult { - private Integer xmid; + private String yq; private String xmdh; private Integer xh; private String textresult; diff --git a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkGermController.java b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkGermController.java index eff9751..29b7bf6 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkGermController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkGermController.java @@ -180,4 +180,10 @@ public class LisWorkGermController extends BaseController { public Result changepatjyrq(Date jyrq, String yq, String ybh) { return lisWorkGermService.changepatjyrq(jyrq, yq, ybh); } + @ApiOperation("获取专家评语字典") + @GetMapping("/getgermtextdict") + public Result getGermTextDict(){ + return new Result("0", "成功！",lisWorkGermMapper.getGermTextDict()); + } + } diff --git a/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComConfigDictController.java b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComConfigDictController.java new file mode 100644 index 0000000..724dd98 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComConfigDictController.java @@ -0,0 +1,108 @@ +package com.czlis.liswork.controller.xtwh; + +import com.czlis.common.annotation.Log; +import com.czlis.common.core.controller.BaseController; +import com.czlis.common.core.domain.AjaxResult; +import com.czlis.common.core.page.TableDataInfo; +import com.czlis.common.enums.BusinessType; +import com.czlis.common.utils.poi.ExcelUtil; +import com.czlis.common.core.domain.entity.lis.ComConfigDict; +import com.czlis.liswork.service.ComConfigDictService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Api(tags = "参数模板设置") +@RestController +@RequestMapping("/configdict") +@Slf4j +public class ComConfigDictController extends BaseController { + @Autowired + private ComConfigDictService ComConfigDictService; + /** + * 获取字典列表 + */ + @ApiOperation("获取字典列表") + @GetMapping("/list") + public TableDataInfo list(ComConfigDict post) { + startPage(); + List list = ComConfigDictService.selectComConfigDictList(post); + return getDataTable(list); + } + @ApiOperation("字典导出") + @Log(title = "字典导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ComConfigDict post) { + List list = ComConfigDictService.selectComConfigDictList(post); + ExcelUtil util = new ExcelUtil<>(ComConfigDict.class); + util.exportExcel(response, list, "字典数据"); + } + + /** + * 根据字典编号获取详细信息 + */ + @ApiOperation("获取详细信息") + @GetMapping(value = "/{dictId}") + public AjaxResult getInfo(@PathVariable Long dictId) { + return success(ComConfigDictService.selectComConfigDictById(dictId)); + } + + /** + * 新增字典 + */ + @ApiOperation("新增字典") + @Log(title = "字典管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@Validated @RequestBody ComConfigDict post) { + log.info("post:{}",post); + + if (!ComConfigDictService.checkDictNameUnique(post)) { + return error("新增字典'" + post.getConfigName() + "'失败，字典名称已存在"); + } else if (!ComConfigDictService.checkDictCodeUnique(post)) { + return error("新增字典'" + post.getConfigName() + "'失败，字典编码已存在"); + } + post.setCreateBy(getUsername()); + return toAjax(ComConfigDictService.insertDict(post)); + } + + /** + * 修改字典 + */ + @ApiOperation("修改字典") + @Log(title = "字典管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@Validated @RequestBody ComConfigDict post) { + if (!ComConfigDictService.checkDictNameUnique(post)) { + return error("修改字典'" + post.getConfigName() + "'失败，字典名称已存在"); + } else if (!ComConfigDictService.checkDictCodeUnique(post)) { + return error("修改字典'" + post.getConfigName() + "'失败，字典编码已存在"); + } + post.setUpdateBy(getUsername()); + return toAjax(ComConfigDictService.updateDict(post)); + } + + /** + * 删除字典 + */ + @ApiOperation("删除字典") + @Log(title = "字典管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{dictIds}") + public AjaxResult remove(@PathVariable Long[] dictIds) { + return toAjax(ComConfigDictService.deleteDictByIds(dictIds)); + } + + /** + * 获取字典选择框列表 + */ + @ApiOperation("获取字典选择框列表") + @GetMapping("/optionselect") + public AjaxResult optionselect() { + List posts = ComConfigDictService.selectComConfigDictAll(); + return success(posts); + } +} diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkGermMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkGermMapper.java index f4d901f..8017625 100644 --- a/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkGermMapper.java +++ b/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkGermMapper.java @@ -30,4 +30,5 @@ public interface LisWorkGermMapper { int updatemediumjyrq(@Param("jyrq") Date jyrq, @Param("yq") String yq, @Param("ybh")String ybh, @Param("jyrq1")Date jyrq1); int changeresultjyrq(@Param("jyrq") Date jyrq, @Param("yq") String yq, @Param("ybh")String ybh, @Param("jyrq1")Date jyrq1); int changepatjyrq(@Param("jyrq") Date jyrq, @Param("yq") String yq, @Param("ybh")String ybh, @Param("jyrq1")Date jyrq1); + List getGermTextDict(); } diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/ComConfigDictMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/ComConfigDictMapper.java new file mode 100644 index 0000000..4afb0c1 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/ComConfigDictMapper.java @@ -0,0 +1,86 @@ +package com.czlis.liswork.mapper.xtwh; + +import com.czlis.common.core.domain.entity.lis.ComConfigDict; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface ComConfigDictMapper { + Long getCountById(Long configId); + List selectComConfigDictByType(String configType); + + /** + * 查询字典数据集合 + * + * @param Dict 字典信息 + * @return 字典数据集合 + */ + List selectComConfigDictList(ComConfigDict Dict); + + /** + * 查询所有字典 + * + * @return 字典列表 + */ + List selectComConfigDictAll(); + + /** + * 通过字典ID查询字典信息 + * + * @param configId 字典ID + * @return 角色对象信息 + */ + ComConfigDict selectComConfigDictById(Long configId); + + + /** + * 删除字典信息 + * + * @param configId 字典ID + * @return 结果 + */ + int delComConfigDictById(Long configId); + + /** + * 批量删除字典信息 + * + * @param DictIds 需要删除的字典ID + * @return 结果 + */ + int delComConfigDictByIds(Long[] DictIds); + + /** + * 修改字典信息 + * + * @param Dict 字典信息 + * @return 结果 + */ + int updateComConfigDict(ComConfigDict Dict); + + /** + * 新增字典信息 + * + * @param Dict 字典信息 + * @return 结果 + */ + int insertComConfigDict(ComConfigDict Dict); + + /** + * 校验字典名称 + * + * @param configName 字典名称 + * @param configType 类别 + * @return 结果 + */ + ComConfigDict checkDictNameUnique(@Param("configName") String configName,@Param("configType") String configType); + + /** + * 校验字典编码 + * + * @param configCode 字典编码 + * @return 结果 + */ + ComConfigDict checkDictCodeUnique(@Param("configCode") String configCode,@Param("configType") String configType); + + +} diff --git a/liswork/src/main/java/com/czlis/liswork/service/ComConfigDictService.java b/liswork/src/main/java/com/czlis/liswork/service/ComConfigDictService.java new file mode 100644 index 0000000..b66d282 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/service/ComConfigDictService.java @@ -0,0 +1,90 @@ +package com.czlis.liswork.service; + +import com.czlis.common.constant.UserConstants; +import com.czlis.common.core.domain.entity.lis.ComConfigDict; +import com.czlis.common.exception.ServiceException; +import com.czlis.common.utils.StringUtils; + +import java.util.List; + +public interface ComConfigDictService { + /** + * 查询字典信息集合 + * + * @param Dict 字典信息 + * @return 字典信息集合 + */ + List selectComConfigDictList(ComConfigDict Dict); + + /** + * 查询所有字典 + * + * @return 字典列表 + */ + List selectComConfigDictAll(); + + /** + * 通过字典ID查询字典信息 + * + * @param DictId 字典ID + * @return 角色对象信息 + */ + ComConfigDict selectComConfigDictById(Long DictId); + + + /** + * 校验字典名称是否唯一 + * + * @param Dict 字典信息 + * @return 结果 + */ + boolean checkDictNameUnique(ComConfigDict Dict); + + /** + * 校验字典编码是否唯一 + * + * @param Dict 字典信息 + * @return 结果 + */ + boolean checkDictCodeUnique(ComConfigDict Dict); + + /** + * 通过字典ID查询字典使用数量 + * + * @param DictId 字典ID + * @return 结果 + */ + int countUserDictById(Long DictId); + + /** + * 删除字典信息 + * + * @param DictId 字典ID + * @return 结果 + */ + int deleteDictById(Long DictId); + + /** + * 批量删除字典信息 + * + * @param DictIds 需要删除的字典ID + * @return 结果 + */ + int deleteDictByIds(Long[] DictIds); + + /** + * 新增保存字典信息 + * + * @param Dict 字典信息 + * @return 结果 + */ + int insertDict(ComConfigDict Dict); + + /** + * 修改保存字典信息 + * + * @param Dict 字典信息 + * @return 结果 + */ + int updateDict(ComConfigDict Dict); +} diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComConfigDictServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComConfigDictServiceImpl.java new file mode 100644 index 0000000..4341cb5 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComConfigDictServiceImpl.java @@ -0,0 +1,149 @@ +package com.czlis.liswork.service.impl.xtwh; + +import com.czlis.common.constant.UserConstants; +import com.czlis.common.core.domain.entity.lis.ComConfigDict; +import com.czlis.common.exception.ServiceException; +import com.czlis.common.utils.StringUtils; +import com.czlis.liswork.mapper.xtwh.ComConfigDictMapper; +import com.czlis.liswork.service.ComConfigDictService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +/** + * 配置参数字典,系统配置菜单依据本字典自动创建配置档 + */ +@Service +@Slf4j +public class ComConfigDictServiceImpl implements ComConfigDictService { + + @Autowired + ComConfigDictMapper comConfigDictMapper; + /** + * 查询字典信息集合 + * + * @param Dict 字典信息 + * @return 字典信息集合 + */ + @Override + public List selectComConfigDictList(ComConfigDict Dict) { + return comConfigDictMapper.selectComConfigDictList(Dict); + } + + /** + * 查询所有字典 + * + * @return 字典列表 + */ + @Override + public List selectComConfigDictAll() { + return comConfigDictMapper.selectComConfigDictAll(); + } + + /** + * 通过字典ID查询字典信息 + * + * @param DictId 字典ID + * @return 角色对象信息 + */ + @Override + public ComConfigDict selectComConfigDictById(Long DictId) { + return comConfigDictMapper.selectComConfigDictById(DictId); + } + + + /** + * 校验字典名称是否唯一 + * + * @param Dict 字典信息 + * @return 结果 + */ + @Override + public boolean checkDictNameUnique(ComConfigDict Dict) { + Long DictId = StringUtils.isNull(Dict.getConfigId()) ? -1L : Dict.getConfigId(); + ComConfigDict info = comConfigDictMapper.checkDictNameUnique(Dict.getConfigName(),Dict.getConfigType()); + if (StringUtils.isNotNull(info) && info.getConfigId().longValue() != DictId.longValue()) { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 校验字典编码是否唯一 + * + * @param Dict 字典信息 + * @return 结果 + */ + @Override + public boolean checkDictCodeUnique(ComConfigDict Dict) { + Long DictId = StringUtils.isNull(Dict.getConfigId()) ? -1L : Dict.getConfigId(); + ComConfigDict info = comConfigDictMapper.checkDictCodeUnique(Dict.getConfigCode(),Dict.getConfigType()); + if (StringUtils.isNotNull(info) && info.getConfigId().longValue() != DictId.longValue()) { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 通过字典ID查询字典使用数量 + * + * @param DictId 字典ID + * @return 结果 + */ + @Override + public int countUserDictById(Long DictId) { + return 0;//comConfigDictMapper.countUserDictById(DictId); + } + + /** + * 删除字典信息 + * + * @param DictId 字典ID + * @return 结果 + */ + @Override + public int deleteDictById(Long DictId) { + return comConfigDictMapper.delComConfigDictById(DictId); + } + + /** + * 批量删除字典信息 + * + * @param DictIds 需要删除的字典ID + * @return 结果 + */ + @Override + public int deleteDictByIds(Long[] DictIds) { + for (Long DictId : DictIds) { + ComConfigDict Dict = selectComConfigDictById(DictId); + if (countUserDictById(DictId) > 0) { + throw new ServiceException(String.format("%1$s已分配,不能删除", Dict.getConfigName())); + } + } + return comConfigDictMapper.delComConfigDictByIds(DictIds); + } + + /** + * 新增保存字典信息 + * + * @param Dict 字典信息 + * @return 结果 + */ + @Override + public int insertDict(ComConfigDict Dict) { + return comConfigDictMapper.insertComConfigDict(Dict); + } + + /** + * 修改保存字典信息 + * + * @param Dict 字典信息 + * @return 结果 + */ + @Override + public int updateDict(ComConfigDict Dict) { + return comConfigDictMapper.updateComConfigDict(Dict); + } + +} diff --git a/liswork/src/main/resources/mapper/ComConfigDictMapper.xml b/liswork/src/main/resources/mapper/ComConfigDictMapper.xml new file mode 100644 index 0000000..bd8f0e1 --- /dev/null +++ b/liswork/src/main/resources/mapper/ComConfigDictMapper.xml @@ -0,0 +1,137 @@ + + + + + + + + + + + + + + + + + + + + select config_id,config_type,config_code,config_name,config_optiontype,config_defvalue,config_sort, + status,create_by,create_time,update_by,update_time,remark from com_config_dict + + + + + + + + + + + + + + insert into com_config_dict( + config_id, + config_type, + config_code, + config_name, + config_optiontype, + config_defvalue, + config_sort, + status, + remark, + create_by, + create_time + )values( + #{configId}, + #{configType}, + #{configCode}, + #{configName}, + #{configOptiontype}, + #{configDefvalue}, + #{configSort}, + #{status}, + #{remark}, + #{createBy}, + getdate() + ) + + + + delete from com_config_dict where config_id = #{configId} + + + + delete from com_config_dict where config_id in + + #{configId} + + + + + update com_config_dict + + config_type = #{configType}, + config_code = #{configCode}, + config_name = #{configName}, + config_optiontype = #{configOptiontype}, + config_defvalue = #{configDefvalue}, + config_sort = #{configSort}, + status = #{status}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = getdate() + + where config_id = #{configId} + + + + \ No newline at end of file diff --git a/liswork/src/main/resources/mapper/LisWorkGermMapper.xml b/liswork/src/main/resources/mapper/LisWorkGermMapper.xml index 49b5bad..af3abb0 100644 --- a/liswork/src/main/resources/mapper/LisWorkGermMapper.xml +++ b/liswork/src/main/resources/mapper/LisWorkGermMapper.xml @@ -158,4 +158,8 @@ order by xm_medgroup.xh + \ No newline at end of file diff --git a/sql/lis8.0/updatedb_lis8.0.sql b/sql/lis8.0/updatedb_lis8.0.sql index 39a9e67..4b7920c 100644 --- a/sql/lis8.0/updatedb_lis8.0.sql +++ b/sql/lis8.0/updatedb_lis8.0.sql @@ -376,4 +376,32 @@ CREATE TABLE [dbo].[com_localconfig]( [sid] ASC )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] ) ON [PRIMARY] +end + + + +if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'com_config_dict') +begin +CREATE TABLE [dbo].[com_config_dict]( + [config_id] [bigint] IDENTITY(1,1) NOT NULL, + [config_type] [varchar](20) NOT NULL, + [config_code] [varchar](64) NOT NULL, + [config_name] [varchar](250) NOT NULL, + [config_optiontype] [char](1) NOT NULL, + [config_defvalue] [varchar](250) NOT NULL, + [config_sort] [int] NOT NULL, + [status] [char](1) NOT NULL, + [create_by] [varchar](64) NULL, + [create_time] [datetime] NULL, + [update_by] [varchar](64) NULL, + [update_time] [datetime] NULL, + [remark] [varchar](500) NULL, + PRIMARY KEY CLUSTERED +( +[config_id] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] + ) ON [PRIMARY] +ALTER TABLE [dbo].[com_config_dict] ADD DEFAULT ('') FOR [create_by] +ALTER TABLE [dbo].[com_config_dict] ADD DEFAULT ('') FOR [update_by] +ALTER TABLE [dbo].[com_config_dict] ADD DEFAULT (NULL) FOR [remark] end \ No newline at end of file