From 82d43987d5d87dde4318340a1755c572731b807c Mon Sep 17 00:00:00 2001 From: Yen Date: Tue, 27 Sep 2022 17:22:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9mssql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qms/controller/QmsGroupController.java | 20 ++++++------------- .../modules/qms/entity/QmsFormSubmit.java | 2 +- .../qs/serve/modules/qms/entity/QmsGroup.java | 4 ++-- .../modules/qms/entity/QmsGroupScope.java | 2 +- .../modules/qms/entity/bo/QmsSubmitBo.java | 2 +- .../qms/service/QmsGroupScopeService.java | 10 +++++----- .../impl/QmsGroupScopeServiceImpl.java | 10 +++++----- 7 files changed, 21 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/qms/controller/QmsGroupController.java b/src/main/java/com/qs/serve/modules/qms/controller/QmsGroupController.java index 3c5ac615..0b80c4a2 100644 --- a/src/main/java/com/qs/serve/modules/qms/controller/QmsGroupController.java +++ b/src/main/java/com/qs/serve/modules/qms/controller/QmsGroupController.java @@ -8,10 +8,7 @@ import com.qs.serve.common.model.dto.R; import com.qs.serve.common.model.dto.SimpleKeyValue; import com.qs.serve.common.model.enums.BizType; import com.qs.serve.common.model.enums.SystemModule; -import com.qs.serve.common.util.CollectionUtil; -import com.qs.serve.common.util.CopierUtil; -import com.qs.serve.common.util.PageUtil; -import com.qs.serve.common.util.StringUtils; +import com.qs.serve.common.util.*; import com.qs.serve.modules.qms.entity.QmsForm; import com.qs.serve.modules.qms.entity.QmsGroupScope; import com.qs.serve.modules.qms.entity.bo.QmsGroupBo; @@ -138,7 +135,7 @@ public class QmsGroupController { @LimitSubmit @GetMapping("/publish/{groupId}") @SysLog(module = SystemModule.QUESTION, title = "发布组", biz = BizType.UPDATE) - public R publish(@PathVariable("groupId")Long groupId){ + public R publish(@PathVariable("groupId")String groupId){ QmsGroup qmsGroup = qmsGroupService.getById(groupId); if(qmsGroup.getPublishState().equals(1)){ return R.error("请勿重新发布"); @@ -232,17 +229,12 @@ public class QmsGroupController { public R save(@RequestBody @Valid QmsGroupBo param){ QmsGroup qmsGroup = CopierUtil.copy(param,new QmsGroup()); QmsForm qmsForm = qmsFormService.getById(qmsGroup.getFormId()); + qmsGroup.setId(IdUtil.getSnowFlakeId()+""); qmsGroup.setFormContext(qmsForm.getFormContext()); qmsGroup.setVersion(qmsForm.getVersion()); qmsGroup.setPublishState(0); - try { - qmsGroupService.save(qmsGroup); - } catch (Exception e) { - } - try { - qmsGroupScopeService.saveByBo(qmsGroup.getId(),param); - } catch (Exception e) { - } + qmsGroupService.save(qmsGroup); + qmsGroupScopeService.saveByBo(qmsGroup.getId(),param); return R.ok(); } @@ -254,7 +246,7 @@ public class QmsGroupController { @DeleteMapping("/deleteById/{id}") @SysLog(module = SystemModule.QUESTION, title = "发布组", biz = BizType.DELETE) @PreAuthorize("hasRole('qms:group:delete')") - public R deleteById(@PathVariable("id") Long id){ + public R deleteById(@PathVariable("id") String id){ qmsGroupService.removeById(id); qmsGroupScopeService.removeByGroupId(id); return R.ok(); diff --git a/src/main/java/com/qs/serve/modules/qms/entity/QmsFormSubmit.java b/src/main/java/com/qs/serve/modules/qms/entity/QmsFormSubmit.java index 12fd13b8..1ff78437 100644 --- a/src/main/java/com/qs/serve/modules/qms/entity/QmsFormSubmit.java +++ b/src/main/java/com/qs/serve/modules/qms/entity/QmsFormSubmit.java @@ -44,7 +44,7 @@ public class QmsFormSubmit implements Serializable { private Long categoryId; /** 表单id */ - private Long groupId; + private String groupId; private Long fromId; diff --git a/src/main/java/com/qs/serve/modules/qms/entity/QmsGroup.java b/src/main/java/com/qs/serve/modules/qms/entity/QmsGroup.java index 5f117ef5..5a0af683 100644 --- a/src/main/java/com/qs/serve/modules/qms/entity/QmsGroup.java +++ b/src/main/java/com/qs/serve/modules/qms/entity/QmsGroup.java @@ -32,8 +32,8 @@ public class QmsGroup implements Serializable { private static final long serialVersionUID = 1L; /** id */ - @TableId(type = IdType.AUTO) - private Long id; + @TableId(type = IdType.INPUT) + private String id; /** 标题 */ @NotBlank(message = "标题不能为空") diff --git a/src/main/java/com/qs/serve/modules/qms/entity/QmsGroupScope.java b/src/main/java/com/qs/serve/modules/qms/entity/QmsGroupScope.java index bdd1ea7b..dbc1efa9 100644 --- a/src/main/java/com/qs/serve/modules/qms/entity/QmsGroupScope.java +++ b/src/main/java/com/qs/serve/modules/qms/entity/QmsGroupScope.java @@ -30,7 +30,7 @@ public class QmsGroupScope implements Serializable { private Long id; /** */ - private Long groupId; + private String groupId; /** 适用范围 0-所有人可见；1-人员可见；2-部门可见;3-部门的人员ID；4-所有的人员ID */ private Integer scopeType; diff --git a/src/main/java/com/qs/serve/modules/qms/entity/bo/QmsSubmitBo.java b/src/main/java/com/qs/serve/modules/qms/entity/bo/QmsSubmitBo.java index 557a16c3..e36fca90 100644 --- a/src/main/java/com/qs/serve/modules/qms/entity/bo/QmsSubmitBo.java +++ b/src/main/java/com/qs/serve/modules/qms/entity/bo/QmsSubmitBo.java @@ -13,7 +13,7 @@ public class QmsSubmitBo { private Long id; /** 表单id */ - private Long groupId; + private String groupId; /** 表单版本 */ private Integer version; diff --git a/src/main/java/com/qs/serve/modules/qms/service/QmsGroupScopeService.java b/src/main/java/com/qs/serve/modules/qms/service/QmsGroupScopeService.java index 16e0b106..558abed6 100644 --- a/src/main/java/com/qs/serve/modules/qms/service/QmsGroupScopeService.java +++ b/src/main/java/com/qs/serve/modules/qms/service/QmsGroupScopeService.java @@ -14,10 +14,10 @@ import java.util.List; public interface QmsGroupScopeService extends IService { - List listByGroupId(Long groupId); - QmsGroupScope getByGroupAndUid(Long groupId,String userId); - void removeByGroupId(Long groupId); - void saveByBo(Long groupId,QmsGroupBo groupBo); - void publish(Long groupId); + List listByGroupId(String groupId); + QmsGroupScope getByGroupAndUid(String groupId,String userId); + void removeByGroupId(String groupId); + void saveByBo(String groupId,QmsGroupBo groupBo); + void publish(String groupId); } diff --git a/src/main/java/com/qs/serve/modules/qms/service/impl/QmsGroupScopeServiceImpl.java b/src/main/java/com/qs/serve/modules/qms/service/impl/QmsGroupScopeServiceImpl.java index 0c29796f..d06c09a3 100644 --- a/src/main/java/com/qs/serve/modules/qms/service/impl/QmsGroupScopeServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/qms/service/impl/QmsGroupScopeServiceImpl.java @@ -41,14 +41,14 @@ public class QmsGroupScopeServiceImpl extends ServiceImpl listByGroupId(Long groupId) { + public List listByGroupId(String groupId) { LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); lqw.eq(QmsGroupScope::getGroupId,groupId); return this.list(lqw); } @Override - public QmsGroupScope getByGroupAndUid(Long groupId, String userId) { + public QmsGroupScope getByGroupAndUid(String groupId, String userId) { LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); lqw.eq(QmsGroupScope::getGroupId,groupId); lqw.eq(QmsGroupScope::getScopeValue,userId); @@ -58,14 +58,14 @@ public class QmsGroupScopeServiceImpl extends ServiceImpl lqw = new LambdaQueryWrapper<>(); lqw.eq(QmsGroupScope::getGroupId,groupId); this.remove(lqw); } @Override - public void saveByBo(Long groupId,QmsGroupBo groupBo) { + public void saveByBo(String groupId,QmsGroupBo groupBo) { if((groupBo.getScopeType()==null||groupId==null)&& CollectionUtil.isNotEmpty(groupBo.getScopeValue())){ Assert.throwEx("参数异常"); } @@ -96,7 +96,7 @@ public class QmsGroupScopeServiceImpl extends ServiceImpl qmsGroupScopeList = this.listByGroupId(groupId); List list = new ArrayList<>();