From b01e997cd13e528c6cc584d16dbe1c2ad4e0d7f1 Mon Sep 17 00:00:00 2001 From: nies Date: Mon, 14 Mar 2022 16:20:02 +0800 Subject: [PATCH 1/4] =?UTF-8?q?SysRefUserMessage=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=97=B6=E5=A2=9E=E5=8A=A0=E5=B7=A5=E5=8E=82=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=9A=84=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java index 84f9814..532d7b4 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java @@ -167,6 +167,9 @@ public class MessageMailQueueReceiver { refUserMessage.setMessageStatus(ImppEnumUtil.MESSAGE_STATUS.UNREAD.getValue()); refUserMessage.setReceiverTime(TimeTool.getNowTime(true)); refUserMessage.setIsUrgent(msg.getIsUrgent()); + if (StringUtils.isNotBlank(msg.getOrganizeCode())){ + refUserMessage.setOrganizeCode(msg.getOrganizeCode()); + } sysMessageService.insertSysRefUserMessage(refUserMessage); From e0ce1c4c3f35a0e47455900df5b3dd9e6fb59da0 Mon Sep 17 00:00:00 2001 From: nies Date: Tue, 15 Mar 2022 09:51:29 +0800 Subject: [PATCH 2/4] =?UTF-8?q?RedisInfoController=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=BC=80=E5=90=AF=E7=9A=84=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/core/apiservice/controller/base/RedisInfoController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/RedisInfoController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/RedisInfoController.java index f996fd5..8fd85ae 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/RedisInfoController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/RedisInfoController.java @@ -13,6 +13,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.logging.log4j.util.Strings; +import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -31,6 +32,7 @@ import java.util.*; @Api(tags = "redis信息") @RestController @RequestMapping(PlatformConstWords.BASE_URL + "/redis") +@ConditionalOnExpression("'${impp.redis.info.controller:false}' == 'true'") public class RedisInfoController { /** * redis db0 resource From 5f5a1affd23c509c2cf5ee5684bf86c68fe11dcc Mon Sep 17 00:00:00 2001 From: nies Date: Tue, 15 Mar 2022 11:42:28 +0800 Subject: [PATCH 3/4] =?UTF-8?q?MessageSWebNoticeQueueReceiver=20=E5=86=99?= =?UTF-8?q?=E5=85=A5=E6=B6=88=E6=81=AF=E8=AE=B0=E5=BD=95=E6=97=B6=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E5=8E=82=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/core/apiservice/mq/MessageSWebNoticeQueueReceiver.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageSWebNoticeQueueReceiver.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageSWebNoticeQueueReceiver.java index 9bebaca..f6a3a33 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageSWebNoticeQueueReceiver.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageSWebNoticeQueueReceiver.java @@ -123,6 +123,10 @@ public class MessageSWebNoticeQueueReceiver { refUserMessage.setMessageStatus(ImppEnumUtil.MESSAGE_STATUS.UNREAD.getValue()); refUserMessage.setReceiverTime(TimeTool.getNowTime(true)); refUserMessage.setIsUrgent(msg.getIsUrgent()); + + if (StringUtils.isNotBlank(msg.getOrganizeCode())){ + refUserMessage.setOrganizeCode(msg.getOrganizeCode()); + } // 初始数据 ConvertBean.serviceModelInitialize(refUserMessage, msg.getCreateUser()); From f191ba4889bca3086a3a3727649c9e8b88db224a Mon Sep 17 00:00:00 2001 From: nies Date: Fri, 18 Mar 2022 10:02:21 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iservice/busi/ISysTableTemplateService.java | 57 +++++++++++ .../busi/SysTableTemplateController.java | 106 +++++++++++++++++++++ .../serviceimpl/busi/SysTableTemplateService.java | 70 ++++++++++++++ 3 files changed, 233 insertions(+) create mode 100644 modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTableTemplateService.java create mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTableTemplateController.java create mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTableTemplateService.java diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTableTemplateService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTableTemplateService.java new file mode 100644 index 0000000..c0916d8 --- /dev/null +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTableTemplateService.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.core.api.iservice.busi; + +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.platform.bean.SysTableTemplate; + +import java.util.List; + +/** + * @author ns + * @create 2022/3/17 0017 上午 10:52 + */ +public interface ISysTableTemplateService { + + /** + * 根据条件分页查询 + * @param sysTableTemplate + * @param pager + * @return + */ + ListPager findSysTableTemplateByPage(SysTableTemplate sysTableTemplate, Pager pager); + + /** + * 根据条件查询 + * @param sysTableTemplate + * @return + */ + List findSysTableTemplate(SysTableTemplate sysTableTemplate); + + /** + * 更新table模板,如果不存在,则新增对应的模板 + * @param sysTableTemplate + * @return + */ + Boolean saveSysTableTemplate(SysTableTemplate sysTableTemplate); + + /** + * 插入table模板 + * @param sysTableTemplate + * @return + */ + SysTableTemplate insertSysTableTemplate(SysTableTemplate sysTableTemplate); + + /** + * 更新table模板 + * @param sysTableTemplate + * @return + */ + Boolean updateSysTableTemplate(SysTableTemplate sysTableTemplate); + + /** + * 判断模板是否存在 + * @param sysTableTemplate + * @return + */ + Boolean isExistSysTableTemplate(SysTableTemplate sysTableTemplate); +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTableTemplateController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTableTemplateController.java new file mode 100644 index 0000000..1f725e5 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTableTemplateController.java @@ -0,0 +1,106 @@ +package cn.estsh.i3plus.core.apiservice.controller.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.ISysTableTemplateService; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.platform.bean.SysTableTemplate; +import cn.estsh.impp.framework.boot.auth.AuthUtil; +import cn.estsh.impp.framework.boot.util.ResultBean; +import cn.estsh.impp.framework.boot.util.ValidatorBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.util.ObjectUtils; +import org.springframework.web.bind.annotation.*; + +/** + * @author ns + * @create 2022/3/17 0017 上午 11:39 + */ +@RestController +@RequestMapping(PlatformConstWords.BASE_URL + "/sys-table-template") +@Api(tags = "前端表格模板") +public class SysTableTemplateController { + + private ISysTableTemplateService iSysTableTemplateService; + + public SysTableTemplateController(ISysTableTemplateService sysTableTemplateService) { + this.iSysTableTemplateService = sysTableTemplateService; + } + + @ApiOperation("新增系统模板") + @PostMapping("/insert") + public ResultBean insertSysTableTemplate(SysTableTemplate sysTableTemplate) throws NoSuchFieldException { + //条件验证 + ValidatorBean.beginValid(sysTableTemplate) + .notNull("softType", sysTableTemplate.getSoftType()) + .notNull("templateData", sysTableTemplate.getTemplateData()) + .notNull("page", sysTableTemplate.getPage()) + .notNull("templateType", sysTableTemplate.getTemplateType()); + if (CommonEnumUtil.USER_TYPE.ADMIN.equals(AuthUtil.getUserType())) { + return ResultBean.success().setResultObject(iSysTableTemplateService.insertSysTableTemplate((sysTableTemplate))); + } + return ResultBean.fail("当前用户不是管理员，不能新增"); + + } + + @ApiOperation("修改系统模板") + @PutMapping("/update") + public ResultBean updateSysTableTemplate(SysTableTemplate sysTableTemplate) throws NoSuchFieldException { + //条件验证 + ValidatorBean.beginValid(sysTableTemplate) + .notNull("id", sysTableTemplate.getId()); + if (CommonEnumUtil.USER_TYPE.ADMIN.equals(AuthUtil.getUserType())) { + return ResultBean.success().setResultObject(iSysTableTemplateService.updateSysTableTemplate((sysTableTemplate))); + } + return ResultBean.fail("当前用户不是管理员，不能修改"); + } + + @ApiOperation("修改系统模板,如果不存在则新增模板") + @PutMapping("/putIfAbsent") + public ResultBean putIfSysTableTemplateAbsent(SysTableTemplate sysTableTemplate) throws NoSuchFieldException { + //条件验证 + + if (!CommonEnumUtil.USER_TYPE.ADMIN.equals(AuthUtil.getUserType())) { + return ResultBean.fail("当前用户不是管理员，不能修改"); + } + ValidatorBean validatorBean = ValidatorBean.beginValid(sysTableTemplate); + if (ObjectUtils.isEmpty(sysTableTemplate.getId())) { + validatorBean + .notNull("softType", sysTableTemplate.getSoftType()) + .notNull("templateData", sysTableTemplate.getTemplateData()) + .notNull("page", sysTableTemplate.getPage()) + .notNull("templateType", sysTableTemplate.getTemplateType()); + return ResultBean.success().setResultObject(iSysTableTemplateService.insertSysTableTemplate((sysTableTemplate))); + } + return ResultBean.success().setResultObject(iSysTableTemplateService.updateSysTableTemplate((sysTableTemplate))); + } + + @ApiOperation("查询系统模板") + @GetMapping("/find") + public ResultBean findSysTableTemplate(SysTableTemplate sysTableTemplate) throws NoSuchFieldException { + if (ObjectUtils.isEmpty(sysTableTemplate)) { + return ResultBean.fail("查询条件不能为空"); + } + if (ObjectUtils.isEmpty(sysTableTemplate.getId()) + && ObjectUtils.isEmpty(sysTableTemplate.getPage()) + && ObjectUtils.isEmpty(sysTableTemplate.getSoftType()) + && ObjectUtils.isEmpty(sysTableTemplate.getTemplateType())) { + return ResultBean.fail("查询条件不能为空"); + } + return ResultBean.success().setResultObject(iSysTableTemplateService.findSysTableTemplate((sysTableTemplate))); + + } + + + @ApiOperation("分页查询系统模板") + @GetMapping("/findBypage") + public ResultBean findSysTableTemplateByPage(SysTableTemplate sysTableTemplate, Pager pager) throws NoSuchFieldException { + if (ObjectUtils.isEmpty(pager)) { + pager = Pager.defaultPager(); + } + return ResultBean.success().setResultObject(iSysTableTemplateService.findSysTableTemplateByPage(sysTableTemplate, pager)); + + } + +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTableTemplateService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTableTemplateService.java new file mode 100644 index 0000000..1343ab6 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTableTemplateService.java @@ -0,0 +1,70 @@ +package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.ISysTableTemplateService; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.common.PagerHelper; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.platform.bean.SysTableTemplate; +import cn.estsh.i3plus.pojo.platform.repository.SysTableTemplateRepository; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author ns + * @create 2022/3/17 0017 上午 11:09 + */ +@Service +public class SysTableTemplateService implements ISysTableTemplateService { + + private SysTableTemplateRepository sysTableTemplateRepository; + + public SysTableTemplateService(SysTableTemplateRepository sysTableTemplateRepository) { + this.sysTableTemplateRepository = sysTableTemplateRepository; + } + + @Override + public ListPager findSysTableTemplateByPage(SysTableTemplate sysTableTemplate, Pager pager) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysTableTemplate.getOrganizeCode()); + DdlPreparedPack.getNumEqualPack(sysTableTemplate.getSoftType(), "softType", ddlPackBean); + DdlPreparedPack.getStringLikerPack(sysTableTemplate.getPage(), "page", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysTableTemplate.getTemplateType(), "templateType", ddlPackBean); + pager = PagerHelper.getPager(pager, sysTableTemplateRepository.findByHqlWhereCount(ddlPackBean)); + return new ListPager(sysTableTemplateRepository.findByHqlWherePage(ddlPackBean, pager), pager); + } + + @Override + public List findSysTableTemplate(SysTableTemplate sysTableTemplate) { + DdlPackBean result = DdlPackBean.getDdlPackBean(sysTableTemplate.getOrganizeCode()); + DdlPreparedPack.getNumEqualPack(sysTableTemplate.getSoftType(), "softType", result); + DdlPreparedPack.getStringLikerPack(sysTableTemplate.getPage(), "page", result); + DdlPreparedPack.getStringEqualPack(sysTableTemplate.getTemplateType(), "templateType", result); + DdlPreparedPack.getNumEqualPack(sysTableTemplate.getId(), "id", result); + return sysTableTemplateRepository.findByHqlWhere(result); + } + + @Override + public Boolean saveSysTableTemplate(SysTableTemplate sysTableTemplate) { + return null; + } + + @Override + public SysTableTemplate insertSysTableTemplate(SysTableTemplate sysTableTemplate) { + return sysTableTemplateRepository.insert(sysTableTemplate); + } + + @Override + public Boolean updateSysTableTemplate(SysTableTemplate sysTableTemplate) { + sysTableTemplateRepository.update(sysTableTemplate); + return true; + } + + @Override + public Boolean isExistSysTableTemplate(SysTableTemplate sysTableTemplate) { + DdlPackBean ddlPack = DdlPackBean.getDdlPackBean(sysTableTemplate.getOrganizeCode()); + DdlPreparedPack.getNumEqualPack(sysTableTemplate.getId(), "id", ddlPack); + return sysTableTemplateRepository.isExitByHql(ddlPack); + } +}