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

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

@@ -1,6 +1,7 @@
 package com.usky.system.service.impl;
 
 
+import com.google.gson.JsonObject;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.iot.RemoteMceService;
@@ -62,12 +63,12 @@ public class SysNoticeServiceImpl extends AbstractCrudService<SysNoticeMapper, S
     public int insertNotice(SysNotice notice)
     {
         int insertId = noticeMapper.insertNotice(notice);
-        Map<String, Object> map = new HashMap<>();
-        map.put("infoTitle", notice.getNoticeTitle());
-        map.put("infoContent",notice.getNoticeContent());
-        map.put("infoType",1);
-        map.put("id",insertId);
-        ApiResult<Void> resultMce = remoteMceService.addMce(map.toString());
+        JsonObject jsonObject = new JsonObject();
+        jsonObject.addProperty("infoTitle", notice.getNoticeTitle());
+        jsonObject.addProperty("infoContent",notice.getNoticeContent());
+        jsonObject.addProperty("infoType",1);
+        jsonObject.addProperty("id",insertId);
+        ApiResult<Void> resultMce = remoteMceService.addMce(jsonObject.toString());
         return insertId;
     }
 

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

@@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and status = 0
             </if>
             <if test="noticeId != null and noticeId != ''">
-                AND noticeId = #{noticeId}
+                AND notice_id = #{noticeId}
             </if>
 		</where>
         order by notice_id desc
@@ -88,8 +88,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <delete id="deleteNoticeByIds" parameterType="Long">
         delete from sys_notice where notice_id in 
-        <foreach item="noticeId" collection="array" open="(" separator="," close=")">
-            #{noticeId}
+        <foreach item="noticeIds" collection="param1" open="(" separator="," close=")">
+            #{noticeIds}
         </foreach>
     </delete>