意见反馈、帮助中心、商务合作

adminapi/src/main/java/tech/glinfo/enbao/common/utils/NumberingUtils.java

@@ -28,7 +28,7 @@ public class NumberingUtils {
             format2.append("0");
         }
         format2.append(format1);
-        String numbering = redisUtils.get(format2.toString() + type);
+        String numbering = redisUtils.get("GL:" + format2.toString() + type);
         int numbering1;
         if (numbering == null) {
             numbering1 = 1;
@@ -42,7 +42,7 @@ public class NumberingUtils {
             }
             StringBuffer sb = new StringBuffer();
             sb.append(type);
-            sb.append("EB");
+            sb.append("GL");
 
             sb.append(format2.toString());
             sb.append(String.format("%05d", numbering1));
@@ -52,7 +52,7 @@ public class NumberingUtils {
             set.add(map);
             numbering1 ++;
         }
-        redisUtils.set(format2.toString() + type, numbering1, 60 * 60 * 24 * 7);
+        redisUtils.set("GL:" + format2.toString() + type, numbering1, 60 * 60 * 24 * 7);
 
         return set;
     }

adminapi/src/main/java/tech/glinfo/enbao/modules/oss/controller/SysOssController.java

@@ -158,6 +158,23 @@ public class SysOssController {
 	}
 
 
+	/**
+	 * 上传文件
+	 */
+	@PostMapping("/uploadPic")
+	public R uploadPic(@RequestParam("file") MultipartFile file) throws Exception {
+		if (file.isEmpty()) {
+			throw new RRException("上传文件不能为空");
+		}
+		String url = null;
+
+		//上传文件
+		String suffix = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
+		url = OSSFactory.build().uploadSuffix(file.getBytes(), suffix);
+
+		return R.ok().put("url", url).put("name", file.getOriginalFilename());
+	}
+
 	/**
 	 * 删除
 	 */

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

