From de784a3bd87b7bc6d6533f2a3bb7426a696860ea Mon Sep 17 00:00:00 2001 From: lishangbu Date: Thu, 30 Dec 2021 14:14:47 +0800 Subject: [PATCH 1/4] =?UTF-8?q?:recycle:=20Refactoring=20code.=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=9F=BA=E7=A1=80=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/common/data/mybatis/BaseEntity.java | 21 +++++++++++++++++++ .../pigx/admin/api/entity/SysPublicParam.java | 19 +---------------- .../impl/SysPublicParamServiceImpl.java | 4 ++-- 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/BaseEntity.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/BaseEntity.java index 0902499fe..3d805f65f 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/BaseEntity.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/BaseEntity.java @@ -1,7 +1,11 @@ package com.pig4cloud.pigx.common.data.mybatis; +import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableLogic; +import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; @@ -22,24 +26,41 @@ public class BaseEntity implements Serializable { * 创建者 */ @TableField(fill = FieldFill.INSERT) + @ApiModelProperty(value = "创建人", example = "admin") + @ExcelProperty(value = "创建人") private String createBy; /** * 创建时间 */ @TableField(fill = FieldFill.INSERT) + @ApiModelProperty(value = "创建时间", example = "2021-12-20 13:27:44") + @ExcelProperty(value = "创建时间") private LocalDateTime createTime; /** * 更新者 */ @TableField(fill = FieldFill.INSERT_UPDATE) + @ApiModelProperty(value = "更新人", example = "admin") + @ExcelIgnore private String updateBy; /** * 更新时间 */ @TableField(fill = FieldFill.INSERT_UPDATE) + @ApiModelProperty(value = "更新时间", example = "2021-12-20 13:27:44") + @ExcelIgnore private LocalDateTime updateTime; + /** + * 是否删除 1：已删除 0：正常 + */ + @TableLogic + @ApiModelProperty(value = "删除标记,1:已删除,0:正常") + @TableField(fill = FieldFill.INSERT) + @ExcelIgnore + private String delFlag; + } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPublicParam.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPublicParam.java index c29145a6c..2fe116ef6 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPublicParam.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPublicParam.java @@ -24,8 +24,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 公共参数配置 * @@ -84,26 +82,11 @@ public class SysPublicParam extends Model { @ApiModelProperty(value = "编码", example = "^(PIG|PIGX)$") private String validateCode; - /** - * 创建时间 - */ - @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "创建时间", example = "2019-03-21 12:28:48") - private Date createTime; - - /** - * 修改时间 - */ - @TableField(fill = FieldFill.UPDATE) - @ApiModelProperty(value = "修改时间", example = "2019-03-21 12:28:48") - private Date updateTime; - /** * 是否是系统内置 */ - @TableField(value = "`system`") @ApiModelProperty(value = "是否是系统内置") - private String system; + private String systemFlag; /** * 配置类型：0-默认；1-检索；2-原文；3-报表；4-安全；5-文档；6-消息；9-其他 diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysPublicParamServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysPublicParamServiceImpl.java index fbaecbd6e..d639965a9 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysPublicParamServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysPublicParamServiceImpl.java @@ -63,7 +63,7 @@ public class SysPublicParamServiceImpl extends ServiceImpl Date: Thu, 30 Dec 2021 15:34:51 +0800 Subject: [PATCH 2/4] =?UTF-8?q?:fire:=20Removing=20code=20or=20files.?= =?UTF-8?q?=E7=A7=BB=E9=99=A4quartz=E5=B7=A5=E7=A8=8B=E4=B8=AD=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E7=9A=84=E4=B8=A4=E5=BC=A0=E8=A1=A8=E7=9A=84?= =?UTF-8?q?mapper=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/SysJobLogMapper.xml | 23 --------------- .../main/resources/mapper/SysJobMapper.xml | 29 ------------------- 2 files changed, 52 deletions(-) delete mode 100644 pigx-visual/pigx-daemon-quartz/src/main/resources/mapper/SysJobLogMapper.xml delete mode 100644 pigx-visual/pigx-daemon-quartz/src/main/resources/mapper/SysJobMapper.xml diff --git a/pigx-visual/pigx-daemon-quartz/src/main/resources/mapper/SysJobLogMapper.xml b/pigx-visual/pigx-daemon-quartz/src/main/resources/mapper/SysJobLogMapper.xml deleted file mode 100644 index 635ffa8c2..000000000 --- a/pigx-visual/pigx-daemon-quartz/src/main/resources/mapper/SysJobLogMapper.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pigx-visual/pigx-daemon-quartz/src/main/resources/mapper/SysJobMapper.xml b/pigx-visual/pigx-daemon-quartz/src/main/resources/mapper/SysJobMapper.xml deleted file mode 100644 index 399d6a156..000000000 --- a/pigx-visual/pigx-daemon-quartz/src/main/resources/mapper/SysJobMapper.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From c27acd9a8f00e870e97e21637d50e65248261e47 Mon Sep 17 00:00:00 2001 From: lishangbu Date: Fri, 31 Dec 2021 14:27:48 +0800 Subject: [PATCH 3/4] =?UTF-8?q?:sparkles:=20Introducing=20new=20features.?= =?UTF-8?q?=20=E5=BE=AE=E4=BF=A1=E8=B4=A6=E6=88=B7=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mp/controller/WxAccountController.java | 2 +- .../controller/WxAccountFansController.java | 2 +- .../mp/controller/WxAccountTagController.java | 76 +++++++++++++++++++ .../mp/controller/WxAutoReplyController.java | 2 +- .../mp/controller/WxFansMsgController.java | 2 +- .../mp/controller/WxMaterialController.java | 2 +- .../pigx/mp/controller/WxMenuController.java | 2 +- .../pigx/mp/entity/WxAccountTag.java | 36 +++++++++ .../pigx/mp/mapper/WxAccountTagMapper.java | 33 ++++++++ .../pigx/mp/service/WxAccountTagService.java | 37 +++++++++ .../service/impl/WxAccountTagServiceImpl.java | 57 ++++++++++++++ 11 files changed, 245 insertions(+), 6 deletions(-) create mode 100644 pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountTagController.java create mode 100644 pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccountTag.java create mode 100755 pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/mapper/WxAccountTagMapper.java create mode 100644 pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/service/WxAccountTagService.java create mode 100644 pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/service/impl/WxAccountTagServiceImpl.java diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountController.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountController.java index a66c6af8f..f140f8228 100755 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountController.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountController.java @@ -36,7 +36,7 @@ import org.springframework.web.bind.annotation.*; */ @RestController @AllArgsConstructor -@RequestMapping("/wxaccount") +@RequestMapping("/wx-account") public class WxAccountController { private final WxAccountService wxAccountService; diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountFansController.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountFansController.java index 5ab7d8793..8733e7251 100755 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountFansController.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountFansController.java @@ -34,7 +34,7 @@ import org.springframework.web.bind.annotation.*; */ @RestController @AllArgsConstructor -@RequestMapping("/wxaccountfans") +@RequestMapping("/wx-account-fans") public class WxAccountFansController { private final WxAccountFansService wxAccountFansService; diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountTagController.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountTagController.java new file mode 100644 index 000000000..4f2aeb724 --- /dev/null +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountTagController.java @@ -0,0 +1,76 @@ +package com.pig4cloud.pigx.mp.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.pig4cloud.pigx.common.core.util.R; +import com.pig4cloud.pigx.mp.entity.WxAccountTag; +import com.pig4cloud.pigx.mp.entity.WxAutoReply; +import com.pig4cloud.pigx.mp.service.WxAccountTagService; +import lombok.AllArgsConstructor; +import org.apache.ibatis.annotations.Delete; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; + +/** + * 微信账户标签 + * + * @author lishangbu + * @date 2021/12/31 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/wx-account-tag") +public class WxAccountTagController { + + private final WxAccountTagService wxAccountTagService; + + /** + * 分页查询 + * @param page 分页对象 + * @param wxAccountTag 账户标签查询条件 + * @return + */ + @GetMapping("/page") + public R> getWxAccountTagPage(Page page, WxAccountTag wxAccountTag) { + return R.ok(wxAccountTagService.page(page, Wrappers.query(wxAccountTag))); + } + + /** + * 列表查询 + * @param wxAccountTag 账户标签查询条件 + * @return + */ + @GetMapping("/list") + public R> listWxAccountTags(WxAccountTag wxAccountTag) { + return R.ok(wxAccountTagService.list(Wrappers.query(wxAccountTag))); + } + + /** + * 保存账户标签 + * @param wxAccountTag 待保存的账户标签 + * @return 包含保存成功后的账户标签的API调用结果 + */ + @PostMapping + public R saveAccountTag(@RequestBody @Valid WxAccountTag wxAccountTag) { + return R.ok(wxAccountTagService.saveAccountTag(wxAccountTag)); + } + + /** + * 修改账户标签 + * @param wxAccountTag 待修改的账户标签 + * @return 包含修改成功后的账户标签的API调用结果 + */ + @PutMapping + public R updateAccountTag(@RequestBody @Valid WxAccountTag wxAccountTag) { + return R.ok(wxAccountTagService.updateAccountTag(wxAccountTag)); + } + + @DeleteMapping("/{id:\\d+}") + public R removeAccountTagById(@PathVariable Long id) { + return R.ok(wxAccountTagService.removeAccountTagById(id)); + } + +} diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAutoReplyController.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAutoReplyController.java index e22fc177c..3be42cb7a 100644 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAutoReplyController.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAutoReplyController.java @@ -21,7 +21,7 @@ import java.util.List; */ @RestController @AllArgsConstructor -@RequestMapping("/wxautoreply") +@RequestMapping("/wx-auto-reply") public class WxAutoReplyController { private final WxAutoReplyService wxAutoReplyService; diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxFansMsgController.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxFansMsgController.java index 864f428d7..142eae7a0 100755 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxFansMsgController.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxFansMsgController.java @@ -35,7 +35,7 @@ import org.springframework.web.bind.annotation.*; @Slf4j @RestController @AllArgsConstructor -@RequestMapping("/wxfansmsg") +@RequestMapping("/wx-fans-msg") public class WxFansMsgController { private final WxMsgService wxMsgService; diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxMaterialController.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxMaterialController.java index 7a9eb2a48..1d63352f3 100644 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxMaterialController.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxMaterialController.java @@ -38,7 +38,7 @@ import java.util.Map; @Slf4j @RestController @AllArgsConstructor -@RequestMapping("/wxmaterial") +@RequestMapping("/wx-material") public class WxMaterialController { /** diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxMenuController.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxMenuController.java index 0c40b73ed..3fd23bc0c 100755 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxMenuController.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxMenuController.java @@ -32,7 +32,7 @@ import org.springframework.web.bind.annotation.*; */ @RestController @AllArgsConstructor -@RequestMapping("/wxmenu") +@RequestMapping("/wx-menu") public class WxMenuController { private final WxMenuService wxMenuService; diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccountTag.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccountTag.java new file mode 100644 index 000000000..acc42154f --- /dev/null +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccountTag.java @@ -0,0 +1,36 @@ +package com.pig4cloud.pigx.mp.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.pig4cloud.pigx.common.data.mybatis.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.validation.constraints.NotBlank; + +/** + * 微信公众号账号标签 + * + * @author lishangbu + * @date 2021/12/31 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class WxAccountTag extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + + /** + * 标签 + */ + @NotBlank(message = "标签不能为空") + private String tag; + +} diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/mapper/WxAccountTagMapper.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/mapper/WxAccountTagMapper.java new file mode 100755 index 000000000..18a7a96e7 --- /dev/null +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/mapper/WxAccountTagMapper.java @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2018-2025, lengleng All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the pig4cloud.com developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: lengleng (wangiegie@gmail.com) + */ +package com.pig4cloud.pigx.mp.mapper; + +import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper; +import com.pig4cloud.pigx.mp.entity.WxAccount; +import com.pig4cloud.pigx.mp.entity.WxAccountTag; +import org.apache.ibatis.annotations.Mapper; + +/** + * 公众号账户 + * + * @author lengleng + * @date 2019-03-26 22:07:53 + */ +@Mapper +public interface WxAccountTagMapper extends PigxBaseMapper { + +} diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/service/WxAccountTagService.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/service/WxAccountTagService.java new file mode 100644 index 000000000..e2669527b --- /dev/null +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/service/WxAccountTagService.java @@ -0,0 +1,37 @@ +package com.pig4cloud.pigx.mp.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.pig4cloud.pigx.mp.entity.WxAccountTag; + +/** + * 微信账户标签服务 + * + * @author lishangbu + * @date 2021/12/31 + */ +public interface WxAccountTagService extends IService { + + /** + * 保存账户标签 + * @param accountTag 账户标签 + * @return 保存成功后的账户标签 + */ + WxAccountTag saveAccountTag(WxAccountTag accountTag); + + /** + * 更新账户标签 + * @param accountTag 待更新的账户标签 + * @return 修改成功后的账户标签 + */ + WxAccountTag updateAccountTag(WxAccountTag accountTag); + + /** + * 删除账户标签 + * @param id 待删除的账户标签主键 + * @return 删除成功返回true,删除失败返回false + */ + Boolean removeAccountTagById(Long id); + +} diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/service/impl/WxAccountTagServiceImpl.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/service/impl/WxAccountTagServiceImpl.java new file mode 100644 index 000000000..24e302c64 --- /dev/null +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/service/impl/WxAccountTagServiceImpl.java @@ -0,0 +1,57 @@ +package com.pig4cloud.pigx.mp.service.impl; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.pig4cloud.pigx.mp.entity.WxAccountTag; +import com.pig4cloud.pigx.mp.mapper.WxAccountTagMapper; +import com.pig4cloud.pigx.mp.service.WxAccountTagService; +import org.springframework.stereotype.Service; +import org.springframework.util.Assert; + +/** + * 微信账户标签服务实现类 + * + * @author lishangbu + * @date 2021/12/31 + */ +@Service +public class WxAccountTagServiceImpl extends ServiceImpl + implements WxAccountTagService { + + /** + * 保存账户标签 + * @param accountTag 账户标签 + * @return 保存成功true保存失败false + */ + @Override + public WxAccountTag saveAccountTag(WxAccountTag accountTag) { + WxAccountTag wxAccountTag = baseMapper + .selectOne(Wrappers.lambdaQuery().eq(WxAccountTag::getTag, accountTag.getTag())); + Assert.isNull(wxAccountTag, StrUtil.format("名称为[{}]的标签已经存在", accountTag.getTag())); + baseMapper.insert(accountTag); + return accountTag; + } + + /** + * 更新账户标签 + * @param accountTag 待更新的账户标签 + * @return + */ + @Override + public WxAccountTag updateAccountTag(WxAccountTag accountTag) { + WxAccountTag wxAccountTag = baseMapper.selectOne(Wrappers.lambdaQuery() + .eq(WxAccountTag::getTag, accountTag.getTag()).ne(WxAccountTag::getId, accountTag.getId())); + Assert.isNull(wxAccountTag, StrUtil.format("名称为[{}]的标签已经存在", accountTag.getTag())); + baseMapper.updateById(accountTag); + return accountTag; + } + + @Override + public Boolean removeAccountTagById(Long id) { + WxAccountTag wxAccountTag = baseMapper.selectById(id); + Assert.notNull(wxAccountTag, "要删除的标签不存在"); + return removeById(wxAccountTag.getId()); + } + +} From d18a87cc496f7a9d0fc0c170082c52ba5b74f67f Mon Sep 17 00:00:00 2001 From: lishangbu Date: Fri, 31 Dec 2021 17:08:18 +0800 Subject: [PATCH 4/4] =?UTF-8?q?:sparkles:=20Introducing=20new=20features.?= =?UTF-8?q?=20=E6=94=AF=E6=8C=81=E7=BB=88=E7=AB=AF=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit :bug: Fixing a bug.兼容先前代码，将dict的itemValue序列化成value返回 --- .../pig4cloud/pigx/admin/api/entity/SysDictItem.java | 2 ++ pigx-upms/pigx-upms-biz/pom.xml | 6 +++--- .../pigx/admin/controller/SysClientController.java | 10 ++++++++++ .../admin/controller/SysPublicParamController.java | 2 +- .../admin/service/SysOauthClientDetailsService.java | 7 +++++++ .../pigx/admin/service/SysPublicParamService.java | 2 +- .../service/impl/SysOauthClientDetailsServiceImpl.java | 7 +++++++ .../admin/service/impl/SysPublicParamServiceImpl.java | 2 +- 8 files changed, 32 insertions(+), 6 deletions(-) diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDictItem.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDictItem.java index e3899c2a7..d026ab3bd 100755 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDictItem.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDictItem.java @@ -18,6 +18,7 @@ package com.pig4cloud.pigx.admin.api.entity; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -55,6 +56,7 @@ public class SysDictItem extends Model { * 数据值 */ @ApiModelProperty(value = "数据值") + @JsonProperty(value = "value") private String itemValue; /** diff --git a/pigx-upms/pigx-upms-biz/pom.xml b/pigx-upms/pigx-upms-biz/pom.xml index 8c7d389c0..1aef5b2a7 100644 --- a/pigx-upms/pigx-upms-biz/pom.xml +++ b/pigx-upms/pigx-upms-biz/pom.xml @@ -33,10 +33,10 @@ pigx 通用用户权限管理系统业务处理模块 - + - com.oracle.database.jdbc - ojdbc8 + mysql + mysql-connector-java diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysClientController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysClientController.java index 55fb5396b..5c2564ee5 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysClientController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysClientController.java @@ -125,4 +125,14 @@ public class SysClientController { return R.ok(clientDetailsService.list()); } + /** + * 同步缓存字典 + * @return R + */ + @SysLog("同步终端") + @PutMapping("/sync") + public R sync() { + return clientDetailsService.syncClientCache(); + } + } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysPublicParamController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysPublicParamController.java index 149855043..307a4e9a7 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysPublicParamController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysPublicParamController.java @@ -125,7 +125,7 @@ public class SysPublicParamController { @SysLog("同步参数") @PutMapping("/sync") public R sync() { - return sysPublicParamService.syncDictCache(); + return sysPublicParamService.syncParamCache(); } } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysOauthClientDetailsService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysOauthClientDetailsService.java index d56fa4962..bf46c5152 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysOauthClientDetailsService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysOauthClientDetailsService.java @@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.pig4cloud.pigx.admin.api.dto.SysOauthClientDetailsDTO; import com.pig4cloud.pigx.admin.api.entity.SysOauthClientDetails; +import com.pig4cloud.pigx.common.core.util.R; /** *

@@ -63,4 +64,10 @@ public interface SysOauthClientDetailsService extends IService { * 同步缓存 * @return R */ - R syncDictCache(); + R syncParamCache(); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysOauthClientDetailsServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysOauthClientDetailsServiceImpl.java index 0cd065123..a37f93c1b 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysOauthClientDetailsServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysOauthClientDetailsServiceImpl.java @@ -31,6 +31,7 @@ import com.pig4cloud.pigx.admin.mapper.SysOauthClientDetailsMapper; import com.pig4cloud.pigx.admin.service.SysOauthClientDetailsService; import com.pig4cloud.pigx.common.core.constant.CacheConstants; import com.pig4cloud.pigx.common.core.constant.CommonConstants; +import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.core.util.SpringContextHolder; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; @@ -151,4 +152,10 @@ public class SysOauthClientDetailsServiceImpl extends ServiceImpl