帮助修改

adminapi/src/main/java/tech/glinfo/enbao/modules/sys/controller/HelpCenterController.java

 package tech.glinfo.enbao.modules.sys.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import tech.glinfo.enbao.common.utils.PageUtils;
@@ -12,9 +13,7 @@ import tech.glinfo.enbao.modules.sys.form.HelpCenterForm;
 import tech.glinfo.enbao.modules.sys.service.HelpCenterContentService;
 import tech.glinfo.enbao.modules.sys.service.HelpCenterService;
 
-import java.util.Arrays;
-import java.util.Map;
-
+import java.util.*;
 
 
 /**
@@ -32,11 +31,12 @@ public class HelpCenterController {
 
     @Autowired
     private HelpCenterContentService helpCenterContentService;
+
     /**
      * 列表
      */
     @RequestMapping("/list")
-    public R list(@RequestParam Map<String, Object> params){
+    public R list(@RequestParam Map<String, Object> params) {
         PageUtils page = helpCenterService.queryPage(params);
 
         return R.ok().put("page", page);
@@ -47,17 +47,29 @@ public class HelpCenterController {
      * 信息
      */
     @RequestMapping("/info/{id}")
-    public R info(@PathVariable("id") Integer id){
+    public R info(@PathVariable("id") Integer id) {
         HelpCenterEntity helpCenter = helpCenterService.getById(id);
+        List<HelpCenterContentEntity> list = helpCenterContentService.list(new QueryWrapper<HelpCenterContentEntity>().eq("help_id", helpCenter.getId()));
+        List<Map<String, Object>> mapList = new ArrayList<>();
+        for (HelpCenterContentEntity content : list) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("type", content.getType());
+            if (content.getType().equals("img")) {
+                map.put("content", content.getContent().split(","));
+            } else {
+                map.put("content", content.getContent());
+            }
+            mapList.add(map);
+        }
 
-        return R.ok().put("helpCenter", helpCenter);
+        return R.ok().put("helpCenter", helpCenter).put("mapList", mapList);
     }
 
     /**
      * 保存
      */
     @RequestMapping("/save")
-    public R save(@RequestBody HelpCenterForm form){
+    public R save(@RequestBody HelpCenterForm form) {
         HelpCenterEntity helpCenter = new HelpCenterEntity();
         helpCenter.setTitle(form.getTitle());
         helpCenterService.save(helpCenter);
@@ -75,9 +87,19 @@ public class HelpCenterController {
      * 修改
      */
     @RequestMapping("/update")
-    public R update(@RequestBody HelpCenterEntity helpCenter){
+    public R update(@RequestBody HelpCenterForm form) {
+        HelpCenterEntity helpCenter = new HelpCenterEntity();
+        helpCenter.setId(form.getId());
+        helpCenter.setTitle(form.getTitle());
         helpCenterService.updateById(helpCenter);
-
+        helpCenterContentService.remove(new QueryWrapper<HelpCenterContentEntity>().eq("help_id", form.getId()));
+        for (HelpCenterContentForm content : form.getContents()) {
+            HelpCenterContentEntity contentEntity = new HelpCenterContentEntity();
+            contentEntity.setHelpId(helpCenter.getId());
+            contentEntity.setType(content.getType());
+            contentEntity.setContent(content.getContent());
+            helpCenterContentService.save(contentEntity);
+        }
         return R.ok();
     }
 
@@ -85,7 +107,7 @@ public class HelpCenterController {
      * 删除
      */
     @RequestMapping("/delete")
-    public R delete(@RequestBody Integer[] ids){
+    public R delete(@RequestBody Integer[] ids) {
         helpCenterService.removeByIds(Arrays.asList(ids));
 
         return R.ok();

adminapi/src/main/java/tech/glinfo/enbao/modules/sys/form/HelpCenterForm.java

@@ -11,6 +11,7 @@ import java.util.List;
 @Data
 public class HelpCenterForm {
 
+    private Integer id;
 
     private String title;
 

appapi/src/main/java/tech/glinfo/enbao/modules/sh/dao/OtherShFamilyDao.java

@@ -28,7 +28,7 @@ public interface OtherShFamilyDao extends BaseMapper<ShFamilyEntity> {
     void delete(Integer id);
 
     @Select("<script>" +
-            "SELECT a.id, a.name, (SELECT COUNT(c.id) FROM sh_family_room c WHERE a.id = c.family_id) room FROM sh_family a ,sh_family_member b WHERE a.id = b.family_id AND b.user_id = ${userId}" +
+            "SELECT a.id, a.name, b.is_admin isAdmin, (SELECT COUNT(c.id) FROM sh_family_room c WHERE a.id = c.family_id) room FROM sh_family a ,sh_family_member b WHERE a.id = b.family_id AND b.user_id = ${userId}" +
             " </script>")
     List<Map<String, Object>> list(Integer userId);