Merge branch 'system-zyj' of uskycloud/usky-cloud into system-165

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/domain/SysNotice.java

@@ -2,6 +2,7 @@ package com.usky.system.domain;
 
 
 import com.usky.common.core.bean.BaseEntity;
+import io.swagger.models.auth.In;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -19,7 +20,7 @@ public class SysNotice extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 公告ID */
-    private Long noticeId;
+    private Integer noticeId;
 
     /** 公告标题 */
     private String noticeTitle;
@@ -33,12 +34,12 @@ public class SysNotice extends BaseEntity
     /** 公告状态（0正常 1关闭） */
     private String status;
 
-    public Long getNoticeId()
+    public Integer getNoticeId()
     {
         return noticeId;
     }
 
-    public void setNoticeId(Long noticeId)
+    public void setNoticeId(Integer noticeId)
     {
         this.noticeId = noticeId;
     }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/MceSettingServiceImpl.java

@@ -34,6 +34,16 @@ public class MceSettingServiceImpl extends AbstractCrudService<MceSettingMapper,
     @Override
     public void add(MceSetting mceSetting){
         if (mceSetting.getId().equals(0)){
+            if(StringUtils.isBlank(mceSetting.getAppMode())){
+                mceSetting.setAppMode("{\"1\":true,\"2\":true,\"3\":true,\"4\":true}");
+            }
+            if(StringUtils.isBlank(mceSetting.getPcMode())){
+                mceSetting.setPcMode("{\"1\":true,\"2\":true,\"3\":true,\"4\":true}");
+            }
+            if(StringUtils.isBlank(mceSetting.getWcMode())){
+                mceSetting.setWcMode("{\"1\":true,\"2\":true,\"3\":true,\"4\":true}");
+            }
+
             mceSetting.setCreateBy(SecurityUtils.getUsername());
             mceSetting.setCreateTime(LocalDateTime.now());
             mceSetting.setTenantId(SecurityUtils.getTenantId());

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysNoticeServiceImpl.java

@@ -62,7 +62,8 @@ public class SysNoticeServiceImpl extends AbstractCrudService<SysNoticeMapper, S
     @Override
     public int insertNotice(SysNotice notice)
     {
-        int insertId = noticeMapper.insertNotice(notice);
+        noticeMapper.insertNotice(notice);
+        int insertId = notice.getNoticeId();
         JsonObject jsonObject = new JsonObject();
         jsonObject.addProperty("infoTitle", notice.getNoticeTitle());
         jsonObject.addProperty("infoContent",notice.getNoticeContent());

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysNoticeMapper.xml

@@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by notice_id desc
     </select>
     
-    <insert id="insertNotice" parameterType="com.usky.system.domain.SysNotice">
+    <insert id="insertNotice" useGeneratedKeys="true" keyProperty="noticeId"  parameterType="com.usky.system.domain.SysNotice">
         insert into sys_notice (
 			<if test="noticeTitle != null and noticeTitle != '' ">notice_title, </if>
 			<if test="noticeType != null and noticeType != '' ">notice_type, </if>