兼容mssql

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.*;
-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.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);
-            qmsGroupService.save(qmsGroup);
+        qmsGroupScopeService.saveByBo(qmsGroup.getId(),param);
-        } catch (Exception e) {
-        }
-        try {
-            qmsGroupScopeService.saveByBo(qmsGroup.getId(),param);
-        } catch (Exception e) {
-        }
         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();

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;
 

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)
+    @TableId(type = IdType.INPUT)
-    private Long id;
+    private String id;
 
     /** 标题 */
     @NotBlank(message = "标题不能为空")

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;

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;

src/main/java/com/qs/serve/modules/qms/service/QmsGroupScopeService.java

@@ -14,10 +14,10 @@ import java.util.List;
 public interface QmsGroupScopeService extends IService<QmsGroupScope> {
 
 
-    List<QmsGroupScope> listByGroupId(Long groupId);
+    List<QmsGroupScope> listByGroupId(String groupId);
-    QmsGroupScope getByGroupAndUid(Long groupId,String userId);
+    QmsGroupScope getByGroupAndUid(String groupId,String userId);
-    void removeByGroupId(Long groupId);
+    void removeByGroupId(String groupId);
-    void saveByBo(Long groupId,QmsGroupBo groupBo);
+    void saveByBo(String groupId,QmsGroupBo groupBo);
-    void publish(Long groupId);
+    void publish(String groupId);
 }
 

src/main/java/com/qs/serve/modules/qms/service/impl/QmsGroupScopeServiceImpl.java

@@ -41,14 +41,14 @@ public class QmsGroupScopeServiceImpl extends ServiceImpl<QmsGroupScopeMapper,Qm
     WxPushService wxPushService;
 
     @Override
-    public List<QmsGroupScope> listByGroupId(Long groupId) {
+    public List<QmsGroupScope> listByGroupId(String groupId) {
         LambdaQueryWrapper<QmsGroupScope> 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<QmsGroupScope> lqw = new LambdaQueryWrapper<>();
         lqw.eq(QmsGroupScope::getGroupId,groupId);
         lqw.eq(QmsGroupScope::getScopeValue,userId);
@@ -58,14 +58,14 @@ public class QmsGroupScopeServiceImpl extends ServiceImpl<QmsGroupScopeMapper,Qm
     }
 
     @Override
-    public void removeByGroupId(Long groupId) {
+    public void removeByGroupId(String groupId) {
         LambdaQueryWrapper<QmsGroupScope> 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<QmsGroupScopeMapper,Qm
     }
 
     @Override
-    public void publish(Long groupId) {
+    public void publish(String groupId) {
         QmsGroup qmsGroup = qmsGroupService.getById(groupId);
         List<QmsGroupScope> qmsGroupScopeList = this.listByGroupId(groupId);
         List<QmsGroupScope> list = new ArrayList<>();