diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComLocalconfig.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComLocalconfig.java index 4a69a5a..610a132 100644 --- a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComLocalconfig.java +++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComLocalconfig.java @@ -4,16 +4,21 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.Date; + @Data @NoArgsConstructor @AllArgsConstructor public class ComLocalconfig { - private long sid; + private Long sid; private String smac; private String sip; private String sname; private String configvalue; - + private String create_by; + private Date create_time; + private String update_by; + private Date update_time; } 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 index 724dd98..c507205 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComConfigDictController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComConfigDictController.java @@ -29,10 +29,10 @@ public class ComConfigDictController extends BaseController { */ @ApiOperation("获取字典列表") @GetMapping("/list") - public TableDataInfo list(ComConfigDict post) { - startPage(); + public AjaxResult list(ComConfigDict post) { + // startPage(); List list = ComConfigDictService.selectComConfigDictList(post); - return getDataTable(list); + return success(list); } @ApiOperation("字典导出") @Log(title = "字典导出", businessType = BusinessType.EXPORT) diff --git a/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComLocalconfigController.java b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComLocalconfigController.java new file mode 100644 index 0000000..060ef68 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComLocalconfigController.java @@ -0,0 +1,74 @@ +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.domain.entity.lis.ComConfigDict; +import com.czlis.common.enums.BusinessType; +import com.czlis.common.utils.SecurityUtils; +import com.czlis.common.utils.poi.ExcelUtil; +import com.czlis.liswork.service.ComConfigDictService; +import com.czlis.liswork.service.ComLocalconfigService; +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("/localconfig") +@Slf4j +public class ComLocalconfigController extends BaseController { + @Autowired + ComConfigDictService ComConfigDictService; + ComLocalconfigService ComLocalconfigService; + /** + * 获取字典列表 + */ + @ApiOperation("获取参数列表") + @GetMapping("/list") + public AjaxResult list() { + String localid= SecurityUtils.getLoginUser().getSysLoginParam().getLocalid(); + ComLocalconfigService.getComLocalconfigList(localid); + return success(ComLocalconfigService.getComLocalconfigList(localid)); + } + /** + * 根据字典编号获取详细信息 + */ + @ApiOperation("获取详细信息") + @GetMapping(value = "/{dictId}") + public AjaxResult getInfo(@PathVariable Long dictId) { + return success(ComConfigDictService.selectComConfigDictById(dictId)); + } + + /** + * 修改字典 + */ + @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("获取字典选择框列表") + @GetMapping("/optionselect/{dictId}") + public AjaxResult optionselect() { + List posts = ComConfigDictService.selectComConfigDictAll(); + return success(posts); + } +} diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/LocalconfigMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/LocalconfigMapper.java new file mode 100644 index 0000000..a7b78be --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/LocalconfigMapper.java @@ -0,0 +1,19 @@ +package com.czlis.liswork.mapper.xtwh; + +import com.czlis.common.core.domain.entity.lis.ComLocalconfig; + +import java.util.List; + +public interface LocalconfigMapper { + + List selectComLocalconfigList(ComLocalconfig comLocalconfig); + Long getCountById(Long sid); + Long getCountBymic(String smac); + Long getsid(String smac); + List selectComLocalconfigAll(); + int insertComLocalconfig(ComLocalconfig comLocalconfig); + int delComLocalconfigById(Long sid); + int delComLocalconfigBymac(String smac); + int delComLocalconfigByIds(Long[] sids); + int updateComLocalconfig(ComLocalconfig comLocalconfig); +} diff --git a/liswork/src/main/java/com/czlis/liswork/service/ComLocalconfigService.java b/liswork/src/main/java/com/czlis/liswork/service/ComLocalconfigService.java new file mode 100644 index 0000000..bee1725 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/service/ComLocalconfigService.java @@ -0,0 +1,19 @@ +package com.czlis.liswork.service; + +import com.czlis.common.core.domain.entity.lis.ComConfigDict; +import com.czlis.common.core.domain.entity.lis.ComLocalconfig; + +import java.util.List; + +public interface ComLocalconfigService { + List getComLocalconfigList(String smac); + Long getCountById(Long sid); + Long getCountBymic(String smac); + Long getsid(String smac); + List selectComLocalconfigAll(); + int insertComLocalconfig(ComLocalconfig comLocalconfig); + int delComLocalconfigById(Long sid); + int delComLocalconfigBymac(String smac); + int delComLocalconfigByIds(Long[] sids); + int updateComLocalconfig(ComLocalconfig comLocalconfig); +} diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComLocalconfigServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComLocalconfigServiceImpl.java new file mode 100644 index 0000000..6badf6c --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComLocalconfigServiceImpl.java @@ -0,0 +1,73 @@ +package com.czlis.liswork.service.impl.xtwh; + +import com.czlis.common.core.domain.entity.lis.ComConfigDict; +import com.czlis.common.core.domain.entity.lis.ComLocalconfig; +import com.czlis.liswork.mapper.xtwh.LocalconfigMapper; +import com.czlis.liswork.service.ComConfigDictService; +import com.czlis.liswork.service.ComLocalconfigService; +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 ComLocalconfigServiceImpl implements ComLocalconfigService { + @Autowired + ComConfigDictService ComConfigDictService; + @Autowired + LocalconfigMapper localconfigMapper; + @Override + public List getComLocalconfigList(String smac){ + ComConfigDict post=new ComConfigDict(); + post.setConfigType("LOCAL"); + post.setStatus("0"); + List list = ComConfigDictService.selectComConfigDictList(post); + if(list.isEmpty())return null; + ComLocalconfig comLocalconfig=new ComLocalconfig(); + comLocalconfig.setSmac(smac); + List comLocalconfiglist=localconfigMapper.selectComLocalconfigList(comLocalconfig); + if(comLocalconfiglist.size()>0){ + comLocalconfig= comLocalconfiglist.get(0); + String configvalue=comLocalconfig.getConfigvalue(); + } + return null; + } + @Override + public Long getCountById(Long sid){ + return null; + } + @Override + public Long getCountBymic(String smac){ + return null; + } + @Override + public Long getsid(String smac){ + return null; + } + @Override + public List selectComLocalconfigAll(){ + return null; + } + @Override + public int insertComLocalconfig(ComLocalconfig comLocalconfig){ + return 0; + } + @Override + public int delComLocalconfigById(Long sid){ + return 0; + } + @Override + public int delComLocalconfigBymac(String smac){ + return 0; + } + @Override + public int delComLocalconfigByIds(Long[] sids){ + return 0; + } + @Override + public int updateComLocalconfig(ComLocalconfig comLocalconfig){ + return 0; + } + +} diff --git a/liswork/src/main/resources/mapper/ComLocalconfigMapper.xml b/liswork/src/main/resources/mapper/ComLocalconfigMapper.xml new file mode 100644 index 0000000..33d48a5 --- /dev/null +++ b/liswork/src/main/resources/mapper/ComLocalconfigMapper.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + insert into com_localconfig( + sid, + smac, + sip, + sname, + configvalue, + create_by, + create_time + )values( + #{sid}, + #{smac}, + #{sip}, + #{sname}, + #{configvalue}, + #{create_by}, + getdate() + ) + + + + delete from com_localconfig where sid = #{sid} + + + delete from com_localconfig where smac = #{smac} + + + delete from com_localconfig where sid in + + #{sid} + + + + + update com_localconfig + + config_type = #{smac}, + sip = #{sip}, + sname = #{sname}, + configvalue = #{configvalue}, + update_by = #{update_by}, + update_time = getdate() + + where sid = #{sid} + + + + \ 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 4b7920c..855a53a 100644 --- a/sql/lis8.0/updatedb_lis8.0.sql +++ b/sql/lis8.0/updatedb_lis8.0.sql @@ -369,8 +369,12 @@ CREATE TABLE [dbo].[com_localconfig]( [sid] [int] IDENTITY(1,1) NOT NULL, [smac] [varchar](50) NULL, [sip] [varchar](50) NULL, - [sname] [varchar](50) NULL, + [sname] [varchar](250) NULL, [configvalue] [varchar](8000) NULL, + [create_by] [varchar](64) NULL, + [create_time] [datetime] NULL, + [update_by] [varchar](64) NULL, + [update_time] [datetime] NULL, CONSTRAINT [PK_com_localconfig] PRIMARY KEY CLUSTERED ( [sid] ASC