+package tech.glinfo.enbao.modules.sys.controller;
+
+import java.util.Arrays;
+import java.util.Map;
+
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import tech.glinfo.enbao.modules.sys.entity.BusinessCooperationEntity;
+import tech.glinfo.enbao.modules.sys.service.BusinessCooperationService;
+import tech.glinfo.enbao.common.utils.PageUtils;
+import tech.glinfo.enbao.common.utils.R;
+
+
+
+/**
+ * 商务合作
+ *
+ * @author linyetong
+ * @email linyetong@glinfo.com
+ * @date 2022-02-14 16:39:15
+ */
+@RestController
+@RequestMapping("sys/businesscooperation")
+public class BusinessCooperationController {
+    @Autowired
+    private BusinessCooperationService businessCooperationService;
+
+    /**
+     * 列表
+     */
+    @RequestMapping("/list")
+    public R list(@RequestParam Map<String, Object> params){
+        PageUtils page = businessCooperationService.queryPage(params);
+
+        return R.ok().put("page", page);
+    }
+
+
+    /**
+     * 信息
+     */
+    @RequestMapping("/info/{id}")
+    public R info(@PathVariable("id") Integer id){
+		BusinessCooperationEntity businessCooperation = businessCooperationService.getById(id);
+
+        return R.ok().put("businessCooperation", businessCooperation);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    public R save(@RequestBody BusinessCooperationEntity businessCooperation){
+		businessCooperationService.save(businessCooperation);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    public R update(@RequestBody BusinessCooperationEntity businessCooperation){
+		businessCooperationService.updateById(businessCooperation);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    public R delete(@RequestBody Integer[] ids){
+		businessCooperationService.removeByIds(Arrays.asList(ids));
+
+        return R.ok();
+    }
+
+}

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

+package tech.glinfo.enbao.modules.sys.controller;
+
+import java.util.Arrays;
+import java.util.Map;
+
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import tech.glinfo.enbao.modules.sys.entity.FeedBackEntity;
+import tech.glinfo.enbao.modules.sys.service.FeedBackService;
+import tech.glinfo.enbao.common.utils.PageUtils;
+import tech.glinfo.enbao.common.utils.R;
+
+
+
+/**
+ * 意见反馈
+ *
+ * @author linyetong
+ * @email linyetong@glinfo.com
+ * @date 2022-02-14 16:39:15
+ */
+@RestController
+@RequestMapping("sys/feedback")
+public class FeedBackController {
+    @Autowired
+    private FeedBackService feedBackService;
+
+    /**
+     * 列表
+     */
+    @RequestMapping("/list")
+    public R list(@RequestParam Map<String, Object> params){
+        PageUtils page = feedBackService.queryPage(params);
+
+        return R.ok().put("page", page);
+    }
+
+
+    /**
+     * 信息
+     */
+    @RequestMapping("/info/{id}")
+    public R info(@PathVariable("id") Integer id){
+		FeedBackEntity feedBack = feedBackService.getById(id);
+
+        return R.ok().put("feedBack", feedBack);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    public R save(@RequestBody FeedBackEntity feedBack){
+		feedBackService.save(feedBack);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    public R update(@RequestBody FeedBackEntity feedBack){
+		feedBackService.updateById(feedBack);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    public R delete(@RequestBody Integer[] ids){
+		feedBackService.removeByIds(Arrays.asList(ids));
+
+        return R.ok();
+    }
+
+}

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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import tech.glinfo.enbao.common.utils.PageUtils;
+import tech.glinfo.enbao.common.utils.R;
+import tech.glinfo.enbao.modules.sys.entity.HelpCenterContentEntity;
+import tech.glinfo.enbao.modules.sys.entity.HelpCenterEntity;
+import tech.glinfo.enbao.modules.sys.form.HelpCenterContentForm;
+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;
+
+
+
+/**
+ * 帮助中心
+ *
+ * @author linyetong
+ * @email linyetong@glinfo.com
+ * @date 2022-02-14 16:39:15
+ */
+@RestController
+@RequestMapping("sys/helpcenter")
+public class HelpCenterController {
+    @Autowired
+    private HelpCenterService helpCenterService;
+
+    @Autowired
+    private HelpCenterContentService helpCenterContentService;
+    /**
+     * 列表
+     */
+    @RequestMapping("/list")
+    public R list(@RequestParam Map<String, Object> params){
+        PageUtils page = helpCenterService.queryPage(params);
+
+        return R.ok().put("page", page);
+    }
+
+
+    /**
+     * 信息
+     */
+    @RequestMapping("/info/{id}")
+    public R info(@PathVariable("id") Integer id){
+		HelpCenterEntity helpCenter = helpCenterService.getById(id);
+
+        return R.ok().put("helpCenter", helpCenter);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    public R save(@RequestBody HelpCenterForm form){
+        HelpCenterEntity helpCenter = new HelpCenterEntity();
+        helpCenter.setTitle(form.getTitle());
+		helpCenterService.save(helpCenter);
+        for (HelpCenterContentForm content : form.getContents()) {
+            HelpCenterContentEntity contentEntity = new HelpCenterContentEntity();
+            contentEntity.setHelpId(helpCenter.getId());
+            contentEntity.setContent(JSON.toJSONString(content));
+            helpCenterContentService.save(contentEntity);
+        }
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    public R update(@RequestBody HelpCenterEntity helpCenter){
+		helpCenterService.updateById(helpCenter);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    public R delete(@RequestBody Integer[] ids){
+		helpCenterService.removeByIds(Arrays.asList(ids));
+
+        return R.ok();
+    }
+
+}

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

@@ -74,16 +74,9 @@ public class SysLoginController extends AbstractController {
         SysUserEntity user = sysUserService.queryByUserName(form.getUsername());
 
         if (user != null) {
-            if (user.getType() == 1) {
-                //账号不存在、密码错误
-                if (!user.getPassword().equals(new Sha256Hash(form.getPassword(), user.getSalt()).toHex())) {
-                    return R.error("账号或密码不正确");
-                }
-            } else {
-                //账号不存在、密码错误
-                if (!user.getPassword().equals(DigestUtils.sha256Hex(form.getPassword()))) {
-                    return R.error("账号或密码不正确");
-                }
+            //账号不存在、密码错误
+            if (!user.getPassword().equals(new Sha256Hash(form.getPassword(), user.getSalt()).toHex())) {
+                return R.error("账号或密码不正确");
             }
         } else {
             return R.error("账号不存在");

adminapi/src/main/java/tech/glinfo/enbao/modules/sys/entity/SysUserEntity.java

@@ -71,10 +71,6 @@ public class SysUserEntity implements Serializable {
 	 */
 	private Integer status;
 
-	/**
-	 * 类型  1：后台管理员   2：商家  3：接单人
-	 */
-	private Integer type;
 
 	/**
 	 * 角色ID列表

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

+package tech.glinfo.enbao.modules.sys.form;
+
+import lombok.Data;
+
+/**
+ * @author lyt
+ * @date 2022/2/14 18:01
+ */
+@Data
+public class HelpCenterContentForm {
+
+    private String type;
+
+    private String content;
+}

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

+package tech.glinfo.enbao.modules.sys.form;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author lyt
+ * @date 2022/2/14 18:01
+ */
+@Data
+public class HelpCenterForm {
+
+
+    private String title;
+
+    private List<HelpCenterContentForm> contents;
+}

appapi/src/main/java/tech/glinfo/enbao/modules/sh/controller/ShFamilyMemberController.java

@@ -51,6 +51,10 @@ public class ShFamilyMemberController {
     @ApiLog("删除")
     public R delete(@RequestBody Map<String, Object> params) {
         Integer id = (Integer) params.get("id");
+        ShFamilyMemberEntity member = shFamilyMemberService.getById(id);
+        if (member.getIsAdmin() == 1) {
+            return R.error("不能删除管理员");
+        }
         shFamilyMemberService.removeById(id);
         return R.ok();
     }

appapi/src/main/java/tech/glinfo/enbao/modules/sh/service/impl/OtherShDeviceServiceImpl.java

@@ -3,28 +3,26 @@ package tech.glinfo.enbao.modules.sh.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.apache.commons.beanutils.BeanUtils;
 import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import tech.glinfo.enbao.common.utils.*;
+import tech.glinfo.enbao.common.utils.R;
+import tech.glinfo.enbao.common.utils.RedisUtils;
+import tech.glinfo.enbao.common.utils.StringUtils;
 import tech.glinfo.enbao.modules.appuser.entity.AppUserEntity;
 import tech.glinfo.enbao.modules.service.BaiduApiService;
 import tech.glinfo.enbao.modules.sh.dao.OtherShDeviceDao;
 import tech.glinfo.enbao.modules.sh.entity.ShDeviceDataEntity;
 import tech.glinfo.enbao.modules.sh.entity.ShDeviceEntity;
 import tech.glinfo.enbao.modules.sh.entity.ShInstructionParsingEntity;
-import tech.glinfo.enbao.modules.sh.entity.ShProductEntity;
-import tech.glinfo.enbao.modules.sh.form.ShDeviceForm;
 import tech.glinfo.enbao.modules.sh.service.OtherShDeviceService;
 import tech.glinfo.enbao.modules.sh.service.ShDeviceDataService;
 import tech.glinfo.enbao.modules.sh.service.ShInstructionParsingService;
-import tech.glinfo.enbao.modules.sh.service.ShProductService;
 
-import java.lang.reflect.InvocationTargetException;
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Service("otherShDeviceService")
 public class OtherShDeviceServiceImpl extends ServiceImpl<OtherShDeviceDao, ShDeviceEntity> implements OtherShDeviceService {

appapi/src/main/java/tech/glinfo/enbao/modules/sys/controller/BusinessCooperationController.java

+package tech.glinfo.enbao.modules.sys.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.beanutils.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import tech.glinfo.enbao.common.annotation.ApiLog;
+import tech.glinfo.enbao.common.utils.R;
+import tech.glinfo.enbao.common.validator.ValidatorUtils;
+import tech.glinfo.enbao.modules.sys.entity.BusinessCooperationEntity;
+import tech.glinfo.enbao.modules.sys.form.BusinessCooperationForm;
+import tech.glinfo.enbao.modules.sys.service.BusinessCooperationService;
+
+import java.lang.reflect.InvocationTargetException;
+
+/**
+ * @author lyt
+ * @date 2022/2/14 17:06
+ */
+@RestController
+@RequestMapping("/sys/businessCooperation")
+@Api(value = "商务合作")
+public class BusinessCooperationController {
+
+    @Autowired
+    private BusinessCooperationService businessCooperationService;
+
+    @PostMapping("save")
+    @ApiOperation("商务合作")
+    @ApiLog("商务合作")
+    public R save(@RequestBody BusinessCooperationForm form) throws InvocationTargetException, IllegalAccessException {
+
+        //表单校验
+        ValidatorUtils.validateEntity(form);
+
+        BusinessCooperationEntity entity = new BusinessCooperationEntity();
+        BeanUtils.copyProperties(entity, form);
+        businessCooperationService.save(entity);
+        return R.ok();
+    }
+}

appapi/src/main/java/tech/glinfo/enbao/modules/sys/controller/FeedBackController.java

+package tech.glinfo.enbao.modules.sys.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.beanutils.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import tech.glinfo.enbao.common.annotation.ApiLog;
+import tech.glinfo.enbao.common.utils.R;
+import tech.glinfo.enbao.common.validator.ValidatorUtils;
+import tech.glinfo.enbao.modules.sys.entity.FeedBackEntity;
+import tech.glinfo.enbao.modules.sys.form.FeedBackForm;
+import tech.glinfo.enbao.modules.sys.service.FeedBackService;
+
+import java.lang.reflect.InvocationTargetException;
+
+/**
+ * @author lyt
+ * @date 2022/2/14 17:06
+ */
+@RestController
+@RequestMapping("/sys/feedBack")
+@Api(value = "意见反馈")
+public class FeedBackController {
+
+    @Autowired
+    private FeedBackService feedBackService;
+
+    @PostMapping("save")
+    @ApiOperation("意见反馈")
+    @ApiLog("意见反馈")
+    public R save(@RequestBody FeedBackForm form) throws InvocationTargetException, IllegalAccessException {
+
+        //表单校验
+        ValidatorUtils.validateEntity(form);
+
+        FeedBackEntity entity = new FeedBackEntity();
+        BeanUtils.copyProperties(entity, form);
+        feedBackService.save(entity);
+        return R.ok();
+    }
+}

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

+package tech.glinfo.enbao.modules.sys.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import tech.glinfo.enbao.common.utils.R;
+import tech.glinfo.enbao.modules.sys.entity.HelpCenterContentEntity;
+import tech.glinfo.enbao.modules.sys.service.HelpCenterContentService;
+import tech.glinfo.enbao.modules.sys.service.HelpCenterService;
+
+/**
+ * @author lyt
+ * @date 2022/2/14 18:07
+ */
+@RestController
+@RequestMapping("/sys/helpCenter")
+@Api(value = "帮助中心")
+public class HelpCenterController {
+
+    @Autowired
+    private HelpCenterService helpCenterService;
+
+    @Autowired
+    private HelpCenterContentService helpCenterContentService;
+
+    /**
+     * 列表
+     */
+    @GetMapping("/list")
+    @ApiOperation("帮助中心")
+    public R list(){
+
+        return R.ok().put("list", helpCenterService.list());
+    }
+
+
+    /**
+     * 详情
+     */
+    @GetMapping("/info/{id}")
+    @ApiOperation("帮助中心")
+    public R info(@PathVariable("id") Integer id){
+
+        return R.ok().put("list", helpCenterContentService.list(new QueryWrapper<HelpCenterContentEntity>().eq("help_id", id)));
+    }
+}

appapi/src/main/java/tech/glinfo/enbao/modules/sys/form/BusinessCooperationForm.java

+package tech.glinfo.enbao.modules.sys.form;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author lyt
+ * @date 2022/2/14 17:11
+ */
+@Data
+public class BusinessCooperationForm {
+    /**
+     * 联系人
+     */
+    @ApiModelProperty(value = "联系人")
+    @NotNull(message="联系人不能为空")
+    private String name;
+    /**
+     * 联系电话
+     */
+    @ApiModelProperty(value = "联系电话")
+    @NotNull(message="联系电话不能为空")
+    private String phone;
+    /**
+     * 内容
+     */
+    @ApiModelProperty(value = "留言")
+    @NotNull(message="留言不能为空")
+    private String content;
+}

appapi/src/main/java/tech/glinfo/enbao/modules/sys/form/FeedBackForm.java

+package tech.glinfo.enbao.modules.sys.form;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 意见反馈
+ * 
+ * @author linyetong
+ * @email linyetong@glinfo.com
+ * @date 2022-02-14 16:39:15
+ */
+@Data
+public class FeedBackForm implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+
+	/**
+	 * 联系人
+	 */
+	@ApiModelProperty(value = "联系人")
+	@NotNull(message="联系人不能为空")
+	private String name;
+	/**
+	 * 联系电话
+	 */
+	@ApiModelProperty(value = "联系电话")
+	@NotNull(message="联系电话不能为空")
+	private String phone;
+	/**
+	 * 意见/建议内容
+	 */
+	@ApiModelProperty(value = "意见/建议内容")
+	@NotNull(message="意见/建议内容不能为空")
+	private String content;
+	/**
+	 * 反馈图片
+	 */
+	@ApiModelProperty(value = "反馈图片")
+	private String pic;
+
+
+}

common/src/main/java/tech/glinfo/enbao/modules/sys/dao/BusinessCooperationDao.java

+package tech.glinfo.enbao.modules.sys.dao;
+
+import tech.glinfo.enbao.modules.sys.entity.BusinessCooperationEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 商务合作
+ * 
+ * @author linyetong
+ * @email linyetong@glinfo.com
+ * @date 2022-02-14 16:39:15
+ */
+@Mapper
+public interface BusinessCooperationDao extends BaseMapper<BusinessCooperationEntity> {
+	
+}

common/src/main/java/tech/glinfo/enbao/modules/sys/dao/FeedBackDao.java

+package tech.glinfo.enbao.modules.sys.dao;
+
+import tech.glinfo.enbao.modules.sys.entity.FeedBackEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 意见反馈
+ * 
+ * @author linyetong
+ * @email linyetong@glinfo.com
+ * @date 2022-02-14 16:39:15
+ */
+@Mapper
+public interface FeedBackDao extends BaseMapper<FeedBackEntity> {
+	
+}

common/src/main/java/tech/glinfo/enbao/modules/sys/dao/HelpCenterContentDao.java

+package tech.glinfo.enbao.modules.sys.dao;
+
+import tech.glinfo.enbao.modules.sys.entity.HelpCenterContentEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 帮助中心内容
+ * 
+ * @author linyetong
+ * @email linyetong@glinfo.com
+ * @date 2022-02-14 17:23:29
+ */
+@Mapper
+public interface HelpCenterContentDao extends BaseMapper<HelpCenterContentEntity> {
+	
+}

common/src/main/java/tech/glinfo/enbao/modules/sys/dao/HelpCenterDao.java

+package tech.glinfo.enbao.modules.sys.dao;
+
+import tech.glinfo.enbao.modules.sys.entity.HelpCenterEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 帮助中心
+ * 
+ * @author linyetong
+ * @email linyetong@glinfo.com
+ * @date 2022-02-14 16:39:15
+ */
+@Mapper
+public interface HelpCenterDao extends BaseMapper<HelpCenterEntity> {
+	
+}

common/src/main/java/tech/glinfo/enbao/modules/sys/entity/BusinessCooperationEntity.java

+package tech.glinfo.enbao.modules.sys.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 商务合作
+ * 
+ * @author linyetong
+ * @email linyetong@glinfo.com
+ * @date 2022-02-14 16:39:15
+ */
+@Data
+@TableName("business_cooperation")
+public class BusinessCooperationEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键id
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 联系人
+	 */
+	private String name;
+	/**
+	 * 联系电话
+	 */
+	private String phone;
+	/**
+	 * 内容
+	 */
+	private String content;
+	/**
+	 * 创建时间
+	 */
+	private Date createTime;
+
+}

common/src/main/java/tech/glinfo/enbao/modules/sys/entity/FeedBackEntity.java

+package tech.glinfo.enbao.modules.sys.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 意见反馈
+ * 
+ * @author linyetong
+ * @email linyetong@glinfo.com
+ * @date 2022-02-14 16:39:15
+ */
+@Data
+@TableName("feed_back")
+public class FeedBackEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键id
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 联系人
+	 */
+	private String name;
+	/**
+	 * 联系电话
+	 */
+	private String phone;
+	/**
+	 * 意见/建议内容
+	 */
+	private String content;
+	/**
+	 * 反馈图片
+	 */
+	private String pic;
+	/**
+	 * 反馈时间
+	 */
+	private Date createTime;
+
+}

common/src/main/java/tech/glinfo/enbao/modules/sys/entity/HelpCenterContentEntity.java

+package tech.glinfo.enbao.modules.sys.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 帮助中心内容
+ * 
+ * @author linyetong
+ * @email linyetong@glinfo.com
+ * @date 2022-02-14 17:23:29
+ */
+@Data
+@TableName("help_center_content")
+public class HelpCenterContentEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键id
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 帮助中心ID
+	 */
+	private Integer helpId;
+	/**
+	 * 内容
+	 */
+	private String content;
+
+}

common/src/main/java/tech/glinfo/enbao/modules/sys/entity/HelpCenterEntity.java

+package tech.glinfo.enbao.modules.sys.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 帮助中心
+ * 
+ * @author linyetong
+ * @email linyetong@glinfo.com
+ * @date 2022-02-14 16:39:15
+ */
+@Data
+@TableName("help_center")
+public class HelpCenterEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键id
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 标题
+	 */
+	private String title;
+	/**
+	 * 创建时间
+	 */
+	private Date createTime;
+
+}

common/src/main/java/tech/glinfo/enbao/modules/sys/service/BusinessCooperationService.java

+package tech.glinfo.enbao.modules.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import tech.glinfo.enbao.common.utils.PageUtils;
+import tech.glinfo.enbao.modules.sys.entity.BusinessCooperationEntity;
+
+import java.util.Map;
+
+/**
+ * 商务合作
+ *
+ * @author linyetong
+ * @email linyetong@glinfo.com
+ * @date 2022-02-14 16:39:15
+ */
+public interface BusinessCooperationService extends IService<BusinessCooperationEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+}
+

common/src/main/java/tech/glinfo/enbao/modules/sys/service/FeedBackService.java

+package tech.glinfo.enbao.modules.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import tech.glinfo.enbao.common.utils.PageUtils;
+import tech.glinfo.enbao.modules.sys.entity.FeedBackEntity;
+
+import java.util.Map;
+
+/**
+ * 意见反馈
+ *
+ * @author linyetong
+ * @email linyetong@glinfo.com
+ * @date 2022-02-14 16:39:15
+ */
+public interface FeedBackService extends IService<FeedBackEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+}
+

common/src/main/java/tech/glinfo/enbao/modules/sys/service/HelpCenterContentService.java

+package tech.glinfo.enbao.modules.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import tech.glinfo.enbao.common.utils.PageUtils;
+import tech.glinfo.enbao.modules.sys.entity.HelpCenterContentEntity;
+
+import java.util.Map;
+
+/**
+ * 帮助中心内容
+ *
+ * @author linyetong
+ * @email linyetong@glinfo.com
+ * @date 2022-02-14 17:23:29
+ */
+public interface HelpCenterContentService extends IService<HelpCenterContentEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+}
+

common/src/main/java/tech/glinfo/enbao/modules/sys/service/HelpCenterService.java

+package tech.glinfo.enbao.modules.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import tech.glinfo.enbao.common.utils.PageUtils;
+import tech.glinfo.enbao.modules.sys.entity.HelpCenterEntity;
+
+import java.util.Map;
+
+/**
+ * 帮助中心
+ *
+ * @author linyetong
+ * @email linyetong@glinfo.com
+ * @date 2022-02-14 16:39:15
+ */
+public interface HelpCenterService extends IService<HelpCenterEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+}
+

common/src/main/java/tech/glinfo/enbao/modules/sys/service/impl/BusinessCooperationServiceImpl.java

+package tech.glinfo.enbao.modules.sys.service.impl;
+
+import org.springframework.stereotype.Service;
+import java.util.Map;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import tech.glinfo.enbao.common.utils.PageUtils;
+import tech.glinfo.enbao.common.utils.Query;
+
+import tech.glinfo.enbao.modules.sys.dao.BusinessCooperationDao;
+import tech.glinfo.enbao.modules.sys.entity.BusinessCooperationEntity;
+import tech.glinfo.enbao.modules.sys.service.BusinessCooperationService;
+
+
+@Service("businessCooperationService")
+public class BusinessCooperationServiceImpl extends ServiceImpl<BusinessCooperationDao, BusinessCooperationEntity> implements BusinessCooperationService {
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+        IPage<BusinessCooperationEntity> page = this.page(
+                new Query<BusinessCooperationEntity>().getPage(params),
+                new QueryWrapper<BusinessCooperationEntity>()
+        );
+
+        return new PageUtils(page);
+    }
+
+}
\ No newline at end of file

common/src/main/java/tech/glinfo/enbao/modules/sys/service/impl/FeedBackServiceImpl.java

+package tech.glinfo.enbao.modules.sys.service.impl;
+
+import org.springframework.stereotype.Service;
+import java.util.Map;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import tech.glinfo.enbao.common.utils.PageUtils;
+import tech.glinfo.enbao.common.utils.Query;
+
+import tech.glinfo.enbao.modules.sys.dao.FeedBackDao;
+import tech.glinfo.enbao.modules.sys.entity.FeedBackEntity;
+import tech.glinfo.enbao.modules.sys.service.FeedBackService;
+
+
+@Service("feedBackService")
+public class FeedBackServiceImpl extends ServiceImpl<FeedBackDao, FeedBackEntity> implements FeedBackService {
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+        IPage<FeedBackEntity> page = this.page(
+                new Query<FeedBackEntity>().getPage(params),
+                new QueryWrapper<FeedBackEntity>()
+        );
+
+        return new PageUtils(page);
+    }
+
+}
\ No newline at end of file

common/src/main/java/tech/glinfo/enbao/modules/sys/service/impl/HelpCenterContentServiceImpl.java

+package tech.glinfo.enbao.modules.sys.service.impl;
+
+import org.springframework.stereotype.Service;
+import java.util.Map;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import tech.glinfo.enbao.common.utils.PageUtils;
+import tech.glinfo.enbao.common.utils.Query;
+
+import tech.glinfo.enbao.modules.sys.dao.HelpCenterContentDao;
+import tech.glinfo.enbao.modules.sys.entity.HelpCenterContentEntity;
+import tech.glinfo.enbao.modules.sys.service.HelpCenterContentService;
+
+
+@Service("helpCenterContentService")
+public class HelpCenterContentServiceImpl extends ServiceImpl<HelpCenterContentDao, HelpCenterContentEntity> implements HelpCenterContentService {
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+        IPage<HelpCenterContentEntity> page = this.page(
+                new Query<HelpCenterContentEntity>().getPage(params),
+                new QueryWrapper<HelpCenterContentEntity>()
+        );
+
+        return new PageUtils(page);
+    }
+
+}
\ No newline at end of file

common/src/main/java/tech/glinfo/enbao/modules/sys/service/impl/HelpCenterServiceImpl.java

+package tech.glinfo.enbao.modules.sys.service.impl;
+
+import org.springframework.stereotype.Service;
+import java.util.Map;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import tech.glinfo.enbao.common.utils.PageUtils;
+import tech.glinfo.enbao.common.utils.Query;
+
+import tech.glinfo.enbao.modules.sys.dao.HelpCenterDao;
+import tech.glinfo.enbao.modules.sys.entity.HelpCenterEntity;
+import tech.glinfo.enbao.modules.sys.service.HelpCenterService;
+
+
+@Service("helpCenterService")
+public class HelpCenterServiceImpl extends ServiceImpl<HelpCenterDao, HelpCenterEntity> implements HelpCenterService {
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+        IPage<HelpCenterEntity> page = this.page(
+                new Query<HelpCenterEntity>().getPage(params),
+                new QueryWrapper<HelpCenterEntity>()
+        );
+
+        return new PageUtils(page);
+    }
+
+}
\ No newline at end of file

common/src/main/resources/mapper/sys/BusinessCooperationDao.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="tech.glinfo.enbao.modules.sys.dao.BusinessCooperationDao">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="tech.glinfo.enbao.modules.sys.entity.BusinessCooperationEntity" id="businessCooperationMap">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="phone" column="phone"/>
+        <result property="content" column="content"/>
+        <result property="createTime" column="create_time"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file

common/src/main/resources/mapper/sys/FeedBackDao.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="tech.glinfo.enbao.modules.sys.dao.FeedBackDao">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="tech.glinfo.enbao.modules.sys.entity.FeedBackEntity" id="feedBackMap">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="phone" column="phone"/>
+        <result property="content" column="content"/>
+        <result property="pic" column="pic"/>
+        <result property="createTime" column="create_time"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file

common/src/main/resources/mapper/sys/HelpCenterContentDao.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="tech.glinfo.enbao.modules.sys.dao.HelpCenterContentDao">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="tech.glinfo.enbao.modules.sys.entity.HelpCenterContentEntity" id="helpCenterContentMap">
+        <result property="id" column="id"/>
+        <result property="helpId" column="help_id"/>
+        <result property="content" column="content"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file

common/src/main/resources/mapper/sys/HelpCenterDao.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="tech.glinfo.enbao.modules.sys.dao.HelpCenterDao">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="tech.glinfo.enbao.modules.sys.entity.HelpCenterEntity" id="helpCenterMap">
+        <result property="id" column="id"/>
+        <result property="title" column="title"/>
+        <result property="createTime" column="create_time"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file

doc/sql/12-24.sql

@@ -264,4 +264,38 @@ CREATE TABLE `sh_dlink_device` (
   PRIMARY KEY (`id`) USING BTREE,
   KEY `sh_dlink_device_dlink_id` (`dlink_id`) USING BTREE,
   KEY `sh_dlink_device_device_id` (`device_id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='智能家居场景关联设备';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='智能家居场景关联设备';
\ No newline at end of file
+
+CREATE TABLE `help_center` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键id',
+  `title` varchar(64) DEFAULT NULL COMMENT '标题',
+  `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='帮助中心';
+
+CREATE TABLE `help_center_content` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键id',
+  `help_id` int(11) DEFAULT NULL COMMENT '帮助中心ID',
+  `content` text COMMENT '内容',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='帮助中心内容';
+
+CREATE TABLE `feed_back` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键id',
+  `name` varchar(50) DEFAULT NULL COMMENT '联系人',
+  `phone` varchar(11) DEFAULT NULL COMMENT '联系电话',
+  `content` varchar(255) DEFAULT NULL COMMENT '意见/建议内容',
+  `pic` text COMMENT '反馈图片',
+  `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '反馈时间',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='意见反馈';
+
+
+CREATE TABLE `business_cooperation` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键id',
+  `name` varchar(50) DEFAULT NULL COMMENT '联系人',
+  `phone` varchar(11) DEFAULT NULL COMMENT '联系电话',
+  `content` varchar(255) DEFAULT NULL COMMENT '内容',
+  `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='商务合作';
\ No newline at end of file