Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/food/MenuFoodController.java

@@ -0,0 +1,92 @@
+package com.ruoyi.web.controller.food;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.MenuFood;
+import com.ruoyi.system.domain.vo.MenuFoodVo;
+import com.ruoyi.system.service.IMenuFoodService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 每日食谱Controller
+ *
+ * @author boman
+ * @date 2024-11-07
+ */
+@RestController
+@RequestMapping("/system/menuFood")
+public class MenuFoodController extends BaseController {
+    @Autowired
+    private IMenuFoodService menuFoodService;
+
+    /**
+     * 查询每日食谱列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:menuFood:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(MenuFood menuFood) {
+        startPage();
+        List<MenuFood> list = menuFoodService.selectMenuFoodList(menuFood);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出每日食谱列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:menuFood:export')")
+    @Log(title = "每日食谱", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, MenuFood menuFood) {
+        List<MenuFood> list = menuFoodService.selectMenuFoodList(menuFood);
+        ExcelUtil<MenuFood> util = new ExcelUtil<MenuFood>(MenuFood.class);
+        util.exportExcel(response, list, "每日食谱数据");
+    }
+
+    /**
+     * 获取每日食谱详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:menuFood:query')")
+    @GetMapping(value = "/{menuFoodId}")
+    public AjaxResult getInfo(@PathVariable("menuFoodId") Long menuFoodId) {
+        return success(menuFoodService.selectMenuFoodByMenuFoodId(menuFoodId));
+    }
+
+    /**
+     * 新增每日食谱
+     */
+    @PreAuthorize("@ss.hasPermi('system:menuFood:add')")
+    @Log(title = "每日食谱", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody MenuFoodVo menuFoodVo) {
+        return toAjax(menuFoodService.batchMenuFoodVo(menuFoodVo));
+    }
+
+    /**
+     * 修改每日食谱
+     */
+    @PreAuthorize("@ss.hasPermi('system:menuFood:edit')")
+    @Log(title = "每日食谱", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody MenuFood menuFood) {
+        return toAjax(menuFoodService.updateMenuFood(menuFood));
+    }
+
+    /**
+     * 删除每日食谱
+     */
+    @PreAuthorize("@ss.hasPermi('system:menuFood:remove')")
+    @Log(title = "每日食谱", businessType = BusinessType.DELETE)
+    @GetMapping("/delete/{menuFoodIds}")
+    public AjaxResult remove(@PathVariable Long[] menuFoodIds) {
+        return toAjax(menuFoodService.deleteMenuFoodByMenuFoodIds(menuFoodIds));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/food/MenuFoodRecordController.java

@@ -0,0 +1,91 @@
+package com.ruoyi.web.controller.food;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.MenuFoodRecord;
+import com.ruoyi.system.service.IMenuFoodRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 每日食谱记录Controller
+ *
+ * @author boman
+ * @date 2024-11-07
+ */
+@RestController
+@RequestMapping("/system/foodRecord")
+public class MenuFoodRecordController extends BaseController {
+    @Autowired
+    private IMenuFoodRecordService menuFoodRecordService;
+
+    /**
+     * 查询每日食谱记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:foodRecord:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(MenuFoodRecord menuFoodRecord) {
+        startPage();
+        List<MenuFoodRecord> list = menuFoodRecordService.selectMenuFoodRecordList(menuFoodRecord);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出每日食谱记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:foodRecord:export')")
+    @Log(title = "每日食谱记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, MenuFoodRecord menuFoodRecord) {
+        List<MenuFoodRecord> list = menuFoodRecordService.selectMenuFoodRecordList(menuFoodRecord);
+        ExcelUtil<MenuFoodRecord> util = new ExcelUtil<MenuFoodRecord>(MenuFoodRecord.class);
+        util.exportExcel(response, list, "每日食谱记录数据");
+    }
+
+    /**
+     * 获取每日食谱记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:foodRecord:query')")
+    @GetMapping(value = "/{menuFoodRecordId}")
+    public AjaxResult getInfo(@PathVariable("menuFoodRecordId") Long menuFoodRecordId) {
+        return success(menuFoodRecordService.selectMenuFoodRecordByMenuFoodRecordId(menuFoodRecordId));
+    }
+
+    /**
+     * 新增每日食谱记录
+     */
+    @PreAuthorize("@ss.hasPermi('system:foodRecord:add')")
+    @Log(title = "每日食谱记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody MenuFoodRecord menuFoodRecord) {
+        return toAjax(menuFoodRecordService.insertMenuFoodRecord(menuFoodRecord));
+    }
+
+    /**
+     * 修改每日食谱记录
+     */
+    @PreAuthorize("@ss.hasPermi('system:foodRecord:edit')")
+    @Log(title = "每日食谱记录", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody MenuFoodRecord menuFoodRecord) {
+        return toAjax(menuFoodRecordService.updateMenuFoodRecord(menuFoodRecord));
+    }
+
+    /**
+     * 删除每日食谱记录
+     */
+    @PreAuthorize("@ss.hasPermi('system:foodRecord:remove')")
+    @Log(title = "每日食谱记录", businessType = BusinessType.DELETE)
+    @GetMapping("/delete/{menuFoodRecordIds}")
+    public AjaxResult remove(@PathVariable Long[] menuFoodRecordIds) {
+        return toAjax(menuFoodRecordService.deleteMenuFoodRecordByMenuFoodRecordIds(menuFoodRecordIds));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/meeting/AbstractSignature.java

@@ -0,0 +1,162 @@
+package com.ruoyi.web.controller.meeting;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.security.SignatureException;
+
+/**
+ * 加签加密抽象类
+ *
+ * @author : jun
+ * @date : 2021年04月08日
+ */
+public abstract class AbstractSignature {
+    /**
+     * 签名ID
+     */
+    private String id;
+
+    /**
+     * 加密key
+     */
+    private String key;
+
+    /**
+     * 服务url
+     */
+    private String url;
+
+    /**
+     * 加密算法
+     */
+    private String encryptType;
+
+    /**
+     * 待加密原始字符
+     */
+    private String originSign;
+
+    /**
+     * 最终生成的签名
+     */
+    protected String signa;
+
+    /**
+     * 时间戳timestamp
+     */
+    private String ts;
+
+    /**
+     * 请求类型，默认get
+     */
+    protected String requestMethod = "GET";
+
+    /**
+     * @param id
+     * @param key
+     * @param url
+     */
+    public AbstractSignature(String id, String key, String url) {
+        this.id = id;
+        this.key = key;
+        this.url = url;
+        this.ts = generateTs();
+    }
+
+    /**
+     * 可设置请求类型
+     * @param id
+     * @param key
+     * @param url
+     * @param isPost 是否为POST
+     */
+    public AbstractSignature(String id, String key, String url, boolean isPost) {
+        this.id = id;
+        this.key = key;
+        this.url = url;
+        if (isPost) {
+            this.requestMethod = "POST";
+        }else{
+            this.requestMethod = "GET";
+        }
+
+        this.ts = generateTs();
+    }
+
+    /**
+     * 生成ts时间
+     */
+    public String generateTs() {
+        return String.valueOf(System.currentTimeMillis() / 1000L);
+    }
+
+
+    /**
+     * 完成签名，返回完整签名
+     *
+     * @return
+     * @throws SignatureException
+     */
+    public abstract String getSigna() throws SignatureException;
+
+    public String generateOriginSign() throws SignatureException {
+        try {
+            URL url = new URL(this.getUrl());
+
+            return "host: " + url.getHost() + "\n" +
+                    "date: " + this.getTs() + "\n" +
+                    "GET " + url.getPath() + " HTTP/1.1";
+        } catch (MalformedURLException e) {
+            throw new SignatureException("MalformedURLException:" + e.getMessage());
+        }
+    }
+
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getOriginSign() {
+        return originSign;
+    }
+
+    public void setOriginSign(String originSign) {
+        this.originSign = originSign;
+    }
+
+    public String getTs() {
+        return ts;
+    }
+
+    public void setTs(String ts) {
+        this.ts = ts;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getEncryptType() {
+        return encryptType;
+    }
+
+    public void setEncryptType(String encryptType) {
+        this.encryptType = encryptType;
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/meeting/LfasrSignature.java

@@ -0,0 +1,53 @@
+package com.ruoyi.web.controller.meeting;
+
+
+import com.ruoyi.common.utils.xunfei.CryptTools;
+import cn.hutool.core.util.ObjectUtil;
+import java.security.NoSuchAlgorithmException;
+import java.security.SignatureException;
+
+/**
+ * Lfasr能力签名实体
+ *
+ * @author : jun
+ * @date : 2021年03月29日
+ */
+public class LfasrSignature extends AbstractSignature {
+
+    /**
+     *
+     * @param appId
+     * @param keySecret
+     */
+    public LfasrSignature(String appId, String keySecret) {
+        super(appId, keySecret, null);
+    }
+
+    @Override
+    public String getSigna() throws SignatureException {
+        if (ObjectUtil.isEmpty(this.signa)) {
+            this.setOriginSign(generateOriginSign());
+            this.signa = generateSignature();
+        }
+        return this.signa;
+    }
+
+    /**
+     * 生成最终的签名，需要先生成原始sign
+     *
+     * @throws SignatureException
+     */
+    public String generateSignature() throws SignatureException {
+        return CryptTools.hmacEncrypt(CryptTools.HMAC_SHA1, this.getOriginSign(), this.getKey());
+    }
+
+    /**
+     * 生成待加密原始字符
+     *
+     * @throws NoSuchAlgorithmException
+     */
+    @Override
+    public String generateOriginSign() throws SignatureException {
+        return CryptTools.md5Encrypt(this.getId() + this.getTs());
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/meeting/MeetingRecordsController.java

@@ -0,0 +1,90 @@
+package com.ruoyi.web.controller.meeting;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.MeetingRecords;
+import com.ruoyi.system.service.IMeetingRecordsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 会议记录Controller
+ *
+ * @author boman
+ * @date 2024-11-04
+ */
+@RestController
+@RequestMapping("/records")
+public class MeetingRecordsController extends BaseController {
+    @Autowired
+    private IMeetingRecordsService meetingRecordsService;
+
+    /**
+     * 查询会议记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:records:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(MeetingRecords meetingRecords) {
+        List<MeetingRecords> list = meetingRecordsService.selectMeetingRecordsList(meetingRecords);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出会议记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:records:export')")
+    @Log(title = "会议记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, MeetingRecords meetingRecords) {
+        List<MeetingRecords> list = meetingRecordsService.selectMeetingRecordsList(meetingRecords);
+        ExcelUtil<MeetingRecords> util = new ExcelUtil<MeetingRecords>(MeetingRecords.class);
+        util.exportExcel(response, list, "会议记录数据");
+    }
+
+    /**
+     * 获取会议记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:records:query')")
+    @GetMapping(value = "/{recordId}")
+    public AjaxResult getInfo(@PathVariable("recordId") Long recordId) {
+        return success(meetingRecordsService.selectMeetingRecordsByRecordId(recordId));
+    }
+
+    /**
+     * 新增会议记录
+     */
+    @PreAuthorize("@ss.hasPermi('system:records:add')")
+    @Log(title = "会议记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody MeetingRecords meetingRecords) {
+        return toAjax(meetingRecordsService.insertMeetingRecords(meetingRecords));
+    }
+
+    /**
+     * 修改会议记录
+     */
+    @PreAuthorize("@ss.hasPermi('system:records:edit')")
+    @Log(title = "会议记录", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody MeetingRecords meetingRecords) {
+        return toAjax(meetingRecordsService.updateMeetingRecords(meetingRecords));
+    }
+
+    /**
+     * 删除会议记录
+     */
+    @PreAuthorize("@ss.hasPermi('system:records:remove')")
+    @Log(title = "会议记录", businessType = BusinessType.DELETE)
+    @GetMapping("/delete/{recordIds}")
+    public AjaxResult remove(@PathVariable Long[] recordIds) {
+        return toAjax(meetingRecordsService.deleteMeetingRecordsByRecordIds(recordIds));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/sign/SignInController.java

@@ -0,0 +1,91 @@
+package com.ruoyi.web.controller.sign;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.SignIn;
+import com.ruoyi.system.service.ISignInService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 会议室签到Controller
+ *
+ * @author boman
+ * @date 2024-11-04
+ */
+@RestController
+@RequestMapping("/sign")
+public class SignInController extends BaseController {
+    @Autowired
+    private ISignInService signInService;
+
+    /**
+     * 查询会议室签到列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:in:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SignIn signIn) {
+        startPage();
+        List<SignIn> list = signInService.selectSignInList(signIn);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出会议室签到列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:in:export')")
+    @Log(title = "会议室签到", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SignIn signIn) {
+        List<SignIn> list = signInService.selectSignInList(signIn);
+        ExcelUtil<SignIn> util = new ExcelUtil<SignIn>(SignIn.class);
+        util.exportExcel(response, list, "会议室签到数据");
+    }
+
+    /**
+     * 获取会议室签到详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:in:query')")
+    @GetMapping(value = "/{signInId}")
+    public AjaxResult getInfo(@PathVariable("signInId") Long signInId) {
+        return success(signInService.selectSignInBySignInId(signInId));
+    }
+
+    /**
+     * 新增会议室签到
+     */
+    @PreAuthorize("@ss.hasPermi('system:in:add')")
+    @Log(title = "会议室签到", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SignIn signIn) {
+        return toAjax(signInService.insertSignIn(signIn));
+    }
+
+    /**
+     * 修改会议室签到
+     */
+    @PreAuthorize("@ss.hasPermi('system:in:edit')")
+    @Log(title = "会议室签到", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody SignIn signIn) {
+        return toAjax(signInService.updateSignIn(signIn));
+    }
+
+    /**
+     * 删除会议室签到
+     */
+    @PreAuthorize("@ss.hasPermi('system:in:remove')")
+    @Log(title = "会议室签到", businessType = BusinessType.DELETE)
+    @GetMapping("/delete/{signInIds}")
+    public AjaxResult remove(@PathVariable Long[] signInIds) {
+        return toAjax(signInService.deleteSignInBySignInIds(signInIds));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java

@@ -1,18 +1,5 @@
 package com.ruoyi.web.controller.system;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -21,6 +8,13 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.service.ISysDictTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 数据字典信息

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -1,33 +1,30 @@
 package com.ruoyi.web.controller.system;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import com.ruoyi.common.core.domain.entity.SysUserVo;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.web.service.TokenService;
-import com.ruoyi.system.service.ISysUserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysMenu;
 import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.entity.SysUserVo;
 import com.ruoyi.common.core.domain.model.LoginBody;
+import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.framework.web.service.SysLoginService;
 import com.ruoyi.framework.web.service.SysPermissionService;
+import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.system.service.ISysMenuService;
+import com.ruoyi.system.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * 登录验证
@@ -114,10 +111,12 @@ public class SysLoginController
         {
             SysUser user = loginUser.getUser();
             String userName = user.getUserName();
+            String nickName = user.getNickName();
             Long userId = user.getUserId();
             String avatar = user.getAvatar();
             Map<String,Object> map = new HashMap<>(2);
             map.put("userName",userName);
+            map.put("nickName",nickName);
             map.put("userId",userId);
             map.put("avatar",avatar);
             return AjaxResult.success(map);

ruoyi-admin/src/main/java/com/ruoyi/web/controller/vote/VoteResultController.java

@@ -0,0 +1,99 @@
+package com.ruoyi.web.controller.vote;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.VoteResult;
+import com.ruoyi.system.service.IVoteResultService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 投票结果Controller
+ *
+ * @author boman
+ * @date 2024-11-15
+ */
+@RestController
+@RequestMapping("/voteResult")
+public class VoteResultController extends BaseController {
+    @Autowired
+    private IVoteResultService voteResultService;
+
+    /**
+     * 查询投票结果列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:result:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(VoteResult voteResult) {
+        List<VoteResult> list = voteResultService.selectVoteResultList(voteResult);
+        return getDataTable(list);
+    }
+
+    /**
+     * 前端查询投票结果前端
+     */
+    @PreAuthorize("@ss.hasPermi('system:result:statistics')")
+    @PostMapping("/statistics")
+    public AjaxResult statistics(@RequestBody VoteResult voteResult) {
+        return voteResultService.statistics(voteResult);
+    }
+
+    /**
+     * 导出投票结果列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:result:export')")
+    @Log(title = "投票结果", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, VoteResult voteResult) {
+        List<VoteResult> list = voteResultService.selectVoteResultList(voteResult);
+        ExcelUtil<VoteResult> util = new ExcelUtil<VoteResult>(VoteResult.class);
+        util.exportExcel(response, list, "投票结果数据");
+    }
+
+    /**
+     * 获取投票结果详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:result:query')")
+    @GetMapping(value = "/{voteResultId}")
+    public AjaxResult getInfo(@PathVariable("voteResultId") Long voteResultId) {
+        return success(voteResultService.selectVoteResultByVoteResultId(voteResultId));
+    }
+
+    /**
+     * 新增投票结果
+     */
+    @PreAuthorize("@ss.hasPermi('system:result:add')")
+    @Log(title = "投票结果", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody VoteResult voteResult) {
+        return toAjax(voteResultService.insertVoteResult(voteResult));
+    }
+
+    /**
+     * 修改投票结果
+     */
+    @PreAuthorize("@ss.hasPermi('system:result:edit')")
+    @Log(title = "投票结果", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody VoteResult voteResult) {
+        return toAjax(voteResultService.updateVoteResult(voteResult));
+    }
+
+    /**
+     * 删除投票结果
+     */
+    @PreAuthorize("@ss.hasPermi('system:result:remove')")
+    @Log(title = "投票结果", businessType = BusinessType.DELETE)
+    @GetMapping("/delete/{voteResultIds}")
+    public AjaxResult remove(@PathVariable Long[] voteResultIds) {
+        return toAjax(voteResultService.deleteVoteResultByVoteResultIds(voteResultIds));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/vote/VoteThemeController.java

@@ -0,0 +1,91 @@
+package com.ruoyi.web.controller.vote;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.VoteTheme;
+import com.ruoyi.system.service.IVoteThemeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 投票主题Controller
+ *
+ * @author boman
+ * @date 2024-11-15
+ */
+@RestController
+@RequestMapping("/theme")
+public class VoteThemeController extends BaseController {
+    @Autowired
+    private IVoteThemeService voteThemeService;
+
+    /**
+     * 查询投票主题列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:theme:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(VoteTheme voteTheme) {
+        startPage();
+        List<VoteTheme> list = voteThemeService.selectVoteThemeList(voteTheme);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出投票主题列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:theme:export')")
+    @Log(title = "投票主题", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, VoteTheme voteTheme) {
+        List<VoteTheme> list = voteThemeService.selectVoteThemeList(voteTheme);
+        ExcelUtil<VoteTheme> util = new ExcelUtil<VoteTheme>(VoteTheme.class);
+        util.exportExcel(response, list, "投票主题数据");
+    }
+
+    /**
+     * 获取投票主题详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:theme:query')")
+    @GetMapping(value = "/{themeId}")
+    public AjaxResult getInfo(@PathVariable("themeId") Long themeId) {
+        return success(voteThemeService.selectVoteThemeByThemeId(themeId));
+    }
+
+    /**
+     * 新增投票主题
+     */
+    @PreAuthorize("@ss.hasPermi('system:theme:add')")
+    @Log(title = "投票主题", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody VoteTheme voteTheme) {
+        return voteThemeService.insertVoteTheme(voteTheme);
+    }
+
+    /**
+     * 修改投票主题
+     */
+    @PreAuthorize("@ss.hasPermi('system:theme:edit')")
+    @Log(title = "投票主题", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody VoteTheme voteTheme) {
+        return toAjax(voteThemeService.updateVoteTheme(voteTheme));
+    }
+
+    /**
+     * 删除投票主题
+     */
+    @PreAuthorize("@ss.hasPermi('system:theme:remove')")
+    @Log(title = "投票主题", businessType = BusinessType.DELETE)
+    @GetMapping("/delete/{themeIds}")
+    public AjaxResult remove(@PathVariable Long[] themeIds) {
+        return toAjax(voteThemeService.deleteVoteThemeByThemeIds(themeIds));
+    }
+}

ruoyi-admin/src/main/resources/application-prod.yml

@@ -9,7 +9,7 @@ ruoyi:
     # 实例演示开关
     demoEnabled: true
     # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-    profile: /home/ruoyi/uploadPath
+    profile: /home/ruoyi/uploadPath/yuanqu
     # 获取ip地址开关
     addressEnabled: false
     # 验证码类型 math 数组计算 char 字符验证

ruoyi-admin/src/main/resources/application.yml

@@ -20,7 +20,7 @@ spring:
     basename: i18n/messages
   profiles:
     active: druid
-    #active: prod
+#    active: prod
   # 文件上传
   servlet:
     multipart:
@@ -41,7 +41,7 @@ token:
   # 令牌密钥
   secret: abcdefghijklmnopqrstuvwxyz
   # 令牌有效期（默认30分钟）
-  expireTime: 30
+  expireTime: 720
 
 # MyBatis配置
 mybatis:

ruoyi-common/pom.xml

@@ -16,7 +16,17 @@
     </description>
 
     <dependencies>
-
+        <!--讯飞语音识别需要的-->
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.7.21</version>
+        </dependency>
+        <dependency>
+        <groupId>com.google.code.gson</groupId>
+        <artifactId>gson</artifactId>
+        <version>2.9.0</version>
+    </dependency>
         <!-- Spring框架基本的核心工具 -->
         <dependency>
             <groupId>org.springframework</groupId>
@@ -52,19 +62,19 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
-  
+
         <!-- JSON工具类 -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
-        
+
         <!-- 动态数据源 -->
-		<dependency>
-			<groupId>com.baomidou</groupId>
-			<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
-			<version>3.5.2</version>
-		</dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+            <version>3.5.2</version>
+        </dependency>
 
         <!-- 阿里JSON解析器 -->
         <dependency>

ruoyi-common/src/main/java/com/ruoyi/common/utils/EncryptUtil.java

@@ -0,0 +1,65 @@
+package com.ruoyi.common.utils;
+
+import org.apache.commons.codec.binary.Base64;
+
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import java.io.UnsupportedEncodingException;
+import java.security.InvalidKeyException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.SignatureException;
+
+public class EncryptUtil {
+
+    /**
+     * 加密数字签名（基于HMACSHA1算法）
+     * 
+     * @param encryptText
+     * @param encryptKey
+     * @return
+     * @throws SignatureException
+     */
+    public static String HmacSHA1Encrypt(String encryptText, String encryptKey) throws SignatureException {
+        byte[] rawHmac = null;
+        try {
+            byte[] data = encryptKey.getBytes("UTF-8");
+            SecretKeySpec secretKey = new SecretKeySpec(data, "HmacSHA1");
+            Mac mac = Mac.getInstance("HmacSHA1");
+            mac.init(secretKey);
+            byte[] text = encryptText.getBytes("UTF-8");
+            rawHmac = mac.doFinal(text);
+        } catch (InvalidKeyException e) {
+            throw new SignatureException("InvalidKeyException:" + e.getMessage());
+        } catch (NoSuchAlgorithmException e) {
+            throw new SignatureException("NoSuchAlgorithmException:" + e.getMessage());
+        } catch (UnsupportedEncodingException e) {
+            throw new SignatureException("UnsupportedEncodingException:" + e.getMessage());
+        }
+        String oauth = new String(Base64.encodeBase64(rawHmac));
+        
+        return oauth;
+    }
+
+    public final static String MD5(String pstr) {
+        char md5String[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
+        try {
+            byte[] btInput = pstr.getBytes();
+            MessageDigest mdInst = MessageDigest.getInstance("MD5");
+            mdInst.update(btInput);
+            byte[] md = mdInst.digest();
+            int j = md.length;
+            char str[] = new char[j * 2];
+            int k = 0;
+            for (int i = 0; i < j; i++) { // i = 0
+                byte byte0 = md[i]; // 95
+                str[k++] = md5String[byte0 >>> 4 & 0xf]; // 5
+                str[k++] = md5String[byte0 & 0xf]; // F
+            }
+
+            return new String(str);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+}

ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java

@@ -31,6 +31,7 @@ public class MimeTypeUtils
             "bmp", "gif", "jpg", "jpeg", "png",
             // word excel powerpoint
             "doc", "docx", "xls", "xlsx", "ppt", "pptx", "html", "htm", "txt",
+            "wav","mp4","mp3",
             // 压缩文件
             "rar", "zip", "gz", "bz2",
             // 视频格式

ruoyi-common/src/main/java/com/ruoyi/common/utils/xunfei/CryptTools.java

@@ -0,0 +1,91 @@
+package com.ruoyi.common.utils.xunfei;
+
+
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import java.nio.charset.StandardCharsets;
+import java.security.InvalidKeyException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.SignatureException;
+import java.util.Base64;
+
+/**
+ * @author <ydwang16@iflytek.com>
+ * @description 加解密工具
+ * @date 2021/3/24
+ */
+public class CryptTools {
+
+    public static final String HMAC_SHA1 = "HmacSHA1";
+
+    public static final String HMAC_SHA256 = "HmacSHA256";
+
+    private static final char[] md5String = {
+            '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+            'a', 'b', 'c', 'd', 'e', 'f'};
+
+
+    /**
+     * HMAC加解密
+     *
+     * @param encryptType 加密方式
+     * @param plainText   明文
+     * @param encryptKey  加密密钥
+     * @return
+     * @throws SignatureException
+     */
+    public static String hmacEncrypt(String encryptType, String plainText, String encryptKey) throws SignatureException {
+
+        try {
+            byte[] data = encryptKey.getBytes(StandardCharsets.UTF_8);
+            SecretKeySpec secretKey = new SecretKeySpec(data, encryptType);
+            Mac mac = Mac.getInstance(encryptType);
+            mac.init(secretKey);
+            byte[] text = plainText.getBytes(StandardCharsets.UTF_8);
+            byte[] rawHmac = mac.doFinal(text);
+            return Base64.getEncoder().encodeToString(rawHmac);
+        } catch (InvalidKeyException e) {
+            throw new SignatureException("InvalidKeyException:" + e.getMessage());
+        } catch (NoSuchAlgorithmException e) {
+            throw new SignatureException("NoSuchAlgorithmException:" + e.getMessage());
+        }
+    }
+
+    /**
+     * Md5加密
+     *
+     * @param pstr 加密字符串
+     * @return
+     * @throws NoSuchAlgorithmException
+     */
+    public static String md5Encrypt(String pstr) throws SignatureException {
+
+        try {
+            byte[] btInput = pstr.getBytes();
+            MessageDigest mdInst = MessageDigest.getInstance("MD5");
+            mdInst.update(btInput);
+            byte[] md = mdInst.digest();
+            int j = md.length;
+            char[] str = new char[j * 2];
+            int k = 0;
+            for (byte byte0 : md) {
+                str[k++] = md5String[byte0 >>> 4 & 0xF];
+                str[k++] = md5String[byte0 & 0xF];
+            }
+            return new String(str);
+        } catch (NoSuchAlgorithmException e) {
+            throw new SignatureException("NoSuchAlgorithmException:" + e.getMessage());
+        }
+    }
+
+    /**
+     * BASE64加密
+     *
+     * @param plainText
+     * @return
+     */
+    public static String base64Encode(String plainText) {
+        return Base64.getEncoder().encodeToString(plainText.getBytes(StandardCharsets.UTF_8));
+    }
+}

ruoyi-common/src/main/java/com/ruoyi/common/utils/xunfei/HttpConnector.java

@@ -0,0 +1,163 @@
+package com.ruoyi.common.utils.xunfei;
+
+import org.apache.http.Consts;
+import org.apache.http.HttpStatus;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.HttpRequestRetryHandler;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpRequestBase;
+import org.apache.http.entity.ByteArrayEntity;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.net.ssl.SSLException;
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.net.UnknownHostException;
+import java.util.*;
+
+/**
+ * http client
+ *
+ * @author : iflytek
+ * @date : 2022年03月15日
+ */
+public class HttpConnector {
+    private static final Logger log = LoggerFactory.getLogger(HttpConnector.class);
+    private final PoolingHttpClientConnectionManager pool = new PoolingHttpClientConnectionManager();
+    private CloseableHttpClient httpClient;
+
+    private HttpConnector() {
+    }
+
+    public static HttpConnector build(int maxConnections, int connTimeout, int soTimeout, int retryCount) {
+        HttpConnector connector = ConnectorBuilder.CONNECTOR;
+        connector.pool.setMaxTotal(maxConnections);
+        connector.pool.setDefaultMaxPerRoute(5);
+
+        RequestConfig.Builder builder = RequestConfig.custom().setConnectionRequestTimeout(5000)
+                .setConnectTimeout(connTimeout).setSocketTimeout(soTimeout);
+
+        HttpClientBuilder httpClientBuilder = HttpClients.custom().setDefaultRequestConfig(builder.build())
+                .setConnectionManager(connector.pool);
+        if (retryCount > 0) {
+            HttpRequestRetryHandler retryHandler = (exception, executionCount, context) -> {
+                if (executionCount > retryCount) {
+                    return false;
+                }
+                if (exception instanceof InterruptedIOException) {
+                    return false;
+                }
+                if (exception instanceof UnknownHostException) {
+                    return false;
+                }
+                if (exception instanceof SSLException) {
+                    return false;
+                }
+                log.info("HttpConnector 第" + executionCount + "次重试");
+                return true;
+            };
+            httpClientBuilder.setRetryHandler(retryHandler);
+        }
+        connector.httpClient = httpClientBuilder.build();
+        return connector;
+    }
+
+    private static List<NameValuePair> convertMapToPair(Map<String, String> params) {
+        List<NameValuePair> pairs = new ArrayList<>();
+        for (Map.Entry<String, String> entry : params.entrySet()) {
+            pairs.add(new BasicNameValuePair(entry.getKey(), entry.getValue()));
+        }
+        return pairs;
+    }
+
+    public String post(String url, Map<String, String> param) throws IOException {
+        HttpPost httpPost = new HttpPost(url);
+        httpPost.setEntity(new UrlEncodedFormEntity(convertMapToPair(param), Consts.UTF_8));
+        return doExecute(httpPost, Consts.UTF_8.toString());
+    }
+
+    public String postByJson(String url, String jsonStr) throws IOException {
+        HttpPost httpPost = new HttpPost(url);
+        httpPost.setHeader("Content-Type", "application/json;charset=UTF-8");
+        httpPost.setEntity(new StringEntity(jsonStr, Consts.UTF_8));
+        return doExecute(httpPost, Consts.UTF_8.toString());
+    }
+
+    public String postByBytes(String url, Map<String, String> param, byte[] bytes) throws IOException {
+        HttpPost httpPost = new HttpPost(url);
+        // 设置 header
+        for (String key : param.keySet()) {
+            httpPost.setHeader(key, param.get(key));
+        }
+        if (Objects.nonNull(bytes)) {
+            httpPost.setEntity(new ByteArrayEntity(bytes));
+        }
+        return doExecute(httpPost, Consts.UTF_8.toString());
+    }
+
+    public String post(String url, Map<String, String> header, Map<String, String> param) throws IOException {
+        HttpPost httpPost = new HttpPost(url);
+        //setHeader,添加头文件
+        Set<String> keys = header.keySet();
+        for (String key : keys) {
+            httpPost.setHeader(key, header.get(key));
+        }
+        httpPost.setEntity(new UrlEncodedFormEntity(convertMapToPair(param), Consts.UTF_8));
+        return doExecute(httpPost, Consts.UTF_8.toString());
+    }
+
+    public String post(String url, String param) throws IOException {
+        HttpPost httpPost = new HttpPost(url);
+        httpPost.addHeader("Content-Type", "application/json;charset=utf-8");
+        StringEntity httpEntity = new StringEntity(param, ContentType.APPLICATION_JSON);
+        httpPost.setEntity(httpEntity);
+        return doExecute(httpPost, Consts.UTF_8.toString());
+    }
+
+
+    private String doExecute(HttpRequestBase requestBase, String charset) throws IOException {
+        String result;
+        CloseableHttpResponse response = null;
+        try {
+            response = this.httpClient.execute(requestBase);
+            int statusCode = response.getStatusLine().getStatusCode();
+            result = (charset == null) ? EntityUtils.toString(response.getEntity()) : EntityUtils.toString(response.getEntity(), charset);
+            if (statusCode != HttpStatus.SC_OK) {
+                log.warn("request:{} , status:{} , result:{}", requestBase.getURI(), statusCode, result);
+            }
+
+        } finally {
+            if (null != response) {
+                EntityUtils.consumeQuietly(response.getEntity());
+            }
+            if (null != requestBase) {
+                requestBase.releaseConnection();
+            }
+        }
+        return result;
+    }
+
+    public void release() {
+        try {
+            this.httpClient.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private static class ConnectorBuilder {
+        private static final HttpConnector CONNECTOR = new HttpConnector();
+    }
+}

ruoyi-common/src/main/java/com/ruoyi/common/utils/xunfei/HttpUtil.java

@@ -0,0 +1,281 @@
+package com.ruoyi.common.utils.xunfei;
+
+import org.apache.http.Consts;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpRequestBase;
+import org.apache.http.entity.ByteArrayEntity;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.InputStreamEntity;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.*;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLEncoder;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+/**
+ * HTTP请求工具类
+ */
+public class HttpUtil {
+    private HttpUtil() {
+    }
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(HttpUtil.class);
+
+    private static final String UTF8 = "UTF-8";
+    /**
+     * 组件的httpClient
+     */
+    private static CloseableHttpClient httpClient;
+
+    static {
+        // 听见服务、流控组件连接池
+        PoolingHttpClientConnectionManager pool = new PoolingHttpClientConnectionManager();
+        pool.setMaxTotal(600);//客户端总并行链接最大数
+        pool.setDefaultMaxPerRoute(200);//每个主机的最大并行链接数
+        httpClient = HttpClients.createMinimal(pool);
+    }
+
+    /**
+     * 请求的upload接口, 发送音频创建转写订单
+     *
+     * @param url       请求地址
+     * @param in        需要转写的音频流
+     * @return 返回结果
+     */
+    public static String iflyrecUpload(String url,  InputStream in) {
+        // 1、准备参数
+        HttpPost httpPost = new HttpPost(url);
+        // 设置超时时间, 防止504的时候会耗时30分钟
+        RequestConfig requestConfig = RequestConfig.custom()
+                //从连接池中获取连接的超时时间
+                .setConnectionRequestTimeout(5000)
+                //与服务器连接超时时间, 指的是连接一个url的连接等待时间
+                .setConnectTimeout(600000)
+                // 读取超时, 指的是连接上一个url，获取response的返回等待时间
+                .setSocketTimeout(600000).build();
+        httpPost.setConfig(requestConfig);
+        HttpEntity requestEntity = new InputStreamEntity(in, ContentType.APPLICATION_JSON);
+        //System.out.println("---"+requestEntity);
+        httpPost.setEntity(requestEntity);
+
+        // 2、执行请求
+        return doExecute(httpPost, null);
+    }
+
+    /**
+     * 请求听见的获取结果接口
+     *
+     * @param url       请求路径
+     * @return 返回结果
+     */
+    public static String iflyrecGet(String url) {
+        // 1、准备参数
+        HttpGet httpget = new HttpGet(url);
+        // 2、执行请求
+        return doExecute(httpget, UTF8);
+    }
+
+    /**
+     * 流控组件调用
+     *
+     * @param url 请求路径
+     * @return 返回结果
+     */
+    public static String flowCtrlGet(String url) {
+        // 1、准备参数
+        HttpGet httpget = new HttpGet(url);
+        RequestConfig requestConfig = RequestConfig.custom()
+                //从连接池中获取连接的超时时间
+                .setConnectionRequestTimeout(500)
+                //与服务器连接超时时间
+                .setConnectTimeout(500)
+                // 读取超时
+                .setSocketTimeout(500).build();
+        httpget.setConfig(requestConfig);
+        // 2、执行请求
+        return doExecute(httpget, null);
+    }
+
+    /**
+     * 流传输的post
+     *
+     * @param url  请求路径
+     * @param body 字节流数据
+     * @return 返回结果
+     */
+    public static String post(String url, byte[] body) {
+        // 1、准备参数
+        HttpPost httpPost = new HttpPost(url);
+        httpPost.setEntity(new ByteArrayEntity(body, ContentType.create("application/octet-stream", Consts.UTF_8)));
+        // 2、执行请求
+        return doExecute(httpPost, UTF8);
+    }
+
+    /**
+     * 带字符串参数的post请求
+     *
+     * @param url   请求路径
+     * @param param 字符串参数
+     * @return 返回结果
+     */
+    public static String post(String url, String param) {
+        // 1、准备参数
+        HttpPost httpPost = new HttpPost(url);
+        // 设置超时时间
+        RequestConfig requestConfig = RequestConfig.custom()
+                //从连接池中获取连接的超时时间
+                .setConnectionRequestTimeout(1000)
+                //与服务器连接超时时间, 指的是连接一个url的连接等待时间
+                .setConnectTimeout(10000)
+                // 读取超时, 指的是连接上一个url，获取response的返回等待时间
+                .setSocketTimeout(10000).build();
+        httpPost.setConfig(requestConfig);
+        httpPost.setEntity(new StringEntity(param, ContentType.APPLICATION_JSON));
+        // 2、执行请求
+        return doExecute(httpPost, null);
+    }
+
+    /**
+     * 发送HttpGet请求
+     *
+     * @param url 请求路径
+     * @return 返回结果
+     */
+    public static String sendGet(String url) {
+        // 1、准备参数
+        HttpGet httpget = new HttpGet(url);
+        // 2、执行请求
+        return doExecute(httpget, null);
+    }
+
+    /**
+     * 执行网络请求
+     *
+     * @param requestBase http请求对象
+     * @param charset     字符集
+     * @return 返回结果
+     */
+    private static String doExecute(HttpRequestBase requestBase, String charset) {
+        String result = null;
+        try (CloseableHttpResponse response = httpClient.execute(requestBase)) {
+            // 3、检查结果状态
+            int statusCode = response.getStatusLine().getStatusCode();
+            if (statusCode != HttpStatus.SC_OK) {
+                LOGGER.error("网络异常");
+                return null;
+            }
+            // 4、获取结果
+            result = charset == null
+                    ? EntityUtils.toString(response.getEntity())
+                    : EntityUtils.toString(response.getEntity(), charset);
+        } catch (Exception e) {
+            LOGGER.error("网络异常", e);
+        }
+        return result;
+    }
+
+    /**
+     * 发送post请求
+     *
+     * @param url    请求路径
+     * @param header 请求头
+     * @param body   请求数据
+     * @return 返回结果
+     */
+    public static String postWithHeader(String url, Map<String, String> header, String body) {
+        StringBuilder result = new StringBuilder();
+        BufferedReader in = null;
+        PrintWriter out = null;
+        InputStreamReader is = null;
+        try {
+            // 设置 url
+            URL realUrl = new URL(url);
+            URLConnection connection = realUrl.openConnection();
+            // 设置 header
+            for (Entry<String, String> entry : header.entrySet()) {
+                connection.setRequestProperty(entry.getKey(), entry.getValue());
+            }
+            // 设置请求 body
+            connection.setDoOutput(true);
+            connection.setDoInput(true);
+            out = new PrintWriter(connection.getOutputStream());
+            // 保存body
+            out.print(body);
+            // 发送body
+            out.flush();
+            // 获取响应body
+            is = new InputStreamReader(connection.getInputStream());
+            in = new BufferedReader(is);
+            String line;
+            while ((line = in.readLine()) != null) {
+                result.append(line);
+            }
+        } catch (Exception e) {
+            LOGGER.error("HttpUtil postWithHeader Exception!", e);
+            return null;
+        } finally {
+            if (is != null) {
+                try {
+                    is.close();
+                } catch (IOException e) {
+                    LOGGER.error("close IO resource Exception!", e);
+                }
+            }
+            if (in != null) {
+                try {
+                    in.close();
+                } catch (IOException e) {
+                    LOGGER.error("close IO resource Exception!", e);
+                }
+            }
+            if (out != null) {
+                out.close();
+            }
+        }
+        return result.toString();
+    }
+
+    /**
+     * 将集合转换为路径参数
+     *
+     * @param param 集合参数
+     * @return 路径参数
+     * @author white
+     */
+    public static String parseMapToPathParam(Map<String, Object> param) {
+        StringBuilder sb = new StringBuilder();
+        try {
+            Set<Entry<String, Object>> entryset = param.entrySet();
+            boolean isFirst = true;
+            for (Entry<String, Object> entry : entryset) {
+                if (!isFirst) {
+                    sb.append("&");
+                } else {
+                    isFirst = false;
+                }
+                sb.append(URLEncoder.encode(entry.getKey(), UTF8));
+                sb.append("=");
+                sb.append(URLEncoder.encode(entry.getValue().toString(), UTF8));
+            }
+        } catch (UnsupportedEncodingException e) {
+            LOGGER.error("HttpUtil parseMapToPathParam Exception!", e);
+        }
+
+        return sb.toString();
+    }
+}

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -115,6 +115,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**","/system/app/new").permitAll()
+                .antMatchers("/real/time/getResult/**").permitAll()
                 // 除上面外的所有请求全部需要鉴权认证
                 .anyRequest().authenticated()
                 .and()

ruoyi-generator/src/main/resources/generator.yml

@@ -1,7 +1,7 @@
 # 代码生成
 gen:
   # 作者
-  author: ruoyi
+  author: boman
   # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
   packageName: com.ruoyi.system
   # 自动去除表前缀，默认是false

ruoyi-system/src/main/java/com/ruoyi/system/domain/ConferenceRoomOrder.java

@@ -1,11 +1,12 @@
 package com.ruoyi.system.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
 
 /**
  * 会议室预约对象 conference_room_order
@@ -51,6 +52,10 @@ public class ConferenceRoomOrder extends BaseEntity
      * 是否需要席卡
      */
     private String useXk;
+    /**
+     * 席卡详情
+     */
+    private String xkDetail;
 
     /** 会议开始时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -66,6 +71,14 @@ public class ConferenceRoomOrder extends BaseEntity
     @Excel(name = "创建部门")
     private Long createDept;
 
+    public String getXkDetail() {
+        return xkDetail;
+    }
+
+    public void setXkDetail(String xkDetail) {
+        this.xkDetail = xkDetail;
+    }
+
     public String getUseXk() {
         return useXk;
     }

ruoyi-system/src/main/java/com/ruoyi/system/domain/MeetingRecords.java

@@ -0,0 +1,134 @@
+package com.ruoyi.system.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 会议记录对象 meeting_records
+ * 
+ * @author boman
+ * @date 2024-11-04
+ */
+public class MeetingRecords extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 记录id */
+    private Long recordId;
+
+    /** 会议id(关联会议预约表) */
+    @Excel(name = "会议id(关联会议预约表)")
+    private Long conferenceRoomOrderId;
+
+    /** 记录内容 */
+    @Excel(name = "记录内容")
+    private String recordContent;
+    /**
+     * 音频文件地址
+     */
+    private String audioUrl;
+
+    /** 说话人ID */
+    @Excel(name = "说话人ID")
+    private Long userId;
+
+    /** 说话头像地址 */
+    @Excel(name = "说话头像地址")
+    private String avatar;
+
+    /** 说话人昵称 */
+    @Excel(name = "说话人昵称")
+    private String nickName;
+    /**
+     * 会议音频文件
+     */
+    private MultipartFile file;
+
+    public String getAudioUrl() {
+        return audioUrl;
+    }
+
+    public void setAudioUrl(String audioUrl) {
+        this.audioUrl = audioUrl;
+    }
+
+    public MultipartFile getFile() {
+        return file;
+    }
+
+    public void setFile(MultipartFile file) {
+        this.file = file;
+    }
+
+    public Long getRecordId() {
+        return recordId;
+    }
+
+    public void setRecordId(Long recordId) {
+        this.recordId = recordId;
+    }
+
+    public Long getConferenceRoomOrderId() {
+        return conferenceRoomOrderId;
+    }
+
+    public void setConferenceRoomOrderId(Long conferenceRoomOrderId) {
+        this.conferenceRoomOrderId = conferenceRoomOrderId;
+    }
+
+    public void setRecordContent(String recordContent)
+    {
+        this.recordContent = recordContent;
+    }
+
+    public String getRecordContent() 
+    {
+        return recordContent;
+    }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setAvatar(String avatar) 
+    {
+        this.avatar = avatar;
+    }
+
+    public String getAvatar() 
+    {
+        return avatar;
+    }
+    public void setNickName(String nickName) 
+    {
+        this.nickName = nickName;
+    }
+
+    public String getNickName() 
+    {
+        return nickName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("recordId", getRecordId())
+            .append("conferenceRoomOrderId", getConferenceRoomOrderId())
+            .append("recordContent", getRecordContent())
+            .append("userId", getUserId())
+            .append("avatar", getAvatar())
+            .append("nickName", getNickName())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/MenuFood.java

@@ -0,0 +1,167 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 每日食谱对象 menu_food
+ * 
+ * @author boman
+ * @date 2024-11-07
+ */
+public class MenuFood extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 食谱ID */
+    private Long menuFoodId;
+
+    /** 食谱日期 周一 */
+    @Excel(name = "食谱日期 周一")
+    private String menuFoodTime;
+
+    /** 就餐人员类型 1：职工 2：领导 */
+    @Excel(name = "就餐人员类型 1：职工 2：领导")
+    private String menuFoodType;
+
+    /** 食谱早餐详情 */
+    @Excel(name = "食谱早餐详情")
+    private String menuFoodDetailBk;
+
+    /** 食谱中餐详情 */
+    @Excel(name = "食谱中餐详情")
+    private String menuFoodDetailLu;
+
+    /** 食谱晚餐详情 */
+    @Excel(name = "食谱晚餐详情")
+    private String menuFoodDetailDi;
+
+    /** 食堂名称 */
+    @Excel(name = "食堂名称")
+    private String canteenName;
+
+    /** 食堂id */
+    @Excel(name = "食堂id")
+    private Long canteenId;
+
+    /** 是否启用 */
+    @Excel(name = "是否启用")
+    private String isUse;
+
+    /** 创建部门 */
+    private Long createDept;
+
+    public void setMenuFoodId(Long menuFoodId) 
+    {
+        this.menuFoodId = menuFoodId;
+    }
+
+    public Long getMenuFoodId() 
+    {
+        return menuFoodId;
+    }
+    public void setMenuFoodTime(String menuFoodTime) 
+    {
+        this.menuFoodTime = menuFoodTime;
+    }
+
+    public String getMenuFoodTime() 
+    {
+        return menuFoodTime;
+    }
+    public void setMenuFoodType(String menuFoodType) 
+    {
+        this.menuFoodType = menuFoodType;
+    }
+
+    public String getMenuFoodType() 
+    {
+        return menuFoodType;
+    }
+    public void setMenuFoodDetailBk(String menuFoodDetailBk) 
+    {
+        this.menuFoodDetailBk = menuFoodDetailBk;
+    }
+
+    public String getMenuFoodDetailBk() 
+    {
+        return menuFoodDetailBk;
+    }
+    public void setMenuFoodDetailLu(String menuFoodDetailLu) 
+    {
+        this.menuFoodDetailLu = menuFoodDetailLu;
+    }
+
+    public String getMenuFoodDetailLu() 
+    {
+        return menuFoodDetailLu;
+    }
+    public void setMenuFoodDetailDi(String menuFoodDetailDi) 
+    {
+        this.menuFoodDetailDi = menuFoodDetailDi;
+    }
+
+    public String getMenuFoodDetailDi() 
+    {
+        return menuFoodDetailDi;
+    }
+    public void setCanteenName(String canteenName) 
+    {
+        this.canteenName = canteenName;
+    }
+
+    public String getCanteenName() 
+    {
+        return canteenName;
+    }
+    public void setCanteenId(Long canteenId) 
+    {
+        this.canteenId = canteenId;
+    }
+
+    public Long getCanteenId() 
+    {
+        return canteenId;
+    }
+    public void setIsUse(String isUse) 
+    {
+        this.isUse = isUse;
+    }
+
+    public String getIsUse() 
+    {
+        return isUse;
+    }
+    public void setCreateDept(Long createDept) 
+    {
+        this.createDept = createDept;
+    }
+
+    public Long getCreateDept() 
+    {
+        return createDept;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("menuFoodId", getMenuFoodId())
+            .append("menuFoodTime", getMenuFoodTime())
+            .append("menuFoodType", getMenuFoodType())
+            .append("menuFoodDetailBk", getMenuFoodDetailBk())
+            .append("menuFoodDetailLu", getMenuFoodDetailLu())
+            .append("menuFoodDetailDi", getMenuFoodDetailDi())
+            .append("canteenName", getCanteenName())
+            .append("canteenId", getCanteenId())
+            .append("isUse", getIsUse())
+            .append("createDept", getCreateDept())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/MenuFoodRecord.java

@@ -0,0 +1,171 @@
+package com.ruoyi.system.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 每日食谱记录对象 menu_food_record
+ * 
+ * @author boman
+ * @date 2024-11-07
+ */
+public class MenuFoodRecord extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 食谱ID */
+    private Long menuFoodRecordId;
+
+    /** 食谱日期 周一 */
+    @Excel(name = "食谱日期 周一")
+    private String menuFoodTime;
+
+    /** 就餐人员类型 1：职工 2：领导 */
+    @Excel(name = "就餐人员类型 1：职工 2：领导")
+    private String menuFoodType;
+
+    /** 食谱早餐详情 */
+    @Excel(name = "食谱早餐详情")
+    private String menuFoodDetailBk;
+
+    /** 食谱中餐详情 */
+    @Excel(name = "食谱中餐详情")
+    private String menuFoodDetailLu;
+
+    /** 食谱午餐详情 */
+    @Excel(name = "食谱午餐详情")
+    private String menuFoodDetailDi;
+
+    /** 食堂名称 */
+    @Excel(name = "食堂名称")
+    private String canteenName;
+
+    /** 食堂id */
+    @Excel(name = "食堂id")
+    private Long canteenId;
+
+    /** 记录时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date recordTime;
+
+    /** 创建部门 */
+    private Long createDept;
+
+    public void setMenuFoodRecordId(Long menuFoodRecordId) 
+    {
+        this.menuFoodRecordId = menuFoodRecordId;
+    }
+
+    public Long getMenuFoodRecordId() 
+    {
+        return menuFoodRecordId;
+    }
+    public void setMenuFoodTime(String menuFoodTime) 
+    {
+        this.menuFoodTime = menuFoodTime;
+    }
+
+    public String getMenuFoodTime() 
+    {
+        return menuFoodTime;
+    }
+    public void setMenuFoodType(String menuFoodType) 
+    {
+        this.menuFoodType = menuFoodType;
+    }
+
+    public String getMenuFoodType() 
+    {
+        return menuFoodType;
+    }
+    public void setMenuFoodDetailBk(String menuFoodDetailBk) 
+    {
+        this.menuFoodDetailBk = menuFoodDetailBk;
+    }
+
+    public String getMenuFoodDetailBk() 
+    {
+        return menuFoodDetailBk;
+    }
+    public void setMenuFoodDetailLu(String menuFoodDetailLu) 
+    {
+        this.menuFoodDetailLu = menuFoodDetailLu;
+    }
+
+    public String getMenuFoodDetailLu() 
+    {
+        return menuFoodDetailLu;
+    }
+    public void setMenuFoodDetailDi(String menuFoodDetailDi) 
+    {
+        this.menuFoodDetailDi = menuFoodDetailDi;
+    }
+
+    public String getMenuFoodDetailDi() 
+    {
+        return menuFoodDetailDi;
+    }
+    public void setCanteenName(String canteenName) 
+    {
+        this.canteenName = canteenName;
+    }
+
+    public String getCanteenName() 
+    {
+        return canteenName;
+    }
+    public void setCanteenId(Long canteenId) 
+    {
+        this.canteenId = canteenId;
+    }
+
+    public Long getCanteenId() 
+    {
+        return canteenId;
+    }
+    public void setRecordTime(Date recordTime) 
+    {
+        this.recordTime = recordTime;
+    }
+
+    public Date getRecordTime() 
+    {
+        return recordTime;
+    }
+    public void setCreateDept(Long createDept) 
+    {
+        this.createDept = createDept;
+    }
+
+    public Long getCreateDept() 
+    {
+        return createDept;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("menuFoodRecordId", getMenuFoodRecordId())
+            .append("menuFoodTime", getMenuFoodTime())
+            .append("menuFoodType", getMenuFoodType())
+            .append("menuFoodDetailBk", getMenuFoodDetailBk())
+            .append("menuFoodDetailLu", getMenuFoodDetailLu())
+            .append("menuFoodDetailDi", getMenuFoodDetailDi())
+            .append("canteenName", getCanteenName())
+            .append("canteenId", getCanteenId())
+            .append("recordTime", getRecordTime())
+            .append("createDept", getCreateDept())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/SignIn.java

@@ -0,0 +1,164 @@
+package com.ruoyi.system.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 会议室签到对象 sign_in
+ * 
+ * @author boman
+ * @date 2024-11-04
+ */
+public class SignIn extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 签到ID */
+    private Long signInId;
+
+    /** 会议室预约ID */
+    @Excel(name = "会议室预约ID")
+    private Long conferenceRoomOrderId;
+    /** 会议室预约名称 */
+    private String conferenceRoomOrderName;
+
+    /** 会议室ID */
+    @Excel(name = "会议室ID")
+    private Long conferenceRoomId;
+    /** 会议室名称 */
+    private String conferenceRoomName;
+
+    /** 用户id */
+    @Excel(name = "用户id")
+    private Long userId;
+
+    /** 用户头像地址 */
+    @Excel(name = "用户头像地址")
+    private String avatar;
+
+    /** 用户名称 */
+    @Excel(name = "用户名称")
+    private String nickName;
+
+    /** 签到时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "签到时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date signTime;
+
+    /** 创建部门 */
+    @Excel(name = "创建部门")
+    private Long createDept;
+
+    public String getConferenceRoomOrderName() {
+        return conferenceRoomOrderName;
+    }
+
+    public void setConferenceRoomOrderName(String conferenceRoomOrderName) {
+        this.conferenceRoomOrderName = conferenceRoomOrderName;
+    }
+
+    public String getConferenceRoomName() {
+        return conferenceRoomName;
+    }
+
+    public void setConferenceRoomName(String conferenceRoomName) {
+        this.conferenceRoomName = conferenceRoomName;
+    }
+
+    public void setSignInId(Long signInId)
+    {
+        this.signInId = signInId;
+    }
+
+    public Long getSignInId() 
+    {
+        return signInId;
+    }
+    public void setConferenceRoomOrderId(Long conferenceRoomOrderId) 
+    {
+        this.conferenceRoomOrderId = conferenceRoomOrderId;
+    }
+
+    public Long getConferenceRoomOrderId() 
+    {
+        return conferenceRoomOrderId;
+    }
+    public void setConferenceRoomId(Long conferenceRoomId) 
+    {
+        this.conferenceRoomId = conferenceRoomId;
+    }
+
+    public Long getConferenceRoomId() 
+    {
+        return conferenceRoomId;
+    }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setAvatar(String avatar) 
+    {
+        this.avatar = avatar;
+    }
+
+    public String getAvatar() 
+    {
+        return avatar;
+    }
+    public void setNickName(String nickName) 
+    {
+        this.nickName = nickName;
+    }
+
+    public String getNickName() 
+    {
+        return nickName;
+    }
+    public void setSignTime(Date signTime) 
+    {
+        this.signTime = signTime;
+    }
+
+    public Date getSignTime() 
+    {
+        return signTime;
+    }
+    public void setCreateDept(Long createDept) 
+    {
+        this.createDept = createDept;
+    }
+
+    public Long getCreateDept() 
+    {
+        return createDept;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("signInId", getSignInId())
+            .append("conferenceRoomOrderId", getConferenceRoomOrderId())
+            .append("conferenceRoomId", getConferenceRoomId())
+            .append("userId", getUserId())
+            .append("avatar", getAvatar())
+            .append("nickName", getNickName())
+            .append("signTime", getSignTime())
+            .append("createDept", getCreateDept())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/VoteOption.java

@@ -0,0 +1,64 @@
+package com.ruoyi.system.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 投票选项对象 vote_option
+ * 
+ * @author boman
+ * @date 2024-11-15
+ */
+public class VoteOption
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 选项ID，主键 */
+    private Long optionId;
+
+    /** 选项名称 */
+    @Excel(name = "选项名称")
+    private String optionName;
+
+    /** 所属主题ID */
+    @Excel(name = "所属主题ID")
+    private Long themeId;
+
+    public void setOptionId(Long optionId) 
+    {
+        this.optionId = optionId;
+    }
+
+    public Long getOptionId() 
+    {
+        return optionId;
+    }
+    public void setOptionName(String optionName) 
+    {
+        this.optionName = optionName;
+    }
+
+    public String getOptionName() 
+    {
+        return optionName;
+    }
+    public void setThemeId(Long themeId) 
+    {
+        this.themeId = themeId;
+    }
+
+    public Long getThemeId() 
+    {
+        return themeId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("optionId", getOptionId())
+            .append("optionName", getOptionName())
+            .append("themeId", getThemeId())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/VoteResult.java

@@ -0,0 +1,151 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 投票结果对象 vote_result
+ * 
+ * @author boman
+ * @date 2024-11-15
+ */
+public class VoteResult extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 投票结果ID */
+    private Long voteResultId;
+
+    /** 所属主题ID */
+    @Excel(name = "所属主题ID")
+    private Long themeId;
+
+    /** 投票标题 */
+    @Excel(name = "投票标题")
+    private String themeContent;
+
+    /** 选项ID */
+    @Excel(name = "选项ID")
+    private Long optionId;
+
+    /** 选项名称 */
+    @Excel(name = "选项名称")
+    private String optionName;
+
+    /** 会议id(关联会议预约表) */
+    @Excel(name = "会议id(关联会议预约表)")
+    private Long conferenceRoomOrderId;
+
+    /** 投票人ID */
+    @Excel(name = "投票人ID")
+    private Long userId;
+
+    /** 投票人头像地址 */
+    @Excel(name = "投票人头像地址")
+    private String avatar;
+
+    /** 投票人昵称 */
+    @Excel(name = "投票人昵称")
+    private String nickName;
+
+    public Long getConferenceRoomOrderId() {
+        return conferenceRoomOrderId;
+    }
+
+    public void setConferenceRoomOrderId(Long conferenceRoomOrderId) {
+        this.conferenceRoomOrderId = conferenceRoomOrderId;
+    }
+
+    public void setVoteResultId(Long voteResultId)
+    {
+        this.voteResultId = voteResultId;
+    }
+
+    public Long getVoteResultId() 
+    {
+        return voteResultId;
+    }
+    public void setThemeId(Long themeId) 
+    {
+        this.themeId = themeId;
+    }
+
+    public Long getThemeId() 
+    {
+        return themeId;
+    }
+    public void setThemeContent(String themeContent) 
+    {
+        this.themeContent = themeContent;
+    }
+
+    public String getThemeContent() 
+    {
+        return themeContent;
+    }
+    public void setOptionId(Long optionId) 
+    {
+        this.optionId = optionId;
+    }
+
+    public Long getOptionId() 
+    {
+        return optionId;
+    }
+    public void setOptionName(String optionName) 
+    {
+        this.optionName = optionName;
+    }
+
+    public String getOptionName() 
+    {
+        return optionName;
+    }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setAvatar(String avatar) 
+    {
+        this.avatar = avatar;
+    }
+
+    public String getAvatar() 
+    {
+        return avatar;
+    }
+    public void setNickName(String nickName) 
+    {
+        this.nickName = nickName;
+    }
+
+    public String getNickName() 
+    {
+        return nickName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("voteResultId", getVoteResultId())
+            .append("themeId", getThemeId())
+            .append("themeContent", getThemeContent())
+            .append("optionId", getOptionId())
+            .append("optionName", getOptionName())
+            .append("userId", getUserId())
+            .append("avatar", getAvatar())
+            .append("nickName", getNickName())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/VoteTheme.java

@@ -0,0 +1,79 @@
+package com.ruoyi.system.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.List;
+
+/**
+ * 投票主题对象 vote_theme
+ * 
+ * @author boman
+ * @date 2024-11-15
+ */
+public class VoteTheme
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 投票主题ID，主键 */
+    private Long themeId;
+
+    /** 投票标题 */
+    @Excel(name = "投票标题")
+    private String themeContent;
+
+    /** 所属会议ID */
+    @Excel(name = "所属会议ID")
+    private Long conferenceRoomOrderId;
+
+    /** 投票选项信息 */
+    private List<VoteOption> voteOptionList;
+
+    public void setThemeId(Long themeId) 
+    {
+        this.themeId = themeId;
+    }
+
+    public Long getThemeId() 
+    {
+        return themeId;
+    }
+    public void setThemeContent(String themeContent) 
+    {
+        this.themeContent = themeContent;
+    }
+
+    public String getThemeContent() 
+    {
+        return themeContent;
+    }
+
+    public Long getConferenceRoomOrderId() {
+        return conferenceRoomOrderId;
+    }
+
+    public void setConferenceRoomOrderId(Long conferenceRoomOrderId) {
+        this.conferenceRoomOrderId = conferenceRoomOrderId;
+    }
+
+    public List<VoteOption> getVoteOptionList()
+    {
+        return voteOptionList;
+    }
+
+    public void setVoteOptionList(List<VoteOption> voteOptionList)
+    {
+        this.voteOptionList = voteOptionList;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("themeId", getThemeId())
+            .append("themeContent", getThemeContent())
+            .append("conferenceRoomOrderId", getConferenceRoomOrderId())
+            .append("voteOptionList", getVoteOptionList())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MenuFoodVo.java

@@ -0,0 +1,23 @@
+package com.ruoyi.system.domain.vo;
+
+import com.ruoyi.system.domain.MenuFood;
+
+import java.util.List;
+
+/**
+ * 新增菜谱使用
+ * @Author: tjf
+ * @Date: 2024/11/7 17:13
+ * @Describe:
+ */
+public class MenuFoodVo {
+    private List<MenuFood> menuFoodList;
+
+    public List<MenuFood> getMenuFoodList() {
+        return menuFoodList;
+    }
+
+    public void setMenuFoodList(List<MenuFood> menuFoodList) {
+        this.menuFoodList = menuFoodList;
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/MeetingRecordsMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.domain.MeetingRecords;
+
+import java.util.List;
+
+/**
+ * 会议记录Mapper接口
+ * 
+ * @author boman
+ * @date 2024-11-04
+ */
+public interface MeetingRecordsMapper 
+{
+    /**
+     * 查询会议记录
+     * 
+     * @param conferenceRoomOrderId 会议id
+     * @return 会议记录
+     */
+    public MeetingRecords selectMeetingRecordsByConferenceRoomOrderId(Long conferenceRoomOrderId);
+    public MeetingRecords selectMeetingRecordsByRecordId(Long recordId);
+
+    /**
+     * 查询会议记录列表
+     * 
+     * @param meetingRecords 会议记录
+     * @return 会议记录集合
+     */
+    public List<MeetingRecords> selectMeetingRecordsList(MeetingRecords meetingRecords);
+
+    /**
+     * 新增会议记录
+     * 
+     * @param meetingRecords 会议记录
+     * @return 结果
+     */
+    public int insertMeetingRecords(MeetingRecords meetingRecords);
+
+    /**
+     * 修改会议记录
+     * 
+     * @param meetingRecords 会议记录
+     * @return 结果
+     */
+    public int updateMeetingRecords(MeetingRecords meetingRecords);
+
+    /**
+     * 删除会议记录
+     * 
+     * @param recordId 会议记录主键
+     * @return 结果
+     */
+    public int deleteMeetingRecordsByRecordId(Long recordId);
+
+    /**
+     * 批量删除会议记录
+     * 
+     * @param recordIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteMeetingRecordsByRecordIds(Long[] recordIds);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/MenuFoodMapper.java

@@ -0,0 +1,64 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.domain.MenuFood;
+
+import java.util.List;
+
+/**
+ * 每日食谱Mapper接口
+ * 
+ * @author boman
+ * @date 2024-11-07
+ */
+public interface MenuFoodMapper 
+{
+    /**
+     * 查询每日食谱
+     * 
+     * @param menuFoodId 每日食谱主键
+     * @return 每日食谱
+     */
+    public MenuFood selectMenuFoodByMenuFoodId(Long menuFoodId);
+
+    /**
+     * 查询每日食谱列表
+     * 
+     * @param menuFood 每日食谱
+     * @return 每日食谱集合
+     */
+    public List<MenuFood> selectMenuFoodList(MenuFood menuFood);
+
+    /**
+     * 新增每日食谱
+     * 
+     * @param menuFood 每日食谱
+     * @return 结果
+     */
+    public int insertMenuFood(MenuFood menuFood);
+    public int batchMenuFoodVo(List<MenuFood> menuFood);
+
+    /**
+     * 修改每日食谱
+     * 
+     * @param menuFood 每日食谱
+     * @return 结果
+     */
+    public int updateMenuFood(MenuFood menuFood);
+    public int updateMenuFoodTime(String menuFoodTime);
+
+    /**
+     * 删除每日食谱
+     * 
+     * @param menuFoodId 每日食谱主键
+     * @return 结果
+     */
+    public int deleteMenuFoodByMenuFoodId(Long menuFoodId);
+
+    /**
+     * 批量删除每日食谱
+     * 
+     * @param menuFoodIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteMenuFoodByMenuFoodIds(Long[] menuFoodIds);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/MenuFoodRecordMapper.java

@@ -0,0 +1,62 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.domain.MenuFoodRecord;
+
+import java.util.List;
+
+/**
+ * 每日食谱记录Mapper接口
+ * 
+ * @author boman
+ * @date 2024-11-07
+ */
+public interface MenuFoodRecordMapper 
+{
+    /**
+     * 查询每日食谱记录
+     * 
+     * @param menuFoodRecordId 每日食谱记录主键
+     * @return 每日食谱记录
+     */
+    public MenuFoodRecord selectMenuFoodRecordByMenuFoodRecordId(Long menuFoodRecordId);
+
+    /**
+     * 查询每日食谱记录列表
+     * 
+     * @param menuFoodRecord 每日食谱记录
+     * @return 每日食谱记录集合
+     */
+    public List<MenuFoodRecord> selectMenuFoodRecordList(MenuFoodRecord menuFoodRecord);
+
+    /**
+     * 新增每日食谱记录
+     * 
+     * @param menuFoodRecord 每日食谱记录
+     * @return 结果
+     */
+    public int insertMenuFoodRecord(MenuFoodRecord menuFoodRecord);
+
+    /**
+     * 修改每日食谱记录
+     * 
+     * @param menuFoodRecord 每日食谱记录
+     * @return 结果
+     */
+    public int updateMenuFoodRecord(MenuFoodRecord menuFoodRecord);
+
+    /**
+     * 删除每日食谱记录
+     * 
+     * @param menuFoodRecordId 每日食谱记录主键
+     * @return 结果
+     */
+    public int deleteMenuFoodRecordByMenuFoodRecordId(Long menuFoodRecordId);
+
+    /**
+     * 批量删除每日食谱记录
+     * 
+     * @param menuFoodRecordIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteMenuFoodRecordByMenuFoodRecordIds(Long[] menuFoodRecordIds);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SignInMapper.java

@@ -0,0 +1,62 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.domain.SignIn;
+
+import java.util.List;
+
+/**
+ * 会议室签到Mapper接口
+ * 
+ * @author boman
+ * @date 2024-11-04
+ */
+public interface SignInMapper 
+{
+    /**
+     * 查询会议室签到
+     * 
+     * @param signInId 会议室签到主键
+     * @return 会议室签到
+     */
+    public SignIn selectSignInBySignInId(Long signInId);
+
+    /**
+     * 查询会议室签到列表
+     * 
+     * @param signIn 会议室签到
+     * @return 会议室签到集合
+     */
+    public List<SignIn> selectSignInList(SignIn signIn);
+
+    /**
+     * 新增会议室签到
+     * 
+     * @param signIn 会议室签到
+     * @return 结果
+     */
+    public int insertSignIn(SignIn signIn);
+
+    /**
+     * 修改会议室签到
+     * 
+     * @param signIn 会议室签到
+     * @return 结果
+     */
+    public int updateSignIn(SignIn signIn);
+
+    /**
+     * 删除会议室签到
+     * 
+     * @param signInId 会议室签到主键
+     * @return 结果
+     */
+    public int deleteSignInBySignInId(Long signInId);
+
+    /**
+     * 批量删除会议室签到
+     * 
+     * @param signInIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSignInBySignInIds(Long[] signInIds);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/VoteResultMapper.java

@@ -0,0 +1,62 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.domain.VoteResult;
+
+import java.util.List;
+
+/**
+ * 投票结果Mapper接口
+ * 
+ * @author boman
+ * @date 2024-11-15
+ */
+public interface VoteResultMapper 
+{
+    /**
+     * 查询投票结果
+     * 
+     * @param voteResultId 投票结果主键
+     * @return 投票结果
+     */
+    public VoteResult selectVoteResultByVoteResultId(Long voteResultId);
+
+    /**
+     * 查询投票结果列表
+     * 
+     * @param voteResult 投票结果
+     * @return 投票结果集合
+     */
+    public List<VoteResult> selectVoteResultList(VoteResult voteResult);
+
+    /**
+     * 新增投票结果
+     * 
+     * @param voteResult 投票结果
+     * @return 结果
+     */
+    public int insertVoteResult(VoteResult voteResult);
+
+    /**
+     * 修改投票结果
+     * 
+     * @param voteResult 投票结果
+     * @return 结果
+     */
+    public int updateVoteResult(VoteResult voteResult);
+
+    /**
+     * 删除投票结果
+     * 
+     * @param voteResultId 投票结果主键
+     * @return 结果
+     */
+    public int deleteVoteResultByVoteResultId(Long voteResultId);
+
+    /**
+     * 批量删除投票结果
+     * 
+     * @param voteResultIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteVoteResultByVoteResultIds(Long[] voteResultIds);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/VoteThemeMapper.java

@@ -0,0 +1,89 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.domain.VoteOption;
+import com.ruoyi.system.domain.VoteTheme;
+
+import java.util.List;
+
+/**
+ * 投票主题Mapper接口
+ * 
+ * @author boman
+ * @date 2024-11-15
+ */
+public interface VoteThemeMapper 
+{
+    /**
+     * 查询投票主题
+     * 
+     * @param themeId 投票主题主键
+     * @return 投票主题
+     */
+    public VoteTheme selectVoteThemeByThemeId(Long themeId);
+    public List<VoteTheme> selectVoteThemeByConferenceRoomOrderId(Long conferenceRoomOrderId);
+
+    /**
+     * 查询投票主题列表
+     * 
+     * @param voteTheme 投票主题
+     * @return 投票主题集合
+     */
+    public List<VoteTheme> selectVoteThemeList(VoteTheme voteTheme);
+
+    /**
+     * 新增投票主题
+     * 
+     * @param voteTheme 投票主题
+     * @return 结果
+     */
+    public int insertVoteTheme(VoteTheme voteTheme);
+
+    /**
+     * 修改投票主题
+     * 
+     * @param voteTheme 投票主题
+     * @return 结果
+     */
+    public int updateVoteTheme(VoteTheme voteTheme);
+
+    /**
+     * 删除投票主题
+     * 
+     * @param themeId 投票主题主键
+     * @return 结果
+     */
+    public int deleteVoteThemeByThemeId(Long themeId);
+
+    /**
+     * 批量删除投票主题
+     * 
+     * @param themeIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteVoteThemeByThemeIds(Long[] themeIds);
+
+    /**
+     * 批量删除投票选项
+     * 
+     * @param themeIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteVoteOptionByThemeIds(Long[] themeIds);
+    
+    /**
+     * 批量新增投票选项
+     * 
+     * @param voteOptionList 投票选项列表
+     * @return 结果
+     */
+    public int batchVoteOption(List<VoteOption> voteOptionList);
+    
+
+    /**
+     * 通过投票主题主键删除投票选项信息
+     * 
+     * @param themeId 投票主题ID
+     * @return 结果
+     */
+    public int deleteVoteOptionByThemeId(Long themeId);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IMeetingRecordsService.java

@@ -0,0 +1,62 @@
+package com.ruoyi.system.service;
+
+import com.ruoyi.system.domain.MeetingRecords;
+
+import java.util.List;
+
+/**
+ * 会议记录Service接口
+ * 
+ * @author boman
+ * @date 2024-11-04
+ */
+public interface IMeetingRecordsService 
+{
+    /**
+     * 查询会议记录
+     * 
+     * @param recordId 会议记录主键
+     * @return 会议记录
+     */
+    public MeetingRecords selectMeetingRecordsByRecordId(Long recordId);
+
+    /**
+     * 查询会议记录列表
+     * 
+     * @param meetingRecords 会议记录
+     * @return 会议记录集合
+     */
+    public List<MeetingRecords> selectMeetingRecordsList(MeetingRecords meetingRecords);
+
+    /**
+     * 新增会议记录
+     * 
+     * @param meetingRecords 会议记录
+     * @return 结果
+     */
+    public int insertMeetingRecords(MeetingRecords meetingRecords);
+
+    /**
+     * 修改会议记录
+     * 
+     * @param meetingRecords 会议记录
+     * @return 结果
+     */
+    public int updateMeetingRecords(MeetingRecords meetingRecords);
+
+    /**
+     * 批量删除会议记录
+     * 
+     * @param recordIds 需要删除的会议记录主键集合
+     * @return 结果
+     */
+    public int deleteMeetingRecordsByRecordIds(Long[] recordIds);
+
+    /**
+     * 删除会议记录信息
+     * 
+     * @param recordId 会议记录主键
+     * @return 结果
+     */
+    public int deleteMeetingRecordsByRecordId(Long recordId);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IMenuFoodRecordService.java

@@ -0,0 +1,62 @@
+package com.ruoyi.system.service;
+
+import com.ruoyi.system.domain.MenuFoodRecord;
+
+import java.util.List;
+
+/**
+ * 每日食谱记录Service接口
+ * 
+ * @author boman
+ * @date 2024-11-07
+ */
+public interface IMenuFoodRecordService 
+{
+    /**
+     * 查询每日食谱记录
+     * 
+     * @param menuFoodRecordId 每日食谱记录主键
+     * @return 每日食谱记录
+     */
+    public MenuFoodRecord selectMenuFoodRecordByMenuFoodRecordId(Long menuFoodRecordId);
+
+    /**
+     * 查询每日食谱记录列表
+     * 
+     * @param menuFoodRecord 每日食谱记录
+     * @return 每日食谱记录集合
+     */
+    public List<MenuFoodRecord> selectMenuFoodRecordList(MenuFoodRecord menuFoodRecord);
+
+    /**
+     * 新增每日食谱记录
+     * 
+     * @param menuFoodRecord 每日食谱记录
+     * @return 结果
+     */
+    public int insertMenuFoodRecord(MenuFoodRecord menuFoodRecord);
+
+    /**
+     * 修改每日食谱记录
+     * 
+     * @param menuFoodRecord 每日食谱记录
+     * @return 结果
+     */
+    public int updateMenuFoodRecord(MenuFoodRecord menuFoodRecord);
+
+    /**
+     * 批量删除每日食谱记录
+     * 
+     * @param menuFoodRecordIds 需要删除的每日食谱记录主键集合
+     * @return 结果
+     */
+    public int deleteMenuFoodRecordByMenuFoodRecordIds(Long[] menuFoodRecordIds);
+
+    /**
+     * 删除每日食谱记录信息
+     * 
+     * @param menuFoodRecordId 每日食谱记录主键
+     * @return 结果
+     */
+    public int deleteMenuFoodRecordByMenuFoodRecordId(Long menuFoodRecordId);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IMenuFoodService.java

@@ -0,0 +1,64 @@
+package com.ruoyi.system.service;
+
+import com.ruoyi.system.domain.MenuFood;
+import com.ruoyi.system.domain.vo.MenuFoodVo;
+
+import java.util.List;
+
+/**
+ * 每日食谱Service接口
+ * 
+ * @author boman
+ * @date 2024-11-07
+ */
+public interface IMenuFoodService 
+{
+    /**
+     * 查询每日食谱
+     * 
+     * @param menuFoodId 每日食谱主键
+     * @return 每日食谱
+     */
+    public MenuFood selectMenuFoodByMenuFoodId(Long menuFoodId);
+
+    /**
+     * 查询每日食谱列表
+     * 
+     * @param menuFood 每日食谱
+     * @return 每日食谱集合
+     */
+    public List<MenuFood> selectMenuFoodList(MenuFood menuFood);
+
+    /**
+     * 新增每日食谱
+     * 
+     * @param menuFood 每日食谱
+     * @return 结果
+     */
+    public int insertMenuFood(MenuFood menuFood);
+    public int batchMenuFoodVo(MenuFoodVo menuFoodVo);
+
+    /**
+     * 修改每日食谱
+     * 
+     * @param menuFood 每日食谱
+     * @return 结果
+     */
+    public int updateMenuFood(MenuFood menuFood);
+
+    /**
+     * 批量删除每日食谱
+     * 
+     * @param menuFoodIds 需要删除的每日食谱主键集合
+     * @return 结果
+     */
+    public int deleteMenuFoodByMenuFoodIds(Long[] menuFoodIds);
+
+    /**
+     * 删除每日食谱信息
+     * 
+     * @param menuFoodId 每日食谱主键
+     * @return 结果
+     */
+    public int deleteMenuFoodByMenuFoodId(Long menuFoodId);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/ISignInService.java

@@ -0,0 +1,62 @@
+package com.ruoyi.system.service;
+
+import com.ruoyi.system.domain.SignIn;
+
+import java.util.List;
+
+/**
+ * 会议室签到Service接口
+ * 
+ * @author boman
+ * @date 2024-11-04
+ */
+public interface ISignInService 
+{
+    /**
+     * 查询会议室签到
+     * 
+     * @param signInId 会议室签到主键
+     * @return 会议室签到
+     */
+    public SignIn selectSignInBySignInId(Long signInId);
+
+    /**
+     * 查询会议室签到列表
+     * 
+     * @param signIn 会议室签到
+     * @return 会议室签到集合
+     */
+    public List<SignIn> selectSignInList(SignIn signIn);
+
+    /**
+     * 新增会议室签到
+     * 
+     * @param signIn 会议室签到
+     * @return 结果
+     */
+    public int insertSignIn(SignIn signIn);
+
+    /**
+     * 修改会议室签到
+     * 
+     * @param signIn 会议室签到
+     * @return 结果
+     */
+    public int updateSignIn(SignIn signIn);
+
+    /**
+     * 批量删除会议室签到
+     * 
+     * @param signInIds 需要删除的会议室签到主键集合
+     * @return 结果
+     */
+    public int deleteSignInBySignInIds(Long[] signInIds);
+
+    /**
+     * 删除会议室签到信息
+     * 
+     * @param signInId 会议室签到主键
+     * @return 结果
+     */
+    public int deleteSignInBySignInId(Long signInId);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IVoteResultService.java

@@ -0,0 +1,70 @@
+package com.ruoyi.system.service;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain.VoteResult;
+
+import java.util.List;
+
+/**
+ * 投票结果Service接口
+ * 
+ * @author boman
+ * @date 2024-11-15
+ */
+public interface IVoteResultService 
+{
+    /**
+     * 查询投票结果
+     * 
+     * @param voteResultId 投票结果主键
+     * @return 投票结果
+     */
+    public VoteResult selectVoteResultByVoteResultId(Long voteResultId);
+
+    /**
+     * 查询投票结果列表
+     * 
+     * @param voteResult 投票结果
+     * @return 投票结果集合
+     */
+    public List<VoteResult> selectVoteResultList(VoteResult voteResult);
+
+    /**
+     * 前端查询投票结果前端
+     * @param voteResult
+     * @return
+     */
+    public AjaxResult statistics(VoteResult voteResult);
+
+    /**
+     * 新增投票结果
+     * 
+     * @param voteResult 投票结果
+     * @return 结果
+     */
+    public int insertVoteResult(VoteResult voteResult);
+
+    /**
+     * 修改投票结果
+     * 
+     * @param voteResult 投票结果
+     * @return 结果
+     */
+    public int updateVoteResult(VoteResult voteResult);
+
+    /**
+     * 批量删除投票结果
+     * 
+     * @param voteResultIds 需要删除的投票结果主键集合
+     * @return 结果
+     */
+    public int deleteVoteResultByVoteResultIds(Long[] voteResultIds);
+
+    /**
+     * 删除投票结果信息
+     * 
+     * @param voteResultId 投票结果主键
+     * @return 结果
+     */
+    public int deleteVoteResultByVoteResultId(Long voteResultId);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IVoteThemeService.java

@@ -0,0 +1,62 @@
+package com.ruoyi.system.service;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain.VoteTheme;
+import java.util.List;
+
+/**
+ * 投票主题Service接口
+ * 
+ * @author boman
+ * @date 2024-11-15
+ */
+public interface IVoteThemeService 
+{
+    /**
+     * 查询投票主题
+     * 
+     * @param themeId 投票主题主键
+     * @return 投票主题
+     */
+    public VoteTheme selectVoteThemeByThemeId(Long themeId);
+
+    /**
+     * 查询投票主题列表
+     * 
+     * @param voteTheme 投票主题
+     * @return 投票主题集合
+     */
+    public List<VoteTheme> selectVoteThemeList(VoteTheme voteTheme);
+
+    /**
+     * 新增投票主题
+     * 
+     * @param voteTheme 投票主题
+     * @return 结果
+     */
+    public AjaxResult insertVoteTheme(VoteTheme voteTheme);
+
+    /**
+     * 修改投票主题
+     * 
+     * @param voteTheme 投票主题
+     * @return 结果
+     */
+    public int updateVoteTheme(VoteTheme voteTheme);
+
+    /**
+     * 批量删除投票主题
+     * 
+     * @param themeIds 需要删除的投票主题主键集合
+     * @return 结果
+     */
+    public int deleteVoteThemeByThemeIds(Long[] themeIds);
+
+    /**
+     * 删除投票主题信息
+     * 
+     * @param themeId 投票主题主键
+     * @return 结果
+     */
+    public int deleteVoteThemeByThemeId(Long themeId);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MeetingRecordsServiceImpl.java

@@ -0,0 +1,108 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.MeetingRecords;
+import com.ruoyi.system.mapper.MeetingRecordsMapper;
+import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.system.service.IMeetingRecordsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 会议记录Service业务层处理
+ *
+ * @author boman
+ * @date 2024-11-04
+ */
+@Service
+public class MeetingRecordsServiceImpl implements IMeetingRecordsService {
+    @Autowired
+    private MeetingRecordsMapper meetingRecordsMapper;
+    @Autowired
+    private SysUserMapper sysUserMapper;
+
+    /**
+     * 查询会议记录
+     *
+     * @param recordId 会议记录主键
+     * @return 会议记录
+     */
+    @Override
+    public MeetingRecords selectMeetingRecordsByRecordId(Long recordId) {
+        return meetingRecordsMapper.selectMeetingRecordsByRecordId(recordId);
+    }
+
+    /**
+     * 查询会议记录列表
+     *
+     * @param meetingRecords 会议记录
+     * @return 会议记录
+     */
+    @Override
+    public List<MeetingRecords> selectMeetingRecordsList(MeetingRecords meetingRecords) {
+        return meetingRecordsMapper.selectMeetingRecordsList(meetingRecords);
+    }
+
+    /**
+     * 新增会议记录
+     *
+     * @param meetingRecords 会议记录
+     * @return 结果
+     */
+    @Override
+    public int insertMeetingRecords(MeetingRecords meetingRecords) {
+        int row = 0;
+        Long userId = meetingRecords.getUserId();
+        SysUser sysUser = sysUserMapper.selectUserById(userId);
+        if (sysUser != null) {
+            String avatar = sysUser.getAvatar();
+            if (StringUtils.isNotBlank(avatar)) {
+                meetingRecords.setAvatar(avatar);
+            }
+            String nickName = sysUser.getNickName();
+            if (StringUtils.isNotBlank(nickName)) {
+                meetingRecords.setNickName(nickName);
+            }
+            row = meetingRecordsMapper.insertMeetingRecords(meetingRecords);
+        }
+        return row;
+    }
+
+    /**
+     * 修改会议记录
+     *
+     * @param meetingRecords 会议记录
+     * @return 结果
+     */
+    @Override
+    public int updateMeetingRecords(MeetingRecords meetingRecords) {
+        meetingRecords.setUpdateTime(DateUtils.getNowDate());
+        return meetingRecordsMapper.updateMeetingRecords(meetingRecords);
+    }
+
+    /**
+     * 批量删除会议记录
+     *
+     * @param recordIds 需要删除的会议记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteMeetingRecordsByRecordIds(Long[] recordIds) {
+        return meetingRecordsMapper.deleteMeetingRecordsByRecordIds(recordIds);
+    }
+
+    /**
+     * 删除会议记录信息
+     *
+     * @param recordId 会议记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteMeetingRecordsByRecordId(Long recordId) {
+        return meetingRecordsMapper.deleteMeetingRecordsByRecordId(recordId);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MenuFoodRecordServiceImpl.java

@@ -0,0 +1,98 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.MenuFoodRecord;
+import com.ruoyi.system.mapper.MenuFoodRecordMapper;
+import com.ruoyi.system.service.IMenuFoodRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 每日食谱记录Service业务层处理
+ * 
+ * @author boman
+ * @date 2024-11-07
+ */
+@Service
+public class MenuFoodRecordServiceImpl implements IMenuFoodRecordService 
+{
+    @Autowired
+    private MenuFoodRecordMapper menuFoodRecordMapper;
+
+    /**
+     * 查询每日食谱记录
+     * 
+     * @param menuFoodRecordId 每日食谱记录主键
+     * @return 每日食谱记录
+     */
+    @Override
+    public MenuFoodRecord selectMenuFoodRecordByMenuFoodRecordId(Long menuFoodRecordId)
+    {
+        return menuFoodRecordMapper.selectMenuFoodRecordByMenuFoodRecordId(menuFoodRecordId);
+    }
+
+    /**
+     * 查询每日食谱记录列表
+     * 
+     * @param menuFoodRecord 每日食谱记录
+     * @return 每日食谱记录
+     */
+    @Override
+    public List<MenuFoodRecord> selectMenuFoodRecordList(MenuFoodRecord menuFoodRecord)
+    {
+        return menuFoodRecordMapper.selectMenuFoodRecordList(menuFoodRecord);
+    }
+
+    /**
+     * 新增每日食谱记录
+     * 
+     * @param menuFoodRecord 每日食谱记录
+     * @return 结果
+     */
+    @Override
+    public int insertMenuFoodRecord(MenuFoodRecord menuFoodRecord)
+    {
+        menuFoodRecord.setCreateTime(DateUtils.getNowDate());
+        menuFoodRecord.setRecordTime(DateUtils.getNowDate());
+        return menuFoodRecordMapper.insertMenuFoodRecord(menuFoodRecord);
+    }
+
+    /**
+     * 修改每日食谱记录
+     * 
+     * @param menuFoodRecord 每日食谱记录
+     * @return 结果
+     */
+    @Override
+    public int updateMenuFoodRecord(MenuFoodRecord menuFoodRecord)
+    {
+        menuFoodRecord.setUpdateTime(DateUtils.getNowDate());
+        return menuFoodRecordMapper.updateMenuFoodRecord(menuFoodRecord);
+    }
+
+    /**
+     * 批量删除每日食谱记录
+     * 
+     * @param menuFoodRecordIds 需要删除的每日食谱记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteMenuFoodRecordByMenuFoodRecordIds(Long[] menuFoodRecordIds)
+    {
+        return menuFoodRecordMapper.deleteMenuFoodRecordByMenuFoodRecordIds(menuFoodRecordIds);
+    }
+
+    /**
+     * 删除每日食谱记录信息
+     * 
+     * @param menuFoodRecordId 每日食谱记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteMenuFoodRecordByMenuFoodRecordId(Long menuFoodRecordId)
+    {
+        return menuFoodRecordMapper.deleteMenuFoodRecordByMenuFoodRecordId(menuFoodRecordId);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MenuFoodServiceImpl.java

@@ -0,0 +1,131 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.MenuFood;
+import com.ruoyi.system.domain.vo.MenuFoodVo;
+import com.ruoyi.system.mapper.MenuFoodMapper;
+import com.ruoyi.system.service.IMenuFoodService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * 每日食谱Service业务层处理
+ * 
+ * @author boman
+ * @date 2024-11-07
+ */
+@Service
+public class MenuFoodServiceImpl implements IMenuFoodService 
+{
+    @Autowired
+    private MenuFoodMapper menuFoodMapper;
+
+    /**
+     * 查询每日食谱
+     * 
+     * @param menuFoodId 每日食谱主键
+     * @return 每日食谱
+     */
+    @Override
+    public MenuFood selectMenuFoodByMenuFoodId(Long menuFoodId)
+    {
+        return menuFoodMapper.selectMenuFoodByMenuFoodId(menuFoodId);
+    }
+
+    /**
+     * 查询每日食谱列表
+     * 
+     * @param menuFood 每日食谱
+     * @return 每日食谱
+     */
+    @Override
+    public List<MenuFood> selectMenuFoodList(MenuFood menuFood)
+    {
+        return menuFoodMapper.selectMenuFoodList(menuFood);
+    }
+
+    /**
+     * 新增每日食谱
+     * 
+     * @param menuFood 每日食谱
+     * @return 结果
+     */
+    @Override
+    public int insertMenuFood(MenuFood menuFood)
+    {
+        menuFood.setCreateTime(DateUtils.getNowDate());
+        return menuFoodMapper.insertMenuFood(menuFood);
+    }
+    /**
+     * 新增每日食谱批量
+     *
+     * @param menuFoodVo 每日食谱
+     * @return 结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int batchMenuFoodVo(MenuFoodVo menuFoodVo) {
+        List<MenuFood> menuFoodList = menuFoodVo.getMenuFoodList();
+        int row = 0;
+        if (menuFoodList != null && menuFoodList.size() >0){
+            //如果是启用，查询对应日期是否有已经启用的数据，改为不启用
+            for (MenuFood menuFood : menuFoodList) {
+                String isUse = menuFood.getIsUse();
+                String menuFoodTime = menuFood.getMenuFoodTime();
+                if ("Y".equals(isUse)){
+                    //把对应日期改为不启用
+                    menuFoodMapper.updateMenuFoodTime(menuFoodTime);
+                }
+            }
+            row = menuFoodMapper.batchMenuFoodVo(menuFoodList);
+        }
+        return row;
+    }
+
+    /**
+     * 修改每日食谱
+     * 
+     * @param menuFood 每日食谱
+     * @return 结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int updateMenuFood(MenuFood menuFood)
+    {
+        String isUse = menuFood.getIsUse();
+        String menuFoodTime = menuFood.getMenuFoodTime();
+        if ("Y".equals(isUse)){
+            //把对应日期改为不启用
+            menuFoodMapper.updateMenuFoodTime(menuFoodTime);
+        }
+        menuFood.setUpdateTime(DateUtils.getNowDate());
+        return menuFoodMapper.updateMenuFood(menuFood);
+    }
+
+    /**
+     * 批量删除每日食谱
+     * 
+     * @param menuFoodIds 需要删除的每日食谱主键
+     * @return 结果
+     */
+    @Override
+    public int deleteMenuFoodByMenuFoodIds(Long[] menuFoodIds)
+    {
+        return menuFoodMapper.deleteMenuFoodByMenuFoodIds(menuFoodIds);
+    }
+
+    /**
+     * 删除每日食谱信息
+     * 
+     * @param menuFoodId 每日食谱主键
+     * @return 结果
+     */
+    @Override
+    public int deleteMenuFoodByMenuFoodId(Long menuFoodId)
+    {
+        return menuFoodMapper.deleteMenuFoodByMenuFoodId(menuFoodId);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SignInServiceImpl.java

@@ -0,0 +1,131 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.ConferenceRoomOrder;
+import com.ruoyi.system.domain.SignIn;
+import com.ruoyi.system.mapper.ConferenceRoomOrderMapper;
+import com.ruoyi.system.mapper.SignInMapper;
+import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.system.service.ISignInService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 会议室签到Service业务层处理
+ *
+ * @author boman
+ * @date 2024-11-04
+ */
+@Service
+public class SignInServiceImpl implements ISignInService {
+    @Autowired
+    private SignInMapper signInMapper;
+    @Autowired
+    private SysUserMapper sysUserMapper;
+    @Autowired
+    private ConferenceRoomOrderMapper conferenceRoomOrderMapper;
+
+
+    /**
+     * 查询会议室签到
+     *
+     * @param signInId 会议室签到主键
+     * @return 会议室签到
+     */
+    @Override
+    public SignIn selectSignInBySignInId(Long signInId) {
+        return signInMapper.selectSignInBySignInId(signInId);
+    }
+
+    /**
+     * 查询会议室签到列表
+     *
+     * @param signIn 会议室签到
+     * @return 会议室签到
+     */
+    @Override
+    public List<SignIn> selectSignInList(SignIn signIn) {
+        return signInMapper.selectSignInList(signIn);
+    }
+
+    /**
+     * 新增会议室签到
+     *
+     * @param signIn 会议室签到
+     * @return 结果
+     */
+    @Override
+    public int insertSignIn(SignIn signIn) {
+        int row = 0;
+        Long userId = signIn.getUserId();
+        SysUser sysUser = sysUserMapper.selectUserById(userId);
+        if (sysUser != null) {
+            String avatar = sysUser.getAvatar();
+            if (StringUtils.isNotBlank(avatar)) {
+                signIn.setAvatar(avatar);
+            }
+            String nickName = sysUser.getNickName();
+            if (StringUtils.isNotBlank(nickName)) {
+                signIn.setNickName(nickName);
+            }
+        }
+        signIn.setSignTime(DateUtils.getNowDate());
+        //先去查询用户是否已经签到
+        SignIn sign = new SignIn();
+        Long conferenceRoomOrderId = signIn.getConferenceRoomOrderId();
+        ConferenceRoomOrder conferenceRoomOrder = conferenceRoomOrderMapper.selectConferenceRoomOrderByConferenceRoomOrderId(conferenceRoomOrderId);
+        if (conferenceRoomOrder != null){
+            sign.setConferenceRoomName(conferenceRoomOrder.getConferenceRoomName());
+            sign.setConferenceRoomOrderName(conferenceRoomOrder.getConferenceName());
+            sign.setConferenceRoomOrderId(conferenceRoomOrderId);
+            sign.setUserId(userId);
+            List<SignIn> signIns = signInMapper.selectSignInList(sign);
+            if (signIns != null && signIns.size() > 0) {
+                Long signInId = signIns.get(0).getSignInId();
+                signIn.setSignInId(signInId);
+                row = signInMapper.updateSignIn(signIn);
+            } else {
+                row = signInMapper.insertSignIn(signIn);
+            }
+        }
+        return row;
+    }
+
+    /**
+     * 修改会议室签到
+     *
+     * @param signIn 会议室签到
+     * @return 结果
+     */
+    @Override
+    public int updateSignIn(SignIn signIn) {
+        signIn.setUpdateTime(DateUtils.getNowDate());
+        return signInMapper.updateSignIn(signIn);
+    }
+
+    /**
+     * 批量删除会议室签到
+     *
+     * @param signInIds 需要删除的会议室签到主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSignInBySignInIds(Long[] signInIds) {
+        return signInMapper.deleteSignInBySignInIds(signInIds);
+    }
+
+    /**
+     * 删除会议室签到信息
+     *
+     * @param signInId 会议室签到主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSignInBySignInId(Long signInId) {
+        return signInMapper.deleteSignInBySignInId(signInId);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/Task.java

@@ -0,0 +1,50 @@
+package com.ruoyi.system.service.impl;
+
+
+import com.google.gson.Gson;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.MenuFood;
+import com.ruoyi.system.domain.MenuFoodRecord;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+import java.util.Locale;
+
+/**
+ * 定时任务
+ */
+@Component
+public class Task {
+    @Autowired
+    private MenuFoodRecordServiceImpl menuFoodRecordService;
+    @Autowired
+    private MenuFoodServiceImpl menuFoodService;
+    private static final Gson GSON = new Gson();
+
+    /***
+     *每日食谱记录定时任务
+     * 每天23点执行
+     * @throws Exception
+     */
+    @Async
+    //@Scheduled(cron = "0 0 23 * * ? ")
+    public void popover() throws Exception {
+        // 获取当前日期
+        LocalDate currentDate = LocalDate.now();
+        // 格式化日期为星期几，使用中文环境
+        String currentDayOfWeek = currentDate.format(DateTimeFormatter.ofPattern("E", Locale.CHINA));
+        MenuFood menuFood = new MenuFood();
+        menuFood.setMenuFoodTime(currentDayOfWeek);
+        menuFood.setIsUse("Y");
+        List<MenuFood> menuFoods = menuFoodService.selectMenuFoodList(menuFood);
+        if (menuFoods != null && menuFoods.size() > 0) {
+            MenuFoodRecord menuFoodRecord = GSON.fromJson(GSON.toJson(menuFoods.get(0)), MenuFoodRecord.class);
+            menuFoodRecord.setRecordTime(DateUtils.getNowDate());
+            menuFoodRecordService.insertMenuFoodRecord(menuFoodRecord);
+        }
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/VoteResultServiceImpl.java

@@ -0,0 +1,158 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.VoteOption;
+import com.ruoyi.system.domain.VoteResult;
+import com.ruoyi.system.domain.VoteTheme;
+import com.ruoyi.system.mapper.VoteResultMapper;
+import com.ruoyi.system.mapper.VoteThemeMapper;
+import com.ruoyi.system.service.IVoteResultService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 投票结果Service业务层处理
+ * 
+ * @author boman
+ * @date 2024-11-15
+ */
+@Service
+public class VoteResultServiceImpl implements IVoteResultService 
+{
+    @Autowired
+    private VoteResultMapper voteResultMapper;
+    @Autowired
+    private VoteThemeMapper voteThemeMapper;
+
+    /**
+     * 查询投票结果
+     * 
+     * @param voteResultId 投票结果主键
+     * @return 投票结果
+     */
+    @Override
+    public VoteResult selectVoteResultByVoteResultId(Long voteResultId)
+    {
+        return voteResultMapper.selectVoteResultByVoteResultId(voteResultId);
+    }
+
+    /**
+     * 查询投票结果列表
+     * 
+     * @param voteResult 投票结果
+     * @return 投票结果
+     */
+    @Override
+    public List<VoteResult> selectVoteResultList(VoteResult voteResult)
+    {
+        return voteResultMapper.selectVoteResultList(voteResult);
+    }
+
+    /**
+     * 前端查询投票结果前端
+     * @param voteResult
+     * @return
+     */
+    @Override
+    public AjaxResult statistics(VoteResult voteResult) {
+        List<VoteTheme> voteThemes = voteThemeMapper.selectVoteThemeByConferenceRoomOrderId(voteResult.getConferenceRoomOrderId());
+        if (voteThemes.size() > 0){
+            //根据会议预约id conferenceRoomOrderId 查询所有投票记录
+            List<VoteResult> voteResults = voteResultMapper.selectVoteResultList(voteResult);
+            List<Map<String,Object>> list = new ArrayList<>();
+            for (VoteTheme voteTheme : voteThemes) {
+                Map<String,Object> themeMap = new HashMap<>();
+                List<Map<String,Object>> optionList = new ArrayList<>();
+                //标题id
+                themeMap.put("themeId",voteTheme.getThemeId());
+                //标题
+                themeMap.put("themeContent",voteTheme.getThemeContent());
+                //总人数
+                themeMap.put("total",0);
+                //选项
+                themeMap.put("voteOptionList",optionList);
+                if (voteResults.size() > 0){
+                    Map<Long, List<VoteResult>> voteResultList = voteResults.stream().collect(Collectors.groupingBy(VoteResult::getThemeId));
+                    if (voteResultList.get(voteTheme.getThemeId()) != null && voteResultList.get(voteTheme.getThemeId()).size() >0){
+                        themeMap.put("total",voteResultList.get(voteTheme.getThemeId()).size());
+                    }
+                }
+                List<VoteOption> voteOptionList = voteTheme.getVoteOptionList();
+                for (VoteOption voteOption : voteOptionList) {
+                    Map<String,Object> optionMap = new HashMap<>(3);
+                    optionMap.put("optionId",voteOption.getOptionId());
+                    optionMap.put("optionName",voteOption.getOptionName());
+                    optionMap.put("total",0);
+                    //投票记录根据投票选项进行分组
+                    Map<Long, List<VoteResult>> voteResultsOptionIdValue = voteResults.stream().collect(Collectors.groupingBy(VoteResult::getOptionId));
+                    if (voteResultsOptionIdValue.size() > 0){
+                        if (voteResultsOptionIdValue.get(voteOption.getOptionId()) != null && voteResultsOptionIdValue.get(voteOption.getOptionId()).size() > 0){
+                            optionMap.put("total",voteResultsOptionIdValue.get(voteOption.getOptionId()).size());
+                        }
+                    }
+                    optionList.add(optionMap);
+                }
+                list.add(themeMap);
+            }
+            return AjaxResult.success(list);
+        }
+        return AjaxResult.error();
+    }
+
+    /**
+     * 新增投票结果
+     * 
+     * @param voteResult 投票结果
+     * @return 结果
+     */
+    @Override
+    public int insertVoteResult(VoteResult voteResult)
+    {
+        voteResult.setCreateTime(DateUtils.getNowDate());
+        return voteResultMapper.insertVoteResult(voteResult);
+    }
+
+    /**
+     * 修改投票结果
+     * 
+     * @param voteResult 投票结果
+     * @return 结果
+     */
+    @Override
+    public int updateVoteResult(VoteResult voteResult)
+    {
+        voteResult.setUpdateTime(DateUtils.getNowDate());
+        return voteResultMapper.updateVoteResult(voteResult);
+    }
+
+    /**
+     * 批量删除投票结果
+     * 
+     * @param voteResultIds 需要删除的投票结果主键
+     * @return 结果
+     */
+    @Override
+    public int deleteVoteResultByVoteResultIds(Long[] voteResultIds)
+    {
+        return voteResultMapper.deleteVoteResultByVoteResultIds(voteResultIds);
+    }
+
+    /**
+     * 删除投票结果信息
+     * 
+     * @param voteResultId 投票结果主键
+     * @return 结果
+     */
+    @Override
+    public int deleteVoteResultByVoteResultId(Long voteResultId)
+    {
+        return voteResultMapper.deleteVoteResultByVoteResultId(voteResultId);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/VoteThemeServiceImpl.java

@@ -0,0 +1,127 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.VoteOption;
+import com.ruoyi.system.domain.VoteTheme;
+import com.ruoyi.system.mapper.VoteThemeMapper;
+import com.ruoyi.system.service.IVoteThemeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 投票主题Service业务层处理
+ *
+ * @author boman
+ * @date 2024-11-15
+ */
+@Service
+public class VoteThemeServiceImpl implements IVoteThemeService {
+    @Autowired
+    private VoteThemeMapper voteThemeMapper;
+
+    /**
+     * 查询投票主题
+     *
+     * @param themeId 投票主题主键
+     * @return 投票主题
+     */
+    @Override
+    public VoteTheme selectVoteThemeByThemeId(Long themeId) {
+        return voteThemeMapper.selectVoteThemeByThemeId(themeId);
+    }
+
+    /**
+     * 查询投票主题列表
+     *
+     * @param voteTheme 投票主题
+     * @return 投票主题
+     */
+    @Override
+    public List<VoteTheme> selectVoteThemeList(VoteTheme voteTheme) {
+        return voteThemeMapper.selectVoteThemeList(voteTheme);
+    }
+
+    /**
+     * 新增投票主题
+     *
+     * @param voteTheme 投票主题
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public AjaxResult insertVoteTheme(VoteTheme voteTheme) {
+        int rows = voteThemeMapper.insertVoteTheme(voteTheme);
+        insertVoteOption(voteTheme);
+        if (rows > 0) {
+            VoteTheme voteThemeBack = voteThemeMapper.selectVoteThemeByThemeId(voteTheme.getThemeId());
+            return AjaxResult.success(voteThemeBack);
+        } else {
+            return AjaxResult.error();
+        }
+    }
+
+    /**
+     * 修改投票主题
+     *
+     * @param voteTheme 投票主题
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int updateVoteTheme(VoteTheme voteTheme) {
+        voteThemeMapper.deleteVoteOptionByThemeId(voteTheme.getThemeId());
+        insertVoteOption(voteTheme);
+        return voteThemeMapper.updateVoteTheme(voteTheme);
+    }
+
+    /**
+     * 批量删除投票主题
+     *
+     * @param themeIds 需要删除的投票主题主键
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int deleteVoteThemeByThemeIds(Long[] themeIds) {
+        voteThemeMapper.deleteVoteOptionByThemeIds(themeIds);
+        return voteThemeMapper.deleteVoteThemeByThemeIds(themeIds);
+    }
+
+    /**
+     * 删除投票主题信息
+     *
+     * @param themeId 投票主题主键
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int deleteVoteThemeByThemeId(Long themeId) {
+        voteThemeMapper.deleteVoteOptionByThemeId(themeId);
+        return voteThemeMapper.deleteVoteThemeByThemeId(themeId);
+    }
+
+    /**
+     * 新增投票选项信息
+     *
+     * @param voteTheme 投票主题对象
+     */
+    public void insertVoteOption(VoteTheme voteTheme) {
+        List<VoteOption> voteOptionList = voteTheme.getVoteOptionList();
+        Long themeId = voteTheme.getThemeId();
+        if (StringUtils.isNotNull(voteOptionList)) {
+            List<VoteOption> list = new ArrayList<VoteOption>();
+            for (VoteOption voteOption : voteOptionList) {
+                voteOption.setThemeId(themeId);
+                list.add(voteOption);
+            }
+            if (list.size() > 0) {
+                voteThemeMapper.batchVoteOption(list);
+            }
+        }
+    }
+}

ruoyi-system/src/main/resources/mapper/system/ConferenceRoomOrderMapper.xml

@@ -16,6 +16,7 @@
         <result property="startTime" column="start_time"/>
         <result property="endTime" column="end_time"/>
         <result property="useXk" column="use_xk"/>
+        <result property="xkDetail" column="xk_detail"/>
         <result property="createDept" column="create_dept"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
@@ -36,6 +37,7 @@
                start_time,
                end_time,
                use_xk,
+               xk_detail,
                create_dept,
                create_by,
                create_time,
@@ -67,6 +69,7 @@
             <if test="startTime != null ">and start_time = #{startTime}</if>
             <if test="endTime != null ">and end_time = #{endTime}</if>
             <if test="useXk != null and useXk != ''">and use_xk = #{useXk}</if>
+            <if test="xkDetail != null and xkDetail != ''">and xk_detail = #{xkDetail}</if>
             <if test="createDept != null ">and create_dept = #{createDept}</if>
         </where>
         order by end_time DESC
@@ -141,6 +144,7 @@
             <if test="startTime != null">start_time,</if>
             <if test="endTime != null">end_time,</if>
             <if test="useXk != null">use_xk,</if>
+            <if test="xkDetail != null">xk_detail,</if>
             <if test="createDept != null">create_dept,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -159,6 +163,7 @@
             <if test="startTime != null">#{startTime},</if>
             <if test="endTime != null">#{endTime},</if>
             <if test="useXk != null">#{useXk},</if>
+            <if test="xkDetail != null">#{xkDetail},</if>
             <if test="createDept != null">#{createDept},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -181,6 +186,7 @@
             <if test="startTime != null">start_time = #{startTime},</if>
             <if test="endTime != null">end_time = #{endTime},</if>
             <if test="useXk != null">use_xk = #{useXk},</if>
+            <if test="xkDetail != null">xk_detail = #{xkDetail},</if>
             <if test="createDept != null">create_dept = #{createDept},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>

ruoyi-system/src/main/resources/mapper/system/MeetingRecordsMapper.xml

@@ -0,0 +1,103 @@
+<?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="com.ruoyi.system.mapper.MeetingRecordsMapper">
+    
+    <resultMap type="MeetingRecords" id="MeetingRecordsResult">
+        <result property="recordId"    column="record_id"    />
+        <result property="conferenceRoomOrderId"    column="conference_room_order_id"    />
+        <result property="recordContent"    column="record_content"    />
+        <result property="audioUrl"    column="audio_url"    />
+        <result property="userId"    column="user_id"    />
+        <result property="avatar"    column="avatar"    />
+        <result property="nickName"    column="nick_name"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectMeetingRecordsVo">
+        select record_id, conference_room_order_id,audio_url, record_content, user_id, avatar, nick_name, create_time, update_by, update_time, remark from meeting_records
+    </sql>
+
+    <select id="selectMeetingRecordsList" parameterType="MeetingRecords" resultMap="MeetingRecordsResult">
+        <include refid="selectMeetingRecordsVo"/>
+        <where>  
+            <if test="conferenceRoomOrderId != null "> and conference_room_order_id = #{conferenceRoomOrderId}</if>
+            <if test="recordContent != null  and recordContent != ''"> and record_content = #{recordContent}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="avatar != null  and avatar != ''"> and avatar = #{avatar}</if>
+            <if test="nickName != null  and nickName != ''"> and nick_name like concat('%', #{nickName}, '%')</if>
+        </where>
+        order by create_time
+    </select>
+    
+    <select id="selectMeetingRecordsByConferenceRoomOrderId" parameterType="Long" resultMap="MeetingRecordsResult">
+        <include refid="selectMeetingRecordsVo"/>
+        where conference_room_order_id = #{conferenceRoomOrderId} limit 1
+    </select>
+    <select id="selectMeetingRecordsByRecordId" parameterType="Long" resultMap="MeetingRecordsResult">
+        <include refid="selectMeetingRecordsVo"/>
+        where record_id = #{recordId}
+    </select>
+
+    <insert id="insertMeetingRecords" parameterType="MeetingRecords" useGeneratedKeys="true" keyProperty="recordId">
+        insert into meeting_records
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="recordId != null and recordId != ''">record_id,</if>
+            <if test="conferenceRoomOrderId != null ">conference_room_order_id,</if>
+            <if test="recordContent != null">record_content,</if>
+            <if test="audioUrl != null and audioUrl != ''">audio_url,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="avatar != null">avatar,</if>
+            <if test="nickName != null and nickName != ''">nick_name,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+            create_time
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="recordId != null and recordId != ''">#{recordId},</if>
+            <if test="conferenceRoomOrderId != null">#{conferenceRoomOrderId},</if>
+            <if test="recordContent != null">#{recordContent},</if>
+            <if test="audioUrl != null and audioUrl != ''">#{audioUrl},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="avatar != null">#{avatar},</if>
+            <if test="nickName != null and nickName != ''">#{nickName},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+            sysdate()
+         </trim>
+    </insert>
+
+    <update id="updateMeetingRecords" parameterType="MeetingRecords">
+        update meeting_records
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="conferenceRoomOrderId != null">conference_room_order_id = #{conferenceRoomOrderId},</if>
+            <if test="recordContent != null">record_content = #{recordContent},</if>
+            <if test="audioUrl != null and audioUrl != ''">audio_url =#{audioUrl},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="avatar != null">avatar = #{avatar},</if>
+            <if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            create_time = sysdate(),
+        </trim>
+        where record_id = #{recordId}
+    </update>
+
+    <delete id="deleteMeetingRecordsByRecordId" parameterType="String">
+        delete from meeting_records where record_id = #{recordId}
+    </delete>
+
+    <delete id="deleteMeetingRecordsByRecordIds" parameterType="String">
+        delete from meeting_records where record_id in 
+        <foreach item="recordId" collection="array" open="(" separator="," close=")">
+            #{recordId}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-system/src/main/resources/mapper/system/MenuFoodMapper.xml

@@ -0,0 +1,151 @@
+<?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="com.ruoyi.system.mapper.MenuFoodMapper">
+
+    <resultMap type="MenuFood" id="MenuFoodResult">
+        <result property="menuFoodId" column="menu_food_id"/>
+        <result property="menuFoodTime" column="menu_food_time"/>
+        <result property="menuFoodType" column="menu_food_type"/>
+        <result property="menuFoodDetailBk" column="menu_food_detail_bk"/>
+        <result property="menuFoodDetailLu" column="menu_food_detail_lu"/>
+        <result property="menuFoodDetailDi" column="menu_food_detail_di"/>
+        <result property="canteenName" column="canteen_name"/>
+        <result property="canteenId" column="canteen_id"/>
+        <result property="isUse" column="is_use"/>
+        <result property="createDept" column="create_dept"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
+
+    <sql id="selectMenuFoodVo">
+        select menu_food_id,
+               menu_food_time,
+               menu_food_type,
+               menu_food_detail_bk,
+               menu_food_detail_lu,
+               menu_food_detail_di,
+               canteen_name,
+               canteen_id,
+               is_use,
+               create_dept,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               remark
+        from menu_food
+    </sql>
+
+    <select id="selectMenuFoodList" parameterType="MenuFood" resultMap="MenuFoodResult">
+        <include refid="selectMenuFoodVo"/>
+        <where>
+            <if test="menuFoodTime != null  and menuFoodTime != ''">and menu_food_time = #{menuFoodTime}</if>
+            <if test="menuFoodType != null  and menuFoodType != ''">and menu_food_type = #{menuFoodType}</if>
+            <if test="menuFoodDetailBk != null  and menuFoodDetailBk != ''">and menu_food_detail_bk =
+                #{menuFoodDetailBk}
+            </if>
+            <if test="menuFoodDetailLu != null  and menuFoodDetailLu != ''">and menu_food_detail_lu =
+                #{menuFoodDetailLu}
+            </if>
+            <if test="menuFoodDetailDi != null  and menuFoodDetailDi != ''">and menu_food_detail_di =
+                #{menuFoodDetailDi}
+            </if>
+            <if test="canteenName != null  and canteenName != ''">and canteen_name like concat('%', #{canteenName},
+                '%')
+            </if>
+            <if test="canteenId != null ">and canteen_id = #{canteenId}</if>
+            <if test="isUse != null  and isUse != ''">and is_use = #{isUse}</if>
+        </where>
+        order by menu_food_time,is_use DESC
+    </select>
+
+    <select id="selectMenuFoodByMenuFoodId" parameterType="Long" resultMap="MenuFoodResult">
+        <include refid="selectMenuFoodVo"/>
+        where menu_food_id = #{menuFoodId}
+    </select>
+
+    <insert id="insertMenuFood" parameterType="MenuFood" useGeneratedKeys="true" keyProperty="menuFoodId">
+        insert into menu_food
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="menuFoodTime != null">menu_food_time,</if>
+            <if test="menuFoodType != null">menu_food_type,</if>
+            <if test="menuFoodDetailBk != null">menu_food_detail_bk,</if>
+            <if test="menuFoodDetailLu != null">menu_food_detail_lu,</if>
+            <if test="menuFoodDetailDi != null">menu_food_detail_di,</if>
+            <if test="canteenName != null">canteen_name,</if>
+            <if test="canteenId != null">canteen_id,</if>
+            <if test="isUse != null">is_use,</if>
+            <if test="createDept != null">create_dept,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="menuFoodTime != null">#{menuFoodTime},</if>
+            <if test="menuFoodType != null">#{menuFoodType},</if>
+            <if test="menuFoodDetailBk != null">#{menuFoodDetailBk},</if>
+            <if test="menuFoodDetailLu != null">#{menuFoodDetailLu},</if>
+            <if test="menuFoodDetailDi != null">#{menuFoodDetailDi},</if>
+            <if test="canteenName != null">#{canteenName},</if>
+            <if test="canteenId != null">#{canteenId},</if>
+            <if test="isUse != null">#{isUse},</if>
+            <if test="createDept != null">#{createDept},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+        </trim>
+    </insert>
+
+    <insert id="batchMenuFoodVo">
+        insert into menu_food(menu_food_time, menu_food_detail_bk, menu_food_detail_lu, menu_food_detail_di, is_use,
+        create_time, remark) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            (#{item.menuFoodTime},#{item.menuFoodDetailBk},#{item.menuFoodDetailLu},#{item.menuFoodDetailDi},#{item.isUse},sysdate(),#{item.remark})
+        </foreach>
+    </insert>
+    <update id="updateMenuFood" parameterType="MenuFood">
+        update menu_food
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="menuFoodTime != null">menu_food_time = #{menuFoodTime},</if>
+            <if test="menuFoodType != null">menu_food_type = #{menuFoodType},</if>
+            <if test="menuFoodDetailBk != null">menu_food_detail_bk = #{menuFoodDetailBk},</if>
+            <if test="menuFoodDetailLu != null">menu_food_detail_lu = #{menuFoodDetailLu},</if>
+            <if test="menuFoodDetailDi != null">menu_food_detail_di = #{menuFoodDetailDi},</if>
+            <if test="canteenName != null">canteen_name = #{canteenName},</if>
+            <if test="canteenId != null">canteen_id = #{canteenId},</if>
+            <if test="isUse != null">is_use = #{isUse},</if>
+            <if test="createDept != null">create_dept = #{createDept},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where menu_food_id = #{menuFoodId}
+    </update>
+    <update id="updateMenuFoodTime" parameterType="string">
+        update menu_food set is_use = 'N' where menu_food_time = #{menuFoodTime}
+    </update>
+
+    <delete id="deleteMenuFoodByMenuFoodId" parameterType="Long">
+        delete
+        from menu_food
+        where menu_food_id = #{menuFoodId}
+    </delete>
+
+    <delete id="deleteMenuFoodByMenuFoodIds" parameterType="String">
+        delete from menu_food where menu_food_id in
+        <foreach item="menuFoodId" collection="array" open="(" separator="," close=")">
+            #{menuFoodId}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-system/src/main/resources/mapper/system/MenuFoodRecordMapper.xml

@@ -0,0 +1,116 @@
+<?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="com.ruoyi.system.mapper.MenuFoodRecordMapper">
+    
+    <resultMap type="MenuFoodRecord" id="MenuFoodRecordResult">
+        <result property="menuFoodRecordId"    column="menu_food_record_id"    />
+        <result property="menuFoodTime"    column="menu_food_time"    />
+        <result property="menuFoodType"    column="menu_food_type"    />
+        <result property="menuFoodDetailBk"    column="menu_food_detail_bk"    />
+        <result property="menuFoodDetailLu"    column="menu_food_detail_lu"    />
+        <result property="menuFoodDetailDi"    column="menu_food_detail_di"    />
+        <result property="canteenName"    column="canteen_name"    />
+        <result property="canteenId"    column="canteen_id"    />
+        <result property="recordTime"    column="record_time"    />
+        <result property="createDept"    column="create_dept"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectMenuFoodRecordVo">
+        select menu_food_record_id, menu_food_time, menu_food_type, menu_food_detail_bk, menu_food_detail_lu, menu_food_detail_di, canteen_name, canteen_id, record_time, create_dept, create_by, create_time, update_by, update_time, remark from menu_food_record
+    </sql>
+
+    <select id="selectMenuFoodRecordList" parameterType="MenuFoodRecord" resultMap="MenuFoodRecordResult">
+        <include refid="selectMenuFoodRecordVo"/>
+        <where>  
+            <if test="menuFoodTime != null  and menuFoodTime != ''"> and menu_food_time = #{menuFoodTime}</if>
+            <if test="menuFoodType != null  and menuFoodType != ''"> and menu_food_type = #{menuFoodType}</if>
+            <if test="menuFoodDetailBk != null  and menuFoodDetailBk != ''"> and menu_food_detail_bk = #{menuFoodDetailBk}</if>
+            <if test="menuFoodDetailLu != null  and menuFoodDetailLu != ''"> and menu_food_detail_lu = #{menuFoodDetailLu}</if>
+            <if test="menuFoodDetailDi != null  and menuFoodDetailDi != ''"> and menu_food_detail_di = #{menuFoodDetailDi}</if>
+            <if test="canteenName != null  and canteenName != ''"> and canteen_name like concat('%', #{canteenName}, '%')</if>
+            <if test="canteenId != null "> and canteen_id = #{canteenId}</if>
+            <if test="recordTime != null "> and record_time = #{recordTime}</if>
+        </where>
+        order by record_time DESC
+    </select>
+    
+    <select id="selectMenuFoodRecordByMenuFoodRecordId" parameterType="Long" resultMap="MenuFoodRecordResult">
+        <include refid="selectMenuFoodRecordVo"/>
+        where menu_food_record_id = #{menuFoodRecordId}
+    </select>
+        
+    <insert id="insertMenuFoodRecord" parameterType="MenuFoodRecord" useGeneratedKeys="true" keyProperty="menuFoodRecordId">
+        insert into menu_food_record
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="menuFoodTime != null">menu_food_time,</if>
+            <if test="menuFoodType != null">menu_food_type,</if>
+            <if test="menuFoodDetailBk != null">menu_food_detail_bk,</if>
+            <if test="menuFoodDetailLu != null">menu_food_detail_lu,</if>
+            <if test="menuFoodDetailDi != null">menu_food_detail_di,</if>
+            <if test="canteenName != null">canteen_name,</if>
+            <if test="canteenId != null">canteen_id,</if>
+            <if test="recordTime != null">record_time,</if>
+            <if test="createDept != null">create_dept,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="menuFoodTime != null">#{menuFoodTime},</if>
+            <if test="menuFoodType != null">#{menuFoodType},</if>
+            <if test="menuFoodDetailBk != null">#{menuFoodDetailBk},</if>
+            <if test="menuFoodDetailLu != null">#{menuFoodDetailLu},</if>
+            <if test="menuFoodDetailDi != null">#{menuFoodDetailDi},</if>
+            <if test="canteenName != null">#{canteenName},</if>
+            <if test="canteenId != null">#{canteenId},</if>
+            <if test="recordTime != null">#{recordTime},</if>
+            <if test="createDept != null">#{createDept},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateMenuFoodRecord" parameterType="MenuFoodRecord">
+        update menu_food_record
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="menuFoodTime != null">menu_food_time = #{menuFoodTime},</if>
+            <if test="menuFoodType != null">menu_food_type = #{menuFoodType},</if>
+            <if test="menuFoodDetailBk != null">menu_food_detail_bk = #{menuFoodDetailBk},</if>
+            <if test="menuFoodDetailLu != null">menu_food_detail_lu = #{menuFoodDetailLu},</if>
+            <if test="menuFoodDetailDi != null">menu_food_detail_di = #{menuFoodDetailDi},</if>
+            <if test="canteenName != null">canteen_name = #{canteenName},</if>
+            <if test="canteenId != null">canteen_id = #{canteenId},</if>
+            <if test="recordTime != null">record_time = #{recordTime},</if>
+            <if test="createDept != null">create_dept = #{createDept},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where menu_food_record_id = #{menuFoodRecordId}
+    </update>
+
+    <delete id="deleteMenuFoodRecordByMenuFoodRecordId" parameterType="Long">
+        delete from menu_food_record where menu_food_record_id = #{menuFoodRecordId}
+    </delete>
+
+    <delete id="deleteMenuFoodRecordByMenuFoodRecordIds" parameterType="String">
+        delete from menu_food_record where menu_food_record_id in 
+        <foreach item="menuFoodRecordId" collection="array" open="(" separator="," close=")">
+            #{menuFoodRecordId}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-system/src/main/resources/mapper/system/SignInMapper.xml

@@ -0,0 +1,116 @@
+<?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="com.ruoyi.system.mapper.SignInMapper">
+    
+    <resultMap type="SignIn" id="SignInResult">
+        <result property="signInId"    column="sign_in_id"    />
+        <result property="conferenceRoomOrderId"    column="conference_room_order_id"    />
+        <result property="conferenceRoomOrderName"    column="conference_room_order_name"    />
+        <result property="conferenceRoomId"    column="conference_room_id"    />
+        <result property="conferenceRoomName"    column="conference_room_name"    />
+        <result property="userId"    column="user_id"    />
+        <result property="avatar"    column="avatar"    />
+        <result property="nickName"    column="nick_name"    />
+        <result property="signTime"    column="sign_time"    />
+        <result property="createDept"    column="create_dept"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectSignInVo">
+        select sign_in_id, conference_room_order_id,conference_room_order_name, conference_room_id,conference_room_name, user_id, avatar, nick_name, sign_time, create_dept, create_by, create_time, update_by, update_time, remark from sign_in
+    </sql>
+
+    <select id="selectSignInList" parameterType="SignIn" resultMap="SignInResult">
+        <include refid="selectSignInVo"/>
+        <where>  
+            <if test="conferenceRoomOrderId != null "> and conference_room_order_id = #{conferenceRoomOrderId}</if>
+            <if test="conferenceRoomOrderName != null and conferenceRoomOrderName != ''"> and conference_room_order_name = #{conferenceRoomOrderName}</if>
+            <if test="conferenceRoomId != null "> and conference_room_id = #{conferenceRoomId}</if>
+            <if test="conferenceRoomName != null and conferenceRoomName != '' "> and conferenceRoomName = #{conference_room_name}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="avatar != null  and avatar != ''"> and avatar = #{avatar}</if>
+            <if test="nickName != null  and nickName != ''"> and nick_name like concat('%', #{nickName}, '%')</if>
+            <if test="signTime != null "> and sign_time = #{signTime}</if>
+            <if test="createDept != null "> and create_dept = #{createDept}</if>
+        </where>
+    </select>
+    
+    <select id="selectSignInBySignInId" parameterType="Long" resultMap="SignInResult">
+        <include refid="selectSignInVo"/>
+        where sign_in_id = #{signInId}
+    </select>
+        
+    <insert id="insertSignIn" parameterType="SignIn" useGeneratedKeys="true" keyProperty="signInId">
+        insert into sign_in
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="conferenceRoomOrderId != null">conference_room_order_id,</if>
+            <if test="conferenceRoomOrderName != null and conferenceRoomOrderName != ''">conference_room_order_name,</if>
+            <if test="conferenceRoomId != null">conference_room_id,</if>
+            <if test="conferenceRoomName != null and conferenceRoomName != ''">conference_room_name,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="avatar != null">avatar,</if>
+            <if test="nickName != null">nick_name,</if>
+            <if test="signTime != null">sign_time,</if>
+            <if test="createDept != null">create_dept,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+            create_time
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="conferenceRoomOrderId != null">#{conferenceRoomOrderId},</if>
+            <if test="conferenceRoomOrderName != null and conferenceRoomOrderName != ''">#{conferenceRoomOrderName},</if>
+            <if test="conferenceRoomId != null">#{conferenceRoomId},</if>
+            <if test="conferenceRoomName != null and conferenceRoomName != ''">#{conferenceRoomName},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="avatar != null">#{avatar},</if>
+            <if test="nickName != null">#{nickName},</if>
+            <if test="signTime != null">#{signTime},</if>
+            <if test="createDept != null">#{createDept},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+            sysdate()
+         </trim>
+    </insert>
+
+    <update id="updateSignIn" parameterType="SignIn">
+        update sign_in
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="conferenceRoomOrderId != null">conference_room_order_id = #{conferenceRoomOrderId},</if>
+            <if test="conferenceRoomOrderName != null and conferenceRoomOrderName != ''">conference_room_order_name = #{conferenceRoomOrderName},</if>
+            <if test="conferenceRoomId != null">conference_room_id = #{conferenceRoomId},</if>
+            <if test="conferenceRoomName != null and conferenceRoomName != ''">conference_room_name = #{conferenceRoomName},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="avatar != null">avatar = #{avatar},</if>
+            <if test="nickName != null">nick_name = #{nickName},</if>
+            <if test="signTime != null">sign_time = #{signTime},</if>
+            <if test="createDept != null">create_dept = #{createDept},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where sign_in_id = #{signInId}
+    </update>
+
+    <delete id="deleteSignInBySignInId" parameterType="Long">
+        delete from sign_in where sign_in_id = #{signInId}
+    </delete>
+
+    <delete id="deleteSignInBySignInIds" parameterType="String">
+        delete from sign_in where sign_in_id in 
+        <foreach item="signInId" collection="array" open="(" separator="," close=")">
+            #{signInId}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -150,7 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
 	</select>
     <select id="getUserInfoList" parameterType="Long" resultMap="SysUserVoResult">
-		select user_id, user_name,phonenumber,avatar from sys_user where user_id in
+		select user_id, user_name,nick_name,phonenumber,avatar from sys_user where user_id in
 		<foreach collection="array" item="userId" open="(" separator="," close=")">
 			#{userId}
 		</foreach>

ruoyi-system/src/main/resources/mapper/system/VoteResultMapper.xml

@@ -0,0 +1,107 @@
+<?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="com.ruoyi.system.mapper.VoteResultMapper">
+    
+    <resultMap type="VoteResult" id="VoteResultResult">
+        <result property="voteResultId"    column="vote_result_id"    />
+        <result property="themeId"    column="theme_id"    />
+        <result property="themeContent"    column="theme_content"    />
+        <result property="optionId"    column="option_id"    />
+        <result property="optionName"    column="option_name"    />
+        <result property="conferenceRoomOrderId"    column="conference_room_order_id"    />
+        <result property="userId"    column="user_id"    />
+        <result property="avatar"    column="avatar"    />
+        <result property="nickName"    column="nick_name"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectVoteResultVo">
+        select vote_result_id, theme_id, theme_content, option_id, option_name,conference_room_order_id, user_id, avatar, nick_name, create_time, update_by, update_time, remark from vote_result
+    </sql>
+
+    <select id="selectVoteResultList" parameterType="VoteResult" resultMap="VoteResultResult">
+        <include refid="selectVoteResultVo"/>
+        <where>  
+            <if test="themeId != null "> and theme_id = #{themeId}</if>
+            <if test="themeContent != null  and themeContent != ''"> and theme_content = #{themeContent}</if>
+            <if test="optionId != null "> and option_id = #{optionId}</if>
+            <if test="optionName != null  and optionName != ''"> and option_name like concat('%', #{optionName}, '%')</if>
+            <if test="conferenceRoomOrderId != null "> and conference_room_order_id = #{conferenceRoomOrderId}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="avatar != null  and avatar != ''"> and avatar = #{avatar}</if>
+            <if test="nickName != null  and nickName != ''"> and nick_name like concat('%', #{nickName}, '%')</if>
+        </where>
+    </select>
+    
+    <select id="selectVoteResultByVoteResultId" parameterType="Long" resultMap="VoteResultResult">
+        <include refid="selectVoteResultVo"/>
+        where vote_result_id = #{voteResultId}
+    </select>
+        
+    <insert id="insertVoteResult" parameterType="VoteResult" useGeneratedKeys="true" keyProperty="voteResultId">
+        insert into vote_result
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="themeId != null">theme_id,</if>
+            <if test="themeContent != null and themeContent != ''">theme_content,</if>
+            <if test="optionId != null">option_id,</if>
+            <if test="optionName != null and optionName != ''">option_name,</if>
+            <if test="conferenceRoomOrderId != null">conference_room_order_id,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="avatar != null">avatar,</if>
+            <if test="nickName != null and nickName != ''">nick_name,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="themeId != null">#{themeId},</if>
+            <if test="themeContent != null and themeContent != ''">#{themeContent},</if>
+            <if test="optionId != null">#{optionId},</if>
+            <if test="optionName != null and optionName != ''">#{optionName},</if>
+            <if test="conferenceRoomOrderId != null">#{conferenceRoomOrderId},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="avatar != null">#{avatar},</if>
+            <if test="nickName != null and nickName != ''">#{nickName},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateVoteResult" parameterType="VoteResult">
+        update vote_result
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="themeId != null">theme_id = #{themeId},</if>
+            <if test="themeContent != null and themeContent != ''">theme_content = #{themeContent},</if>
+            <if test="optionId != null">option_id = #{optionId},</if>
+            <if test="optionName != null and optionName != ''">option_name = #{optionName},</if>
+            <if test="conferenceRoomOrderId != null">conference_room_order_id = #{conferenceRoomOrderId},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="avatar != null">avatar = #{avatar},</if>
+            <if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where vote_result_id = #{voteResultId}
+    </update>
+
+    <delete id="deleteVoteResultByVoteResultId" parameterType="Long">
+        delete from vote_result where vote_result_id = #{voteResultId}
+    </delete>
+
+    <delete id="deleteVoteResultByVoteResultIds" parameterType="String">
+        delete from vote_result where vote_result_id in 
+        <foreach item="voteResultId" collection="array" open="(" separator="," close=")">
+            #{voteResultId}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-system/src/main/resources/mapper/system/VoteThemeMapper.xml

@@ -0,0 +1,112 @@
+<?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="com.ruoyi.system.mapper.VoteThemeMapper">
+
+    <resultMap type="VoteTheme" id="VoteThemeResult">
+        <result property="themeId" column="theme_id"/>
+        <result property="themeContent" column="theme_content"/>
+        <result property="conferenceRoomOrderId" column="conference_room_order_id"/>
+    </resultMap>
+
+    <resultMap id="VoteThemeVoteOptionResult" type="VoteTheme" extends="VoteThemeResult">
+        <collection property="voteOptionList" notNullColumn="sub_option_id" javaType="java.util.List"
+                    resultMap="VoteOptionResult"/>
+    </resultMap>
+
+    <resultMap type="VoteOption" id="VoteOptionResult">
+        <result property="optionId" column="sub_option_id"/>
+        <result property="optionName" column="sub_option_name"/>
+        <result property="themeId" column="sub_theme_id"/>
+    </resultMap>
+
+    <sql id="selectVoteThemeVo">
+        select theme_id, theme_content, conference_room_order_id
+        from vote_theme
+    </sql>
+
+    <select id="selectVoteThemeList" parameterType="VoteTheme" resultMap="VoteThemeResult">
+        <include refid="selectVoteThemeVo"/>
+        <where>
+            <if test="themeContent != null  and themeContent != ''">and theme_content = #{themeContent}</if>
+            <if test="conferenceRoomOrderId != null ">and conference_room_order_id = #{conferenceRoomOrderId}</if>
+        </where>
+    </select>
+
+    <select id="selectVoteThemeByThemeId" parameterType="Long" resultMap="VoteThemeVoteOptionResult">
+        select a.theme_id,
+               a.theme_content,
+               a.conference_room_order_id,
+               b.option_id   as sub_option_id,
+               b.option_name as sub_option_name,
+               b.theme_id    as sub_theme_id
+        from vote_theme a
+                 left join vote_option b on b.theme_id = a.theme_id
+        where a.theme_id = #{themeId}
+    </select>
+    <select id="selectVoteThemeByConferenceRoomOrderId" parameterType="Long" resultMap="VoteThemeVoteOptionResult">
+        select a.theme_id,
+               a.theme_content,
+               a.conference_room_order_id,
+               b.option_id   as sub_option_id,
+               b.option_name as sub_option_name,
+               b.theme_id    as sub_theme_id
+        from vote_theme a
+                 left join vote_option b on b.theme_id = a.theme_id
+        where a.conference_room_order_id = #{ConferenceRoomOrderId}
+    </select>
+    <insert id="insertVoteTheme" parameterType="VoteTheme" useGeneratedKeys="true" keyProperty="themeId">
+        insert into vote_theme
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="themeContent != null and themeContent != ''">theme_content,</if>
+            <if test="conferenceRoomOrderId != null">conference_room_order_id,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="themeContent != null and themeContent != ''">#{themeContent},</if>
+            <if test="conferenceRoomOrderId != null">#{conferenceRoomOrderId},</if>
+        </trim>
+    </insert>
+
+    <update id="updateVoteTheme" parameterType="VoteTheme">
+        update vote_theme
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="themeContent != null and themeContent != ''">theme_content = #{themeContent},</if>
+            <if test="conferenceRoomOrderId != null">conference_room_order_id = #{conferenceRoomOrderId},</if>
+        </trim>
+        where theme_id = #{themeId}
+    </update>
+
+    <delete id="deleteVoteThemeByThemeId" parameterType="Long">
+        delete
+        from vote_theme
+        where theme_id = #{themeId}
+    </delete>
+
+    <delete id="deleteVoteThemeByThemeIds" parameterType="String">
+        delete from vote_theme where theme_id in
+        <foreach item="themeId" collection="array" open="(" separator="," close=")">
+            #{themeId}
+        </foreach>
+    </delete>
+
+    <delete id="deleteVoteOptionByThemeIds" parameterType="String">
+        delete from vote_option where theme_id in
+        <foreach item="themeId" collection="array" open="(" separator="," close=")">
+            #{themeId}
+        </foreach>
+    </delete>
+
+    <delete id="deleteVoteOptionByThemeId" parameterType="Long">
+        delete
+        from vote_option
+        where theme_id = #{themeId}
+    </delete>
+
+    <insert id="batchVoteOption">
+        insert into vote_option( option_id, option_name, theme_id) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.optionId}, #{item.optionName}, #{item.themeId})
+        </foreach>
+    </insert>
+</mapper>

ruoyi-ui/.env.development

@@ -1,10 +1,10 @@
 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 园区安防监控数据管理平台
 
 # 开发环境配置
 ENV = 'development'
 
-# 若依管理系统/开发环境
+# 园区安防监控数据管理平台/开发环境
 VUE_APP_BASE_API = '/dev-api'
 
 # 路由懒加载

ruoyi-ui/.env.production

@@ -1,8 +1,8 @@
 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 园区安防监控数据管理平台
 
 # 生产环境配置
 ENV = 'production'
 
-# 若依管理系统/生产环境
+# 园区安防监控数据管理平台/生产环境
 VUE_APP_BASE_API = '/prod-api'

ruoyi-ui/.env.staging

@@ -1,10 +1,10 @@
 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 园区安防监控数据管理平台
 
 NODE_ENV = production
 
 # 测试环境配置
 ENV = 'staging'
 
-# 若依管理系统/测试环境
+# 园区安防监控数据管理平台/测试环境
 VUE_APP_BASE_API = '/stage-api'

ruoyi-ui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ruoyi",
-  "version": "3.8.7",
-  "description": "若依管理系统",
+  "version": "3.8.6",
+  "description": "园区安防监控数据管理平台",
   "author": "若依",
   "license": "MIT",
   "scripts": {
@@ -38,26 +38,40 @@
   "dependencies": {
     "@riophae/vue-treeselect": "0.4.0",
     "axios": "0.24.0",
+    "better-scroll": "^2.5.1",
     "clipboard": "2.0.8",
     "core-js": "3.25.3",
     "echarts": "5.4.0",
-    "element-ui": "2.15.14",
+    "element-ui": "2.15.13",
     "file-saver": "2.0.5",
+    "flv.js": "^1.6.2",
     "fuse.js": "6.4.3",
     "highlight.js": "9.18.5",
+    "html2canvas": "^1.4.1",
     "js-beautify": "1.13.0",
     "js-cookie": "3.0.1",
     "jsencrypt": "3.0.0-rc.1",
     "nprogress": "0.2.0",
+    "photo-sphere-viewer": "^4.8.1",
+    "qrcode": "^1.5.3",
+    "qrcode-decoder": "^0.3.3",
     "quill": "1.3.7",
     "screenfull": "5.0.2",
     "sortablejs": "1.10.2",
+    "videojs-flash": "^2.2.1",
+    "videojs-flvjs-es6": "^1.0.1",
     "vue": "2.6.12",
+    "vue-calendar-component": "^2.8.2",
     "vue-count-to": "1.0.13",
     "vue-cropper": "0.5.5",
+    "vue-jsonp": "^2.0.0",
     "vue-meta": "2.4.0",
+    "vue-print-nb": "^1.7.5",
+    "vue-qr": "^4.0.9",
     "vue-router": "3.4.9",
-    "vuedraggable": "2.24.3",
+    "vue-ueditor-wrap": "^2.5.6",
+    "vue-video-player": "^4.0.6",
+    "vuedraggable": "^2.24.3",
     "vuex": "3.6.0"
   },
   "devDependencies": {

ruoyi-ui/public/index.html

@@ -6,6 +6,7 @@
     <meta name="renderer" content="webkit">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+	
     <title><%= webpackConfig.name %></title>
     <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
 	  <style>
@@ -118,7 +119,7 @@
       top: 0;
       width: 51%;
       height: 100%;
-      background: #7171C6;
+      background: linear-gradient(to bottom, #e7f2fe, #c1dbf8 ); ;
       z-index: 1000;
       -webkit-transform: translateX(0);
       -ms-transform: translateX(0);
@@ -193,15 +194,133 @@
       color: #FFF;
       opacity: 0.5;
     }
+		.edui-button.edui-for-135editor .edui-button-wrap .edui-button-body .edui-icon{
+														  background-image: url("http://static.135editor.com/img/icons/editor-135-icon.png") !important;
+														  background-size: 85%;
+														  background-position: center;
+														  background-repeat: no-repeat;
+		                          width:22px;
+		                          height: 22px;
+		}
+
+
+	.box {
+	  display: inline-block;
+	  z-index: 9999999999999;
+	  width: 200px;
+	  height: 200px;
+	  /* border: 1px solid currentcolor; */
+	  border-radius: 3px;
+	  font-size: 30px;
+	  /* padding: 1em; */
+	  position: relative;
+	  margin-top: 25%;
+	  transform: translateY(-50%);
+	  margin-left: 47%;
+	  /* margin-bottom: .25em; */
+	  vertical-align: top;
+	  -webkit-transition: .3s color, .3s border, .3s transform, .3s opacity;
+	  transition: .3s color, .3s border, .3s transform, .3s opacity;
+	}
+
+	.box:hover {
+	  /* color: #fff;
+	  background-color: #04bfa1;
+	  font-size: 0;
+	  padding: 0;
+	  border-width: 3px;
+	  line-height: 200px;
+	  opacity: 1;
+	  -webkit-transform: scale(1.2);
+	  transform: scale(1.2);
+	  z-index: 2; */
+	}
+
+	.box:hover [class*="loader-"] {
+	  /* font-size: 70px;
+	  line-height: 200px; */
+	}
+
+	[class*="loader-"] {
+	  display: inline-block;
+	  width: 2em;
+	  height: 2em;
+	  color: inherit;
+	  vertical-align: middle;
+	  pointer-events: none;
+	}
+	.loader-32 {
+	  position: relative;
+	  border-radius: 50%;
+	  box-shadow: 0 0 1em 0 rgba(255,255,255,0.8), inset 0 0 1em 0 rgba(255,255,255,0.9);
+	  -webkit-animation: 1s loader-32 linear infinite;
+	  animation: 1s loader-32 linear infinite;
+	}
+
+	.loader-32:before,
+	.loader-32:after {
+	  content: '';
+	  display: block;
+	  width: inherit;
+	  height: inherit;
+	  position: absolute;
+	  border-radius: 50%;
+	}
+
+	.loader-32:before {
+	  border-top: .2em solid #c7e2de;
+	  border-right: .2em solid #c7e2de;
+	  top: .28em;
+	  right: calc(50% - .22em);
+	}
+
+	.loader-32:after {
+	  border-bottom: .2em solid #04bfa1;
+	  border-left: .2em solid #04bfa1;
+	  bottom: .28em;
+	  left: calc(50% - .22em);
+	}
+
+	@-webkit-keyframes loader-32 {
+	  0% {
+	    -webkit-transform: rotateX(-60deg) rotateZ(0deg);
+	    transform: rotateX(-60deg) rotateZ(0deg);
+	  }
+	  100% {
+	    -webkit-transform: rotateX(-60deg) rotateZ(360deg);
+	    transform: rotateX(-60deg) rotateZ(360deg);
+	  }
+	}
+
+	@keyframes loader-32 {
+	  0% {
+	    -webkit-transform: rotateX(-60deg) rotateZ(0deg);
+	    transform: rotateX(-60deg) rotateZ(0deg);
+	  }
+	  100% {
+	    -webkit-transform: rotateX(-60deg) rotateZ(360deg);
+	    transform: rotateX(-60deg) rotateZ(360deg);
+	  }
+	}
+
+
+
   </style>
   </head>
   <body>
     <div id="app">
 	    <div id="loader-wrapper">
 		    <div id="loader"></div>
+			<!-- yuwe -->
+			<!-- <div class="box">
+			  
+			  <div class="loader-32">
+			  </div>
+			</div> -->
 		    <div class="loader-section section-left"></div>
 		    <div class="loader-section section-right"></div>
-		    <div class="load_title">正在加载系统资源，请耐心等待</div>
+		    <!-- <div class="load_title">正在加载系统资源，请耐心等待</div> -->
+			<div class="load_title">正在加载，请耐心等待</div>
         </div>
 	</div>
   </body>

ruoyi-ui/public/pluging/135EditorDialogPage.html

@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+  <title>135编辑器外部编辑调用</title>
+  <style>
+    html, body {
+      padding: 0;
+      margin: 0;
+    }
+    #editor135 {
+      position: absolute;
+      width: 100%;
+      height: 100%;
+      border: none;
+      box-sizing: border-box;
+    }
+  </style>
+</head>
+<body>
+<!-- 如需要appkey进行额外私有化等对接，请联系QQ: 285694665   微信: hncszdb -->
+<iframe id="editor135" src="https://www.135editor.com/simple_editor.html?callback=true&appkey="></iframe>
+<script type="text/javascript" src="../../dialogs/internal.js?t=1458602018"></script>
+<script>
+  var editor135 = document.getElementById('editor135');
+  
+  window.onload = function () {
+	  setTimeout(function(){
+		  editor135.contentWindow.postMessage(editor.getContent(),'*');
+	  },3000);    
+  };
+  document.addEventListener("mousewheel", function (event) {
+    event.preventDefault();
+    event.stopPropagation();
+  });
+  window.addEventListener('message', function (event) {
+      if (typeof event.data !== 'string') return;
+      editor.setContent(event.data);
+      editor.fireEvent("catchRemoteImage"); 
+      dialog.close();
+  }, false);
+</script>
+</body>
+</html>

ruoyi-ui/public/ueditor/135editor.js

@@ -0,0 +1,39 @@
+UE.registerUI('135editor',function(editor,uiName){
+    // var dialog = new UE.ui.Dialog({
+    //     iframeUrl: editor.options.UEDITOR_HOME_URL+'dialogs/135editor/135EditorDialogPage.html',
+    //     cssRules:"width:"+ parseInt(document.body.clientWidth*0.9) +"px;height:"+(window.innerHeight -50)+"px;",
+    //     editor:editor,
+    //     name:uiName,
+    //     title:"135编辑器"
+    // });
+    // dialog.fullscreen = false;
+    // dialog.draggable = false;
+    var btn = new UE.ui.Button({
+        name:'btn-dialog-' + uiName,
+        className:'edui-for-135editor',
+        title:'135编辑器',
+        onclick:function () {
+            // dialog.render();
+            // dialog.open();
+
+            // 由于登录存在跨域问题，请使用如下方式调用135编辑器
+            var editor135 = window.open('https://www.135editor.com/simple_editor.html?callback=true&appkey=')
+            // setTimeout(function(){
+            //     editor135.postMessage(editor.getContent(),'*');
+            // },3000);
+
+            window.addEventListener('message', function (event) {
+                if (typeof event.data !== 'string') {
+                    if(event.data.ready) {
+                        editor135.postMessage(editor.getContent(),'*');
+                    }
+                    return;
+                };
+                editor.setContent(event.data);
+                editor.fireEvent("catchRemoteImage");
+            }, false);
+        }
+    });
+    return btn;
+},undefined);
+// 修改最后的undefined参数为数字序号，比如5，可调整135编辑器按钮的顺序。默认出现在最后面

ruoyi-ui/public/ueditor/demo.js

@@ -0,0 +1,261 @@
+var Popup = new baidu.editor.ui.Popup();
+var uiUtils = baidu.editor.ui.uiUtils();
+var popEl = this.getDom();
+            uiUtils.setViewportOffset(popEl, {
+                left: 20,
+                top: top
+            });
+(function () {
+    var utils = baidu.editor.utils,
+        uiUtils = baidu.editor.ui.uiUtils,
+        domUtils = baidu.editor.dom.domUtils,
+        UIBase = baidu.editor.ui.UIBase,
+        Popup = baidu.editor.ui.Popup = function (options){
+            this.initOptions(options);
+            this.initPopup();
+        };
+    var allPopups = [];
+    function closeAllPopup( evt,el ){
+        for ( var i = 0; i < allPopups.length; i++ ) {
+            var pop = allPopups[i];
+            if (!pop.isHidden()) {
+                if (pop.queryAutoHide(el) !== false) {
+                    if(evt&&/scroll/ig.test(evt.type)&&pop.className=="edui-wordpastepop")   return;
+                    pop.hide();
+                }
+            }
+        }
+
+        if(allPopups.length)
+            pop.editor.fireEvent("afterhidepop");
+    }
+
+    Popup.postHide = closeAllPopup;
+
+    var ANCHOR_CLASSES = ['edui-anchor-topleft','edui-anchor-topright',
+        'edui-anchor-bottomleft','edui-anchor-bottomright'];
+    Popup.prototype = {
+        SHADOW_RADIUS: 5,
+        content: null,
+        _hidden: false,
+        autoRender: true,
+        canSideLeft: true,
+        canSideUp: true,
+        initPopup: function (){
+            this.initUIBase();
+            allPopups.push( this );
+        },
+        getHtmlTpl: function (){
+            return '<div id="##" class="edui-popup %%" onmousedown="return false;">' +
+                ' <div id="##_body" class="edui-popup-body">' +
+                ' <iframe style="position:absolute;z-index:-1;left:0;top:0;background-color: transparent;" frameborder="0" width="100%" height="100%" src="about:blank"></iframe>' +
+                ' <div class="edui-shadow"></div>' +
+                ' <div id="##_content" class="edui-popup-content">' +
+                this.getContentHtmlTpl() +
+                '  </div>' +
+                ' </div>' +
+                '</div>';
+        },
+        getContentHtmlTpl: function (){
+            if(this.content){
+                if (typeof this.content == 'string') {
+                    return this.content;
+                }
+                return this.content.renderHtml();
+            }else{
+                return ''
+            }
+
+        },
+        _UIBase_postRender: UIBase.prototype.postRender,
+        postRender: function (){
+
+
+            if (this.content instanceof UIBase) {
+                this.content.postRender();
+            }
+
+            //捕获鼠标滚轮
+            if( this.captureWheel && !this.captured ) {
+
+                this.captured = true;
+
+                var winHeight = ( document.documentElement.clientHeight || document.body.clientHeight )  - 80,
+                    _height = this.getDom().offsetHeight,
+                    _top = uiUtils.getClientRect( this.combox.getDom() ).top,
+                    content = this.getDom('content'),
+                    ifr = this.getDom('body').getElementsByTagName('iframe'),
+                    me = this;
+
+                ifr.length && ( ifr = ifr[0] );
+
+                while( _top + _height > winHeight ) {
+                    _height -= 30;
+                }
+                content.style.height = _height + 'px';
+                //同步更改iframe高度
+                ifr && ( ifr.style.height = _height + 'px' );
+
+                //阻止在combox上的鼠标滚轮事件, 防止用户的正常操作被误解
+                if( window.XMLHttpRequest ) {
+
+                    domUtils.on( content, ( 'onmousewheel' in document.body ) ? 'mousewheel' :'DOMMouseScroll' , function(e){
+
+                        if(e.preventDefault) {
+                            e.preventDefault();
+                        } else {
+                            e.returnValue = false;
+                        }
+
+                        if( e.wheelDelta ) {
+
+                            content.scrollTop -= ( e.wheelDelta / 120 )*60;
+
+                        } else {
+
+                            content.scrollTop -= ( e.detail / -3 )*60;
+
+                        }
+
+                    });
+
+                } else {
+
+                    //ie6
+                    domUtils.on( this.getDom(), 'mousewheel' , function(e){
+
+                        e.returnValue = false;
+
+                        me.getDom('content').scrollTop -= ( e.wheelDelta / 120 )*60;
+
+                    });
+
+                }
+
+            }
+            this.fireEvent('postRenderAfter');
+            this.hide(true);
+            this._UIBase_postRender();
+        },
+        _doAutoRender: function (){
+            if (!this.getDom() && this.autoRender) {
+                this.render();
+            }
+        },
+        mesureSize: function (){
+            var box = this.getDom('content');
+            return uiUtils.getClientRect(box);
+        },
+        fitSize: function (){
+            if( this.captureWheel && this.sized ) {
+                return this.__size;
+            }
+            this.sized = true;
+            var popBodyEl = this.getDom('body');
+            popBodyEl.style.width = '';
+            popBodyEl.style.height = '';
+            var size = this.mesureSize();
+            if( this.captureWheel ) {
+                popBodyEl.style.width =  -(-20 -size.width) + 'px';
+                var height = parseInt( this.getDom('content').style.height, 10 );
+                !window.isNaN( height ) && ( size.height = height );
+            } else {
+                popBodyEl.style.width =  size.width + 'px';
+            }
+            popBodyEl.style.height = size.height + 'px';
+            this.__size = size;
+            this.captureWheel && (this.getDom('content').style.overflow = 'auto');
+            return size;
+        },
+        showAnchor: function ( element, hoz ){
+            this.showAnchorRect( uiUtils.getClientRect( element ), hoz );
+        },
+        showAnchorRect: function ( rect, hoz, adj ){
+            this._doAutoRender();
+            var vpRect = uiUtils.getViewportRect();
+            this.getDom().style.visibility = 'hidden';
+            this._show();
+            var popSize = this.fitSize();
+
+            var sideLeft, sideUp, left, top;
+            if (hoz) {
+                sideLeft = this.canSideLeft && (rect.right + popSize.width > vpRect.right && rect.left > popSize.width);
+                sideUp = this.canSideUp && (rect.top + popSize.height > vpRect.bottom && rect.bottom > popSize.height);
+                left = (sideLeft ? rect.left - popSize.width : rect.right);
+                top = (sideUp ? rect.bottom - popSize.height : rect.top);
+            } else {
+                sideLeft = this.canSideLeft && (rect.right + popSize.width > vpRect.right && rect.left > popSize.width);
+                sideUp = this.canSideUp && (rect.top + popSize.height > vpRect.bottom && rect.bottom > popSize.height);
+                left = (sideLeft ? rect.right - popSize.width : rect.left);
+                top = (sideUp ? rect.top - popSize.height : rect.bottom);
+            }
+
+            var popEl = this.getDom();
+            uiUtils.setViewportOffset(popEl, {
+                left: 20,
+                top: top
+            });
+            domUtils.removeClasses(popEl, ANCHOR_CLASSES);
+            popEl.className += ' ' + ANCHOR_CLASSES[(sideUp ? 1 : 0) * 2 + (sideLeft ? 1 : 0)];
+            if(this.editor){
+                popEl.style.zIndex = this.editor.container.style.zIndex * 1 + 10;
+                baidu.editor.ui.uiUtils.getFixedLayer().style.zIndex = popEl.style.zIndex - 1;
+            }
+            this.getDom().style.visibility = 'uset';
+
+        },
+        showAt: function (offset) {
+            var left = offset.left;
+            var top = offset.top;
+            var rect = {
+                left: left,
+                top: top,
+                right: left,
+                bottom: top,
+                height: 0,
+                width: 0
+            };
+            this.showAnchorRect(rect, false, true);
+        },
+        _show: function (){
+            if (this._hidden) {
+                var box = this.getDom();
+                box.style.display = '';
+                this._hidden = false;
+//                if (box.setActive) {
+//                    box.setActive();
+//                }
+                this.fireEvent('show');
+            }
+        },
+        isHidden: function (){
+            return this._hidden;
+        },
+        show: function (){
+            this._doAutoRender();
+            this._show();
+        },
+        hide: function (notNofity){
+            if (!this._hidden && this.getDom()) {
+                this.getDom().style.display = 'none';
+                this._hidden = true;
+                if (!notNofity) {
+                    this.fireEvent('hide');
+                }
+            }
+        },
+        queryAutoHide: function (el){
+            return !el || !uiUtils.contains(this.getDom(), el);
+        }
+    };
+    utils.inherits(Popup, UIBase);
+    
+    domUtils.on( document, 'mousedown', function ( evt ) {
+        var el = evt.target || evt.srcElement;
+        closeAllPopup( evt,el );
+    } );
+    domUtils.on( window, 'scroll', function (evt,el) {
+        closeAllPopup( evt,el );
+    } );
+
+})();

ruoyi-ui/public/ueditor/dialogs/135editor.js

@@ -0,0 +1,44 @@
+UE.registerUI('135editor',function(editor,uiName){
+    // var dialog = new UE.ui.Dialog({
+    //     iframeUrl: editor.options.UEDITOR_HOME_URL+'dialogs/135editor/135EditorDialogPage.html',
+    //     cssRules:"width:"+ parseInt(document.body.clientWidth*0.9) +"px;height:"+(window.innerHeight -50)+"px;",
+    //     editor:editor,
+    //     name:uiName,
+    //     title:"135编辑器"
+    // });
+    // dialog.fullscreen = false;
+    // dialog.draggable = false;
+
+    var editor135;
+    function onContentFrom135(event) {
+        if (typeof event.data !== 'string') {
+            if(event.data.ready) {
+                editor135.postMessage(editor.getContent(),'*');
+            }
+            return;
+        };
+
+        if(event.data.indexOf('<') !== 0) return;
+
+        editor.setContent(event.data);
+        editor.fireEvent("catchRemoteImage");
+        window.removeEventListener('message', onContentFrom135);
+    }
+
+    var btn = new UE.ui.Button({
+        name:'btn-dialog-' + uiName,       
+        className:'edui-for-135editor',
+        title:'135编辑器',
+        onclick:function () {
+            // dialog.render();
+            // dialog.open();
+
+            // 由于内嵌iframe登录存在跨域问题，禁用了cookie, 使用window.open方式调用135编辑器
+            editor135 = window.open('https://www.135editor.com/beautify_editor.html?callback=true&appkey=','135editor','height='+(window.screen.availHeight-100)+',width='+(window.screen.availWidth-100)+',top=50,left=50,help=no,resizable=no,status=no,scroll=no')
+            
+            window.removeEventListener('message', onContentFrom135);
+            window.addEventListener('message', onContentFrom135, false);
+        }
+    });
+    return btn;
+},undefined);

ruoyi-ui/public/ueditor/dialogs/anchor/anchor.html

@@ -0,0 +1,40 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+    "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+        <title></title>
+        <style type="text/css">
+            *{color: #838383;margin: 0;padding: 0}
+            html,body {font-size: 12px;overflow: hidden; }
+            .content{padding:5px 0 0 15px;}
+            input{width:210px;height:21px;line-height:21px;margin-left: 4px;}
+        </style>
+    </head>
+    <body>
+        <div class="content">
+            <span><var id="lang_input_anchorName"></var></span><input id="anchorName"  value="" />
+        </div>
+        <script type="text/javascript" src="../internal.js"></script>
+        <script type="text/javascript">
+            var anchorInput = $G('anchorName'),
+                node = editor.selection.getRange().getClosedNode();
+            if(node && node.tagName == 'IMG' && (node = node.getAttribute('anchorname'))){
+                anchorInput.value = node;
+            }
+            anchorInput.onkeydown = function(evt){
+                evt = evt || window.event;
+                if(evt.keyCode == 13){
+                    editor.execCommand('anchor', anchorInput.value);
+                    dialog.close();
+                    domUtils.preventDefault(evt)
+                }
+            };
+            dialog.onok = function (){
+                editor.execCommand('anchor', anchorInput.value);
+                dialog.close();
+            };
+            $focus(anchorInput);
+        </script>
+    </body>
+</html>

ruoyi-ui/public/ueditor/dialogs/attachment/attachment.css

@@ -0,0 +1,681 @@
+@charset "utf-8";
+/* dialog样式 */
+.wrapper {
+    zoom: 1;
+    width: 630px;
+    *width: 626px;
+    height: 380px;
+    margin: 0 auto;
+    padding: 10px;
+    position: relative;
+    font-family: sans-serif;
+}
+
+/*tab样式框大小*/
+.tabhead {
+    float:left;
+}
+.tabbody {
+    width: 100%;
+    height: 346px;
+    position: relative;
+    clear: both;
+}
+
+.tabbody .panel {
+    position: absolute;
+    width: 0;
+    height: 0;
+    background: #fff;
+    overflow: hidden;
+    display: none;
+}
+
+.tabbody .panel.focus {
+    width: 100%;
+    height: 346px;
+    display: block;
+}
+
+/* 上传附件 */
+.tabbody #upload.panel {
+    width: 0;
+    height: 0;
+    overflow: hidden;
+    position: absolute !important;
+    clip: rect(1px, 1px, 1px, 1px);
+    background: #fff;
+    display: block;
+}
+
+.tabbody #upload.panel.focus {
+    width: 100%;
+    height: 346px;
+    display: block;
+    clip: auto;
+}
+
+#upload .queueList {
+    margin: 0;
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    overflow: hidden;
+}
+
+#upload p {
+    margin: 0;
+}
+
+.element-invisible {
+    width: 0 !important;
+    height: 0 !important;
+    border: 0;
+    padding: 0;
+    margin: 0;
+    overflow: hidden;
+    position: absolute !important;
+    clip: rect(1px, 1px, 1px, 1px);
+}
+
+#upload .placeholder {
+    margin: 10px;
+    border: 2px dashed #e6e6e6;
+    *border: 0px dashed #e6e6e6;
+    height: 172px;
+    padding-top: 150px;
+    text-align: center;
+    background: url(./images/image.png) center 70px no-repeat;
+    color: #cccccc;
+    font-size: 18px;
+    position: relative;
+    top:0;
+    *top: 10px;
+}
+
+#upload .placeholder .webuploader-pick {
+    font-size: 18px;
+    background: #00b7ee;
+    border-radius: 3px;
+    line-height: 44px;
+    padding: 0 30px;
+    *width: 120px;
+    color: #fff;
+    display: inline-block;
+    margin: 0 auto 20px auto;
+    cursor: pointer;
+    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
+}
+
+#upload .placeholder .webuploader-pick-hover {
+    background: #00a2d4;
+}
+
+
+#filePickerContainer {
+    text-align: center;
+}
+
+#upload .placeholder .flashTip {
+    color: #666666;
+    font-size: 12px;
+    position: absolute;
+    width: 100%;
+    text-align: center;
+    bottom: 20px;
+}
+
+#upload .placeholder .flashTip a {
+    color: #0785d1;
+    text-decoration: none;
+}
+
+#upload .placeholder .flashTip a:hover {
+    text-decoration: underline;
+}
+
+#upload .placeholder.webuploader-dnd-over {
+    border-color: #999999;
+}
+
+#upload .filelist {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+    overflow-x: hidden;
+    overflow-y: auto;
+    position: relative;
+    height: 300px;
+}
+
+#upload .filelist:after {
+    content: '';
+    display: block;
+    width: 0;
+    height: 0;
+    overflow: hidden;
+    clear: both;
+}
+
+#upload .filelist li {
+    width: 113px;
+    height: 113px;
+    background: url(./images/bg.png);
+    text-align: center;
+    margin: 9px 0 0 9px;
+    *margin: 6px 0 0 6px;
+    position: relative;
+    display: block;
+    float: left;
+    overflow: hidden;
+    font-size: 12px;
+}
+
+#upload .filelist li p.log {
+    position: relative;
+    top: -45px;
+}
+
+#upload .filelist li p.title {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    top: 5px;
+    text-indent: 5px;
+    text-align: left;
+}
+
+#upload .filelist li p.progress {
+    position: absolute;
+    width: 100%;
+    bottom: 0;
+    left: 0;
+    height: 8px;
+    overflow: hidden;
+    z-index: 50;
+    margin: 0;
+    border-radius: 0;
+    background: none;
+    -webkit-box-shadow: 0 0 0;
+}
+
+#upload .filelist li p.progress span {
+    display: none;
+    overflow: hidden;
+    width: 0;
+    height: 100%;
+    background: #1483d8 url(./images/progress.png) repeat-x;
+
+    -webit-transition: width 200ms linear;
+    -moz-transition: width 200ms linear;
+    -o-transition: width 200ms linear;
+    -ms-transition: width 200ms linear;
+    transition: width 200ms linear;
+
+    -webkit-animation: progressmove 2s linear infinite;
+    -moz-animation: progressmove 2s linear infinite;
+    -o-animation: progressmove 2s linear infinite;
+    -ms-animation: progressmove 2s linear infinite;
+    animation: progressmove 2s linear infinite;
+
+    -webkit-transform: translateZ(0);
+}
+
+@-webkit-keyframes progressmove {
+    0% {
+        background-position: 0 0;
+    }
+    100% {
+        background-position: 17px 0;
+    }
+}
+
+@-moz-keyframes progressmove {
+    0% {
+        background-position: 0 0;
+    }
+    100% {
+        background-position: 17px 0;
+    }
+}
+
+@keyframes progressmove {
+    0% {
+        background-position: 0 0;
+    }
+    100% {
+        background-position: 17px 0;
+    }
+}
+
+#upload .filelist li p.imgWrap {
+    position: relative;
+    z-index: 2;
+    line-height: 113px;
+    vertical-align: middle;
+    overflow: hidden;
+    width: 113px;
+    height: 113px;
+
+    -webkit-transform-origin: 50% 50%;
+    -moz-transform-origin: 50% 50%;
+    -o-transform-origin: 50% 50%;
+    -ms-transform-origin: 50% 50%;
+    transform-origin: 50% 50%;
+
+    -webit-transition: 200ms ease-out;
+    -moz-transition: 200ms ease-out;
+    -o-transition: 200ms ease-out;
+    -ms-transition: 200ms ease-out;
+    transition: 200ms ease-out;
+}
+#upload .filelist li p.imgWrap.notimage {
+    margin-top: 0;
+    width: 111px;
+    height: 111px;
+    border: 1px #eeeeee solid;
+}
+#upload .filelist li p.imgWrap.notimage i.file-preview {
+    margin-top: 15px;
+}
+
+#upload .filelist li img {
+    width: 100%;
+}
+
+#upload .filelist li p.error {
+    background: #f43838;
+    color: #fff;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    height: 28px;
+    line-height: 28px;
+    width: 100%;
+    z-index: 100;
+    display:none;
+}
+
+#upload .filelist li .success {
+    display: block;
+    position: absolute;
+    left: 0;
+    bottom: 0;
+    height: 40px;
+    width: 100%;
+    z-index: 200;
+    background: url(./images/success.png) no-repeat right bottom;
+    background-image: url(./images/success.gif) \9;
+}
+
+#upload .filelist li.filePickerBlock {
+    width: 113px;
+    height: 113px;
+    background: url(./images/image.png) no-repeat center 12px;
+    border: 1px solid #eeeeee;
+    border-radius: 0;
+}
+#upload .filelist li.filePickerBlock div.webuploader-pick  {
+    width: 100%;
+    height: 100%;
+    margin: 0;
+    padding: 0;
+    opacity: 0;
+    background: none;
+    font-size: 0;
+}
+
+#upload .filelist div.file-panel {
+    position: absolute;
+    height: 0;
+    filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#80000000', endColorstr='#80000000') \0;
+    background: rgba(0, 0, 0, 0.5);
+    width: 100%;
+    top: 0;
+    left: 0;
+    overflow: hidden;
+    z-index: 300;
+}
+
+#upload .filelist div.file-panel span {
+    width: 24px;
+    height: 24px;
+    display: inline;
+    float: right;
+    text-indent: -9999px;
+    overflow: hidden;
+    background: url(./images/icons.png) no-repeat;
+    background: url(./images/icons.gif) no-repeat \9;
+    margin: 5px 1px 1px;
+    cursor: pointer;
+    -webkit-tap-highlight-color: rgba(0,0,0,0);
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+}
+
+#upload .filelist div.file-panel span.rotateLeft {
+    display:none;
+    background-position: 0 -24px;
+}
+
+#upload .filelist div.file-panel span.rotateLeft:hover {
+    background-position: 0 0;
+}
+
+#upload .filelist div.file-panel span.rotateRight {
+    display:none;
+    background-position: -24px -24px;
+}
+
+#upload .filelist div.file-panel span.rotateRight:hover {
+    background-position: -24px 0;
+}
+
+#upload .filelist div.file-panel span.cancel {
+    background-position: -48px -24px;
+}
+
+#upload .filelist div.file-panel span.cancel:hover {
+    background-position: -48px 0;
+}
+
+#upload .statusBar {
+    height: 45px;
+    border-bottom: 1px solid #dadada;
+    margin: 0 10px;
+    padding: 0;
+    line-height: 45px;
+    vertical-align: middle;
+    position: relative;
+}
+
+#upload .statusBar .progress {
+    border: 1px solid #1483d8;
+    width: 198px;
+    background: #fff;
+    height: 18px;
+    position: absolute;
+    top: 12px;
+    display: none;
+    text-align: center;
+    line-height: 18px;
+    color: #6dbfff;
+    margin: 0 10px 0 0;
+}
+#upload .statusBar .progress span.percentage {
+    width: 0;
+    height: 100%;
+    left: 0;
+    top: 0;
+    background: #1483d8;
+    position: absolute;
+}
+#upload .statusBar .progress span.text {
+    position: relative;
+    z-index: 10;
+}
+
+#upload .statusBar .info {
+    display: inline-block;
+    font-size: 14px;
+    color: #666666;
+}
+
+#upload .statusBar .btns {
+    position: absolute;
+    top: 7px;
+    right: 0;
+    line-height: 30px;
+}
+
+#filePickerBtn {
+    display: inline-block;
+    float: left;
+}
+#upload .statusBar .btns .webuploader-pick,
+#upload .statusBar .btns .uploadBtn,
+#upload .statusBar .btns .uploadBtn.state-uploading,
+#upload .statusBar .btns .uploadBtn.state-paused {
+    background: #ffffff;
+    border: 1px solid #cfcfcf;
+    color: #565656;
+    padding: 0 18px;
+    display: inline-block;
+    border-radius: 3px;
+    margin-left: 10px;
+    cursor: pointer;
+    font-size: 14px;
+    float: left;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+}
+#upload .statusBar .btns .webuploader-pick-hover,
+#upload .statusBar .btns .uploadBtn:hover,
+#upload .statusBar .btns .uploadBtn.state-uploading:hover,
+#upload .statusBar .btns .uploadBtn.state-paused:hover {
+    background: #f0f0f0;
+}
+
+#upload .statusBar .btns .uploadBtn,
+#upload .statusBar .btns .uploadBtn.state-paused{
+    background: #00b7ee;
+    color: #fff;
+    border-color: transparent;
+}
+#upload .statusBar .btns .uploadBtn:hover,
+#upload .statusBar .btns .uploadBtn.state-paused:hover{
+    background: #00a2d4;
+}
+
+#upload .statusBar .btns .uploadBtn.disabled {
+    pointer-events: none;
+    filter:alpha(opacity=60);
+    -moz-opacity:0.6;
+    -khtml-opacity: 0.6;
+    opacity: 0.6;
+}
+
+
+
+/* 图片管理样式 */
+#online {
+    width: 100%;
+    height: 336px;
+    padding: 10px 0 0 0;
+}
+#online #fileList{
+    width: 100%;
+    height: 100%;
+    overflow-x: hidden;
+    overflow-y: auto;
+    position: relative;
+}
+#online ul {
+    display: block;
+    list-style: none;
+    margin: 0;
+    padding: 0;
+}
+#online li {
+    float: left;
+    display: block;
+    list-style: none;
+    padding: 0;
+    width: 113px;
+    height: 113px;
+    margin: 0 0 9px 9px;
+    *margin: 0 0 6px 6px;
+    background-color: #eee;
+    overflow: hidden;
+    cursor: pointer;
+    position: relative;
+}
+#online li.clearFloat {
+    float: none;
+    clear: both;
+    display: block;
+    width:0;
+    height:0;
+    margin: 0;
+    padding: 0;
+}
+#online li img {
+    cursor: pointer;
+}
+#online li div.file-wrapper {
+    cursor: pointer;
+    position: absolute;
+    display: block;
+    width: 111px;
+    height: 111px;
+    border: 1px solid #eee;
+    background: url("./images/bg.png") repeat;
+}
+#online li div span.file-title{
+    display: block;
+    padding: 0 3px;
+    margin: 3px 0 0 0;
+    font-size: 12px;
+    height: 13px;
+    color: #555555;
+    text-align: center;
+    width: 107px;
+    white-space: nowrap;
+    word-break: break-all;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+#online li .icon {
+    cursor: pointer;
+    width: 113px;
+    height: 113px;
+    position: absolute;
+    top: 0;
+    left: 0;
+    z-index: 2;
+    border: 0;
+    background-repeat: no-repeat;
+}
+#online li .icon:hover {
+    width: 107px;
+    height: 107px;
+    border: 3px solid #1094fa;
+}
+#online li.selected .icon {
+    background-image: url(images/success.png);
+    background-image: url(images/success.gif) \9;
+    background-position: 75px 75px;
+}
+#online li.selected .icon:hover {
+    width: 107px;
+    height: 107px;
+    border: 3px solid #1094fa;
+    background-position: 72px 72px;
+}
+
+
+/* 在线文件的文件预览图标 */
+i.file-preview {
+    display: block;
+    margin: 10px auto;
+    width: 70px;
+    height: 70px;
+    background-image: url("./images/file-icons.png");
+    background-image: url("./images/file-icons.gif") \9;
+    background-position: -140px center;
+    background-repeat: no-repeat;
+}
+i.file-preview.file-type-dir{
+    background-position: 0 center;
+}
+i.file-preview.file-type-file{
+    background-position: -140px center;
+}
+i.file-preview.file-type-filelist{
+    background-position: -210px center;
+}
+i.file-preview.file-type-zip,
+i.file-preview.file-type-rar,
+i.file-preview.file-type-7z,
+i.file-preview.file-type-tar,
+i.file-preview.file-type-gz,
+i.file-preview.file-type-bz2{
+    background-position: -280px center;
+}
+i.file-preview.file-type-xls,
+i.file-preview.file-type-xlsx{
+    background-position: -350px center;
+}
+i.file-preview.file-type-doc,
+i.file-preview.file-type-docx{
+    background-position: -420px center;
+}
+i.file-preview.file-type-ppt,
+i.file-preview.file-type-pptx{
+    background-position: -490px center;
+}
+i.file-preview.file-type-vsd{
+    background-position: -560px center;
+}
+i.file-preview.file-type-pdf{
+    background-position: -630px center;
+}
+i.file-preview.file-type-txt,
+i.file-preview.file-type-md,
+i.file-preview.file-type-json,
+i.file-preview.file-type-htm,
+i.file-preview.file-type-xml,
+i.file-preview.file-type-html,
+i.file-preview.file-type-js,
+i.file-preview.file-type-css,
+i.file-preview.file-type-php,
+i.file-preview.file-type-jsp,
+i.file-preview.file-type-asp{
+    background-position: -700px center;
+}
+i.file-preview.file-type-apk{
+    background-position: -770px center;
+}
+i.file-preview.file-type-exe{
+    background-position: -840px center;
+}
+i.file-preview.file-type-ipa{
+    background-position: -910px center;
+}
+i.file-preview.file-type-mp4,
+i.file-preview.file-type-swf,
+i.file-preview.file-type-mkv,
+i.file-preview.file-type-avi,
+i.file-preview.file-type-flv,
+i.file-preview.file-type-mov,
+i.file-preview.file-type-mpg,
+i.file-preview.file-type-mpeg,
+i.file-preview.file-type-ogv,
+i.file-preview.file-type-webm,
+i.file-preview.file-type-rm,
+i.file-preview.file-type-rmvb{
+    background-position: -980px center;
+}
+i.file-preview.file-type-ogg,
+i.file-preview.file-type-wav,
+i.file-preview.file-type-wmv,
+i.file-preview.file-type-mid,
+i.file-preview.file-type-mp3{
+    background-position: -1050px center;
+}
+i.file-preview.file-type-jpg,
+i.file-preview.file-type-jpeg,
+i.file-preview.file-type-gif,
+i.file-preview.file-type-bmp,
+i.file-preview.file-type-png,
+i.file-preview.file-type-psd{
+    background-position: -140px center;
+}

ruoyi-ui/public/ueditor/dialogs/attachment/attachment.html

@@ -0,0 +1,60 @@
+<!doctype html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>ueditor图片对话框</title>
+    <script type="text/javascript" src="../internal.js"></script>
+
+    <!-- jquery -->
+    <script type="text/javascript" src="../../third-party/jquery-1.10.2.min.js"></script>
+
+    <!-- webuploader -->
+    <script src="../../third-party/webuploader/webuploader.min.js"></script>
+    <link rel="stylesheet" type="text/css" href="../../third-party/webuploader/webuploader.css">
+
+    <!-- attachment dialog -->
+    <link rel="stylesheet" href="attachment.css" type="text/css" />
+</head>
+<body>
+
+    <div class="wrapper">
+        <div id="tabhead" class="tabhead">
+            <span class="tab focus" data-content-id="upload"><var id="lang_tab_upload"></var></span>
+            <span class="tab" data-content-id="online"><var id="lang_tab_online"></var></span>
+        </div>
+        <div id="tabbody" class="tabbody">
+            <!-- 上传图片 -->
+            <div id="upload" class="panel focus">
+                <div id="queueList" class="queueList">
+                    <div class="statusBar element-invisible">
+                        <div class="progress">
+                            <span class="text">0%</span>
+                            <span class="percentage"></span>
+                        </div><div class="info"></div>
+                        <div class="btns">
+                            <div id="filePickerBtn"></div>
+                            <div class="uploadBtn"><var id="lang_start_upload"></var></div>
+                        </div>
+                    </div>
+                    <div id="dndArea" class="placeholder">
+                        <div class="filePickerContainer">
+                            <div id="filePickerReady"></div>
+                        </div>
+                    </div>
+                    <ul class="filelist element-invisible">
+                        <li id="filePickerBlock" class="filePickerBlock"></li>
+                    </ul>
+                </div>
+            </div>
+
+            <!-- 在线图片 -->
+            <div id="online" class="panel">
+                <div id="fileList"><var id="lang_imgLoading"></var></div>
+            </div>
+
+        </div>
+    </div>
+    <script type="text/javascript" src="attachment.js"></script>
+
+</body>
+</html>

ruoyi-ui/public/ueditor/dialogs/attachment/attachment.js

@@ -0,0 +1,760 @@
+/**
+ * User: Jinqn
+ * Date: 14-04-08
+ * Time: 下午16:34
+ * 上传图片对话框逻辑代码,包括tab: 远程图片/上传图片/在线图片/搜索图片
+ */
+
+(function () {
+
+    var uploadFile,
+        onlineFile;
+
+    window.onload = function () {
+        initTabs();
+        initButtons();
+    };
+
+    /* 初始化tab标签 */
+    function initTabs() {
+        var tabs = $G('tabhead').children;
+        for (var i = 0; i < tabs.length; i++) {
+            domUtils.on(tabs[i], "click", function (e) {
+                var target = e.target || e.srcElement;
+                setTabFocus(target.getAttribute('data-content-id'));
+            });
+        }
+
+        setTabFocus('upload');
+    }
+
+    /* 初始化tabbody */
+    function setTabFocus(id) {
+        if(!id) return;
+        var i, bodyId, tabs = $G('tabhead').children;
+        for (i = 0; i < tabs.length; i++) {
+            bodyId = tabs[i].getAttribute('data-content-id')
+            if (bodyId == id) {
+                domUtils.addClass(tabs[i], 'focus');
+                domUtils.addClass($G(bodyId), 'focus');
+            } else {
+                domUtils.removeClasses(tabs[i], 'focus');
+                domUtils.removeClasses($G(bodyId), 'focus');
+            }
+        }
+        switch (id) {
+            case 'upload':
+                uploadFile = uploadFile || new UploadFile('queueList');
+                break;
+            case 'online':
+                onlineFile = onlineFile || new OnlineFile('fileList');
+                break;
+        }
+    }
+
+    /* 初始化onok事件 */
+    function initButtons() {
+
+        dialog.onok = function () {
+            var list = [], id, tabs = $G('tabhead').children;
+            for (var i = 0; i < tabs.length; i++) {
+                if (domUtils.hasClass(tabs[i], 'focus')) {
+                    id = tabs[i].getAttribute('data-content-id');
+                    break;
+                }
+            }
+
+            switch (id) {
+                case 'upload':
+                    list = uploadFile.getInsertList();
+                    var count = uploadFile.getQueueCount();
+                    if (count) {
+                        $('.info', '#queueList').html('<span style="color:red;">' + '还有2个未上传文件'.replace(/[\d]/, count) + '</span>');
+                        return false;
+                    }
+                    break;
+                case 'online':
+                    list = onlineFile.getInsertList();
+                    break;
+            }
+
+            editor.execCommand('insertfile', list);
+        };
+    }
+
+
+    /* 上传附件 */
+    function UploadFile(target) {
+        this.$wrap = target.constructor == String ? $('#' + target) : $(target);
+        this.init();
+    }
+    UploadFile.prototype = {
+        init: function () {
+            this.fileList = [];
+            this.initContainer();
+            this.initUploader();
+        },
+        initContainer: function () {
+            this.$queue = this.$wrap.find('.filelist');
+        },
+        /* 初始化容器 */
+        initUploader: function () {
+            var _this = this,
+                $ = jQuery,    // just in case. Make sure it's not an other libaray.
+                $wrap = _this.$wrap,
+            // 图片容器
+                $queue = $wrap.find('.filelist'),
+            // 状态栏，包括进度和控制按钮
+                $statusBar = $wrap.find('.statusBar'),
+            // 文件总体选择信息。
+                $info = $statusBar.find('.info'),
+            // 上传按钮
+                $upload = $wrap.find('.uploadBtn'),
+            // 上传按钮
+                $filePickerBtn = $wrap.find('.filePickerBtn'),
+            // 上传按钮
+                $filePickerBlock = $wrap.find('.filePickerBlock'),
+            // 没选择文件之前的内容。
+                $placeHolder = $wrap.find('.placeholder'),
+            // 总体进度条
+                $progress = $statusBar.find('.progress').hide(),
+            // 添加的文件数量
+                fileCount = 0,
+            // 添加的文件总大小
+                fileSize = 0,
+            // 优化retina, 在retina下这个值是2
+                ratio = window.devicePixelRatio || 1,
+            // 缩略图大小
+                thumbnailWidth = 113 * ratio,
+                thumbnailHeight = 113 * ratio,
+            // 可能有pedding, ready, uploading, confirm, done.
+                state = '',
+            // 所有文件的进度信息，key为file id
+                percentages = {},
+                supportTransition = (function () {
+                    var s = document.createElement('p').style,
+                        r = 'transition' in s ||
+                            'WebkitTransition' in s ||
+                            'MozTransition' in s ||
+                            'msTransition' in s ||
+                            'OTransition' in s;
+                    s = null;
+                    return r;
+                })(),
+            // WebUploader实例
+                uploader,
+                actionUrl = editor.getActionUrl(editor.getOpt('fileActionName')),
+                fileMaxSize = editor.getOpt('fileMaxSize'),
+                acceptExtensions = (editor.getOpt('fileAllowFiles') || []).join('').replace(/\./g, ',').replace(/^[,]/, '');;
+
+            if (!WebUploader.Uploader.support()) {
+                $('#filePickerReady').after($('<div>').html(lang.errorNotSupport)).hide();
+                return;
+            } else if (!editor.getOpt('fileActionName')) {
+                $('#filePickerReady').after($('<div>').html(lang.errorLoadConfig)).hide();
+                return;
+            }
+
+            uploader = _this.uploader = WebUploader.create({
+                pick: {
+                    id: '#filePickerReady',
+                    label: lang.uploadSelectFile
+                },
+                swf: '../../third-party/webuploader/Uploader.swf',
+                server: actionUrl,
+                fileVal: editor.getOpt('fileFieldName'),
+                duplicate: true,
+                fileSingleSizeLimit: fileMaxSize,
+                compress: false
+            });
+            uploader.addButton({
+                id: '#filePickerBlock'
+            });
+            uploader.addButton({
+                id: '#filePickerBtn',
+                label: lang.uploadAddFile
+            });
+
+            setState('pedding');
+
+            // 当有文件添加进来时执行，负责view的创建
+            function addFile(file) {
+                var $li = $('<li id="' + file.id + '">' +
+                        '<p class="title">' + file.name + '</p>' +
+                        '<p class="imgWrap"></p>' +
+                        '<p class="progress"><span></span></p>' +
+                        '</li>'),
+
+                    $btns = $('<div class="file-panel">' +
+                        '<span class="cancel">' + lang.uploadDelete + '</span>' +
+                        '<span class="rotateRight">' + lang.uploadTurnRight + '</span>' +
+                        '<span class="rotateLeft">' + lang.uploadTurnLeft + '</span></div>').appendTo($li),
+                    $prgress = $li.find('p.progress span'),
+                    $wrap = $li.find('p.imgWrap'),
+                    $info = $('<p class="error"></p>').hide().appendTo($li),
+
+                    showError = function (code) {
+                        switch (code) {
+                            case 'exceed_size':
+                                text = lang.errorExceedSize;
+                                break;
+                            case 'interrupt':
+                                text = lang.errorInterrupt;
+                                break;
+                            case 'http':
+                                text = lang.errorHttp;
+                                break;
+                            case 'not_allow_type':
+                                text = lang.errorFileType;
+                                break;
+                            default:
+                                text = lang.errorUploadRetry;
+                                break;
+                        }
+                        $info.text(text).show();
+                    };
+
+                if (file.getStatus() === 'invalid') {
+                    showError(file.statusText);
+                } else {
+                    $wrap.text(lang.uploadPreview);
+                    if ('|png|jpg|jpeg|bmp|gif|'.indexOf('|'+file.ext.toLowerCase()+'|') == -1) {
+                        $wrap.empty().addClass('notimage').append('<i class="file-preview file-type-' + file.ext.toLowerCase() + '"></i>' +
+                        '<span class="file-title" title="' + file.name + '">' + file.name + '</span>');
+                    } else {
+                        if (browser.ie && browser.version <= 7) {
+                            $wrap.text(lang.uploadNoPreview);
+                        } else {
+                            uploader.makeThumb(file, function (error, src) {
+                                if (error || !src) {
+                                    $wrap.text(lang.uploadNoPreview);
+                                } else {
+                                    var $img = $('<img src="' + src + '">');
+                                    $wrap.empty().append($img);
+                                    $img.on('error', function () {
+                                        $wrap.text(lang.uploadNoPreview);
+                                    });
+                                }
+                            }, thumbnailWidth, thumbnailHeight);
+                        }
+                    }
+                    percentages[ file.id ] = [ file.size, 0 ];
+                    file.rotation = 0;
+
+                    /* 检查文件格式 */
+                    if (!file.ext || acceptExtensions.indexOf(file.ext.toLowerCase()) == -1) {
+                        showError('not_allow_type');
+                        uploader.removeFile(file);
+                    }
+                }
+
+                file.on('statuschange', function (cur, prev) {
+                    if (prev === 'progress') {
+                        $prgress.hide().width(0);
+                    } else if (prev === 'queued') {
+                        $li.off('mouseenter mouseleave');
+                        $btns.remove();
+                    }
+                    // 成功
+                    if (cur === 'error' || cur === 'invalid') {
+                        showError(file.statusText);
+                        percentages[ file.id ][ 1 ] = 1;
+                    } else if (cur === 'interrupt') {
+                        showError('interrupt');
+                    } else if (cur === 'queued') {
+                        percentages[ file.id ][ 1 ] = 0;
+                    } else if (cur === 'progress') {
+                        $info.hide();
+                        $prgress.css('display', 'block');
+                    } else if (cur === 'complete') {
+                    }
+
+                    $li.removeClass('state-' + prev).addClass('state-' + cur);
+                });
+
+                $li.on('mouseenter', function () {
+                    $btns.stop().animate({height: 30});
+                });
+                $li.on('mouseleave', function () {
+                    $btns.stop().animate({height: 0});
+                });
+
+                $btns.on('click', 'span', function () {
+                    var index = $(this).index(),
+                        deg;
+
+                    switch (index) {
+                        case 0:
+                            uploader.removeFile(file);
+                            return;
+                        case 1:
+                            file.rotation += 90;
+                            break;
+                        case 2:
+                            file.rotation -= 90;
+                            break;
+                    }
+
+                    if (supportTransition) {
+                        deg = 'rotate(' + file.rotation + 'deg)';
+                        $wrap.css({
+                            '-webkit-transform': deg,
+                            '-mos-transform': deg,
+                            '-o-transform': deg,
+                            'transform': deg
+                        });
+                    } else {
+                        $wrap.css('filter', 'progid:DXImageTransform.Microsoft.BasicImage(rotation=' + (~~((file.rotation / 90) % 4 + 4) % 4) + ')');
+                    }
+
+                });
+
+                $li.insertBefore($filePickerBlock);
+            }
+
+            // 负责view的销毁
+            function removeFile(file) {
+                var $li = $('#' + file.id);
+                delete percentages[ file.id ];
+                updateTotalProgress();
+                $li.off().find('.file-panel').off().end().remove();
+            }
+
+            function updateTotalProgress() {
+                var loaded = 0,
+                    total = 0,
+                    spans = $progress.children(),
+                    percent;
+
+                $.each(percentages, function (k, v) {
+                    total += v[ 0 ];
+                    loaded += v[ 0 ] * v[ 1 ];
+                });
+
+                percent = total ? loaded / total : 0;
+
+                spans.eq(0).text(Math.round(percent * 100) + '%');
+                spans.eq(1).css('width', Math.round(percent * 100) + '%');
+                updateStatus();
+            }
+
+            function setState(val, files) {
+
+                if (val != state) {
+
+                    var stats = uploader.getStats();
+
+                    $upload.removeClass('state-' + state);
+                    $upload.addClass('state-' + val);
+
+                    switch (val) {
+
+                        /* 未选择文件 */
+                        case 'pedding':
+                            $queue.addClass('element-invisible');
+                            $statusBar.addClass('element-invisible');
+                            $placeHolder.removeClass('element-invisible');
+                            $progress.hide(); $info.hide();
+                            uploader.refresh();
+                            break;
+
+                        /* 可以开始上传 */
+                        case 'ready':
+                            $placeHolder.addClass('element-invisible');
+                            $queue.removeClass('element-invisible');
+                            $statusBar.removeClass('element-invisible');
+                            $progress.hide(); $info.show();
+                            $upload.text(lang.uploadStart);
+                            uploader.refresh();
+                            break;
+
+                        /* 上传中 */
+                        case 'uploading':
+                            $progress.show(); $info.hide();
+                            $upload.text(lang.uploadPause);
+                            break;
+
+                        /* 暂停上传 */
+                        case 'paused':
+                            $progress.show(); $info.hide();
+                            $upload.text(lang.uploadContinue);
+                            break;
+
+                        case 'confirm':
+                            $progress.show(); $info.hide();
+                            $upload.text(lang.uploadStart);
+
+                            stats = uploader.getStats();
+                            if (stats.successNum && !stats.uploadFailNum) {
+                                setState('finish');
+                                return;
+                            }
+                            break;
+
+                        case 'finish':
+                            $progress.hide(); $info.show();
+                            if (stats.uploadFailNum) {
+                                $upload.text(lang.uploadRetry);
+                            } else {
+                                $upload.text(lang.uploadStart);
+                            }
+                            break;
+                    }
+
+                    state = val;
+                    updateStatus();
+
+                }
+
+                if (!_this.getQueueCount()) {
+                    $upload.addClass('disabled')
+                } else {
+                    $upload.removeClass('disabled')
+                }
+
+            }
+
+            function updateStatus() {
+                var text = '', stats;
+
+                if (state === 'ready') {
+                    text = lang.updateStatusReady.replace('_', fileCount).replace('_KB', WebUploader.formatSize(fileSize));
+                } else if (state === 'confirm') {
+                    stats = uploader.getStats();
+                    if (stats.uploadFailNum) {
+                        text = lang.updateStatusConfirm.replace('_', stats.successNum).replace('_', stats.successNum);
+                    }
+                } else {
+                    stats = uploader.getStats();
+                    text = lang.updateStatusFinish.replace('_', fileCount).
+                        replace('_KB', WebUploader.formatSize(fileSize)).
+                        replace('_', stats.successNum);
+
+                    if (stats.uploadFailNum) {
+                        text += lang.updateStatusError.replace('_', stats.uploadFailNum);
+                    }
+                }
+
+                $info.html(text);
+            }
+
+            uploader.on('fileQueued', function (file) {
+                fileCount++;
+                fileSize += file.size;
+
+                if (fileCount === 1) {
+                    $placeHolder.addClass('element-invisible');
+                    $statusBar.show();
+                }
+
+                addFile(file);
+            });
+
+            uploader.on('fileDequeued', function (file) {
+                fileCount--;
+                fileSize -= file.size;
+
+                removeFile(file);
+                updateTotalProgress();
+            });
+
+            uploader.on('filesQueued', function (file) {
+                if (!uploader.isInProgress() && (state == 'pedding' || state == 'finish' || state == 'confirm' || state == 'ready')) {
+                    setState('ready');
+                }
+                updateTotalProgress();
+            });
+
+            uploader.on('all', function (type, files) {
+                switch (type) {
+                    case 'uploadFinished':
+                        setState('confirm', files);
+                        break;
+                    case 'startUpload':
+                        /* 添加额外的GET参数 */
+                        var params = utils.serializeParam(editor.queryCommandValue('serverparam')) || '',
+                            url = utils.formatUrl(actionUrl + (actionUrl.indexOf('?') == -1 ? '?':'&') + 'encode=utf-8&' + params);
+                        uploader.option('server', url);
+                        setState('uploading', files);
+                        break;
+                    case 'stopUpload':
+                        setState('paused', files);
+                        break;
+                }
+            });
+
+            uploader.on('uploadBeforeSend', function (file, data, header) {
+                //这里可以通过data对象添加POST参数
+                header['X_Requested_With'] = 'XMLHttpRequest';
+                // HaoChuan9421
+                if(editor.options.headers && Object.prototype.toString.apply(editor.options.headers) === "[object Object]"){
+                    for(var key in editor.options.headers){
+                        header[key] = editor.options.headers[key]
+                    }
+                }
+            });
+
+            uploader.on('uploadProgress', function (file, percentage) {
+                var $li = $('#' + file.id),
+                    $percent = $li.find('.progress span');
+
+                $percent.css('width', percentage * 100 + '%');
+                percentages[ file.id ][ 1 ] = percentage;
+                updateTotalProgress();
+            });
+
+            uploader.on('uploadSuccess', function (file, ret) {
+                var $file = $('#' + file.id);
+                try {
+                    var responseText = (ret._raw || ret),
+                        json = utils.str2json(responseText);
+                    if (json.state == 'SUCCESS') {
+                        _this.fileList.push(json);
+                        $file.append('<span class="success"></span>');
+                    } else {
+                        $file.find('.error').text(json.state).show();
+                    }
+                } catch (e) {
+                    $file.find('.error').text(lang.errorServerUpload).show();
+                }
+            });
+
+            uploader.on('uploadError', function (file, code) {
+            });
+            uploader.on('error', function (code, file) {
+                if (code == 'Q_TYPE_DENIED' || code == 'F_EXCEED_SIZE') {
+                    addFile(file);
+                }
+            });
+            uploader.on('uploadComplete', function (file, ret) {
+            });
+
+            $upload.on('click', function () {
+                if ($(this).hasClass('disabled')) {
+                    return false;
+                }
+
+                if (state === 'ready') {
+                    uploader.upload();
+                } else if (state === 'paused') {
+                    uploader.upload();
+                } else if (state === 'uploading') {
+                    uploader.stop();
+                }
+            });
+
+            $upload.addClass('state-' + state);
+            updateTotalProgress();
+        },
+        getQueueCount: function () {
+            var file, i, status, readyFile = 0, files = this.uploader.getFiles();
+            for (i = 0; file = files[i++]; ) {
+                status = file.getStatus();
+                if (status == 'queued' || status == 'uploading' || status == 'progress') readyFile++;
+            }
+            return readyFile;
+        },
+        getInsertList: function () {
+            var i, link, data, list = [],
+                prefix = editor.getOpt('fileUrlPrefix');
+            for (i = 0; i < this.fileList.length; i++) {
+                data = this.fileList[i];
+                link = data.url;
+                list.push({
+                    title: data.original || link.substr(link.lastIndexOf('/') + 1),
+                    url: prefix + link
+                });
+            }
+            return list;
+        }
+    };
+
+
+    /* 在线附件 */
+    function OnlineFile(target) {
+        this.container = utils.isString(target) ? document.getElementById(target) : target;
+        this.init();
+    }
+    OnlineFile.prototype = {
+        init: function () {
+            this.initContainer();
+            this.initEvents();
+            this.initData();
+        },
+        /* 初始化容器 */
+        initContainer: function () {
+            this.container.innerHTML = '';
+            this.list = document.createElement('ul');
+            this.clearFloat = document.createElement('li');
+
+            domUtils.addClass(this.list, 'list');
+            domUtils.addClass(this.clearFloat, 'clearFloat');
+
+            this.list.appendChild(this.clearFloat);
+            this.container.appendChild(this.list);
+        },
+        /* 初始化滚动事件,滚动到地步自动拉取数据 */
+        initEvents: function () {
+            var _this = this;
+
+            /* 滚动拉取图片 */
+            domUtils.on($G('fileList'), 'scroll', function(e){
+                var panel = this;
+                if (panel.scrollHeight - (panel.offsetHeight + panel.scrollTop) < 10) {
+                    _this.getFileData();
+                }
+            });
+            /* 选中图片 */
+            domUtils.on(this.list, 'click', function (e) {
+                var target = e.target || e.srcElement,
+                    li = target.parentNode;
+
+                if (li.tagName.toLowerCase() == 'li') {
+                    if (domUtils.hasClass(li, 'selected')) {
+                        domUtils.removeClasses(li, 'selected');
+                    } else {
+                        domUtils.addClass(li, 'selected');
+                    }
+                }
+            });
+        },
+        /* 初始化第一次的数据 */
+        initData: function () {
+
+            /* 拉取数据需要使用的值 */
+            this.state = 0;
+            this.listSize = editor.getOpt('fileManagerListSize');
+            this.listIndex = 0;
+            this.listEnd = false;
+
+            /* 第一次拉取数据 */
+            this.getFileData();
+        },
+        /* 向后台拉取图片列表数据 */
+        getFileData: function () {
+            var _this = this;
+
+            if(!_this.listEnd && !this.isLoadingData) {
+                this.isLoadingData = true;
+                ajax.request(editor.getActionUrl(editor.getOpt('fileManagerActionName')), {
+                    timeout: 100000,
+                    data: utils.extend({
+                            start: this.listIndex,
+                            size: this.listSize
+                        }, editor.queryCommandValue('serverparam')),
+                    method: 'get',
+                    onsuccess: function (r) {
+                        try {
+                            var json = eval('(' + r.responseText + ')');
+                            if (json.state == 'SUCCESS') {
+                                _this.pushData(json.list);
+                                _this.listIndex = parseInt(json.start) + parseInt(json.list.length);
+                                if(_this.listIndex >= json.total) {
+                                    _this.listEnd = true;
+                                }
+                                _this.isLoadingData = false;
+                            }
+                        } catch (e) {
+                            if(r.responseText.indexOf('ue_separate_ue') != -1) {
+                                var list = r.responseText.split(r.responseText);
+                                _this.pushData(list);
+                                _this.listIndex = parseInt(list.length);
+                                _this.listEnd = true;
+                                _this.isLoadingData = false;
+                            }
+                        }
+                    },
+                    onerror: function () {
+                        _this.isLoadingData = false;
+                    }
+                });
+            }
+        },
+        /* 添加图片到列表界面上 */
+        pushData: function (list) {
+            var i, item, img, filetype, preview, icon, _this = this,
+                urlPrefix = editor.getOpt('fileManagerUrlPrefix');
+            for (i = 0; i < list.length; i++) {
+                if(list[i] && list[i].url) {
+                    item = document.createElement('li');
+                    icon = document.createElement('span');
+                    filetype = list[i].url.substr(list[i].url.lastIndexOf('.') + 1);
+
+                    if ( "png|jpg|jpeg|gif|bmp".indexOf(filetype) != -1 ) {
+                        preview = document.createElement('img');
+                        domUtils.on(preview, 'load', (function(image){
+                            return function(){
+                                _this.scale(image, image.parentNode.offsetWidth, image.parentNode.offsetHeight);
+                            };
+                        })(preview));
+                        preview.width = 113;
+                        preview.setAttribute('src', urlPrefix + list[i].url + (list[i].url.indexOf('?') == -1 ? '?noCache=':'&noCache=') + (+new Date()).toString(36) );
+                    } else {
+                        var ic = document.createElement('i'),
+                            textSpan = document.createElement('span');
+                        textSpan.innerHTML = list[i].url.substr(list[i].url.lastIndexOf('/') + 1);
+                        preview = document.createElement('div');
+                        preview.appendChild(ic);
+                        preview.appendChild(textSpan);
+                        domUtils.addClass(preview, 'file-wrapper');
+                        domUtils.addClass(textSpan, 'file-title');
+                        domUtils.addClass(ic, 'file-type-' + filetype);
+                        domUtils.addClass(ic, 'file-preview');
+                    }
+                    domUtils.addClass(icon, 'icon');
+                    item.setAttribute('data-url', urlPrefix + list[i].url);
+                    if (list[i].original) {
+                        item.setAttribute('data-title', list[i].original);
+                    }
+
+                    item.appendChild(preview);
+                    item.appendChild(icon);
+                    this.list.insertBefore(item, this.clearFloat);
+                }
+            }
+        },
+        /* 改变图片大小 */
+        scale: function (img, w, h, type) {
+            var ow = img.width,
+                oh = img.height;
+
+            if (type == 'justify') {
+                if (ow >= oh) {
+                    img.width = w;
+                    img.height = h * oh / ow;
+                    img.style.marginLeft = '-' + parseInt((img.width - w) / 2) + 'px';
+                } else {
+                    img.width = w * ow / oh;
+                    img.height = h;
+                    img.style.marginTop = '-' + parseInt((img.height - h) / 2) + 'px';
+                }
+            } else {
+                if (ow >= oh) {
+                    img.width = w * ow / oh;
+                    img.height = h;
+                    img.style.marginLeft = '-' + parseInt((img.width - w) / 2) + 'px';
+                } else {
+                    img.width = w;
+                    img.height = h * oh / ow;
+                    img.style.marginTop = '-' + parseInt((img.height - h) / 2) + 'px';
+                }
+            }
+        },
+        getInsertList: function () {
+            var i, lis = this.list.children, list = [];
+            for (i = 0; i < lis.length; i++) {
+                if (domUtils.hasClass(lis[i], 'selected')) {
+                    var url = lis[i].getAttribute('data-url');
+                    var title = lis[i].getAttribute('data-title') || url.substr(url.lastIndexOf('/') + 1);
+                    list.push({
+                        title: title,
+                        url: url
+                    });
+                }
+            }
+            return list;
+        }
+    };
+
+
+})();

ruoyi-ui/public/ueditor/dialogs/background/background.css

@@ -0,0 +1,94 @@
+.wrapper{ width: 424px;margin: 10px auto; zoom:1;position: relative}
+.tabbody{height:225px;}
+.tabbody .panel { position: absolute;width:100%; height:100%;background: #fff; display: none;}
+.tabbody .focus { display: block;}
+
+body{font-size: 12px;color: #888;overflow: hidden;}
+input,label{vertical-align:middle}
+.clear{clear: both;}
+.pl{padding-left: 18px;padding-left: 23px\9;}
+
+#imageList {width: 420px;height: 215px;margin-top: 10px;overflow: hidden;overflow-y: auto;}
+#imageList div {float: left;width: 100px;height: 95px;margin: 5px 10px;}
+#imageList img {cursor: pointer;border: 2px solid white;}
+
+.bgarea{margin: 10px;padding: 5px;height: 84%;border: 1px solid #A8A297;}
+.content div{margin: 10px 0 10px 5px;}
+.content .iptradio{margin: 0px 5px 5px 0px;}
+.txt{width:280px;}
+
+.wrapcolor{height: 19px;}
+div.color{float: left;margin: 0;}
+#colorPicker{width: 17px;height: 17px;border: 1px solid #CCC;display: inline-block;border-radius: 3px;box-shadow: 2px 2px 5px #D3D6DA;margin: 0;float: left;}
+div.alignment,#custom{margin-left: 23px;margin-left: 28px\9;}
+#custom input{height: 15px;min-height: 15px;width:20px;}
+#repeatType{width:100px;}
+
+
+/* 图片管理样式 */
+#imgManager {
+    width: 100%;
+    height: 225px;
+}
+#imgManager #imageList{
+    width: 100%;
+    overflow-x: hidden;
+    overflow-y: auto;
+}
+#imgManager ul {
+    display: block;
+    list-style: none;
+    margin: 0;
+    padding: 0;
+}
+#imgManager li {
+    float: left;
+    display: block;
+    list-style: none;
+    padding: 0;
+    width: 113px;
+    height: 113px;
+    margin: 9px 0 0 19px;
+    background-color: #eee;
+    overflow: hidden;
+    cursor: pointer;
+    position: relative;
+}
+#imgManager li.clearFloat {
+    float: none;
+    clear: both;
+    display: block;
+    width:0;
+    height:0;
+    margin: 0;
+    padding: 0;
+}
+#imgManager li img {
+    cursor: pointer;
+}
+#imgManager li .icon {
+    cursor: pointer;
+    width: 113px;
+    height: 113px;
+    position: absolute;
+    top: 0;
+    left: 0;
+    z-index: 2;
+    border: 0;
+    background-repeat: no-repeat;
+}
+#imgManager li .icon:hover {
+    width: 107px;
+    height: 107px;
+    border: 3px solid #1094fa;
+}
+#imgManager li.selected .icon {
+    background-image: url(images/success.png);
+    background-position: 75px 75px;
+}
+#imgManager li.selected .icon:hover {
+    width: 107px;
+    height: 107px;
+    border: 3px solid #1094fa;
+    background-position: 72px 72px;
+}

ruoyi-ui/public/ueditor/dialogs/background/background.html

@@ -0,0 +1,56 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
+    <script type="text/javascript" src="../internal.js"></script>
+    <link rel="stylesheet" type="text/css" href="background.css">
+</head>
+<body>
+    <div id="bg_container" class="wrapper">
+        <div id="tabHeads" class="tabhead">
+            <span class="focus" data-content-id="normal"><var id="lang_background_normal"></var></span>
+            <span class="" data-content-id="imgManager"><var id="lang_background_local"></var></span>
+        </div>
+        <div id="tabBodys" class="tabbody">
+            <div id="normal" class="panel focus">
+                <fieldset class="bgarea">
+                    <legend><var id="lang_background_set"></var></legend>
+                    <div class="content">
+                        <div>
+                            <label><input id="nocolorRadio" class="iptradio" type="radio" name="t" value="none" checked="checked"><var id="lang_background_none"></var></label>
+                            <label><input id="coloredRadio" class="iptradio" type="radio" name="t" value="color"><var id="lang_background_colored"></var></label>
+                        </div>
+                        <div class="wrapcolor pl">
+                            <div class="color">
+                                <var id="lang_background_color"></var>:
+                            </div>
+                            <div id="colorPicker"></div>
+                            <div class="clear"></div>
+                        </div>
+                        <div class="wrapcolor pl">
+                            <label><var id="lang_background_netimg"></var>:</label><input class="txt" type="text" id="url">
+                        </div>
+                        <div id="alignment" class="alignment">
+                            <var id="lang_background_align"></var>:<select id="repeatType">
+                                <option value="center"></option>
+                                <option value="repeat-x"></option>
+                                <option value="repeat-y"></option>
+                                <option value="repeat"></option>
+                                <option value="self"></option>
+                            </select>
+                        </div>
+                        <div id="custom" >
+                            <var id="lang_background_position"></var>:x:<input type="text" size="1" id="x" maxlength="4" value="0">px&nbsp;&nbsp;y:<input type="text" size="1" id="y" maxlength="4" value="0">px
+                        </div>
+                    </div>
+                </fieldset>
+
+            </div>
+            <div id="imgManager" class="panel">
+                <div id="imageList" style=""></div>
+            </div>
+        </div>
+    </div>
+    <script type="text/javascript" src="background.js"></script>
+</body>
+</html>

ruoyi-ui/public/ueditor/dialogs/background/background.js

@@ -0,0 +1,376 @@
+(function () {
+
+    var onlineImage,
+        backupStyle = editor.queryCommandValue('background');
+
+    window.onload = function () {
+        initTabs();
+        initColorSelector();
+    };
+
+    /* 初始化tab标签 */
+    function initTabs(){
+        var tabs = $G('tabHeads').children;
+        for (var i = 0; i < tabs.length; i++) {
+            domUtils.on(tabs[i], "click", function (e) {
+                var target = e.target || e.srcElement;
+                for (var j = 0; j < tabs.length; j++) {
+                    if(tabs[j] == target){
+                        tabs[j].className = "focus";
+                        var contentId = tabs[j].getAttribute('data-content-id');
+                        $G(contentId).style.display = "block";
+                        if(contentId == 'imgManager') {
+                            initImagePanel();
+                        }
+                    }else {
+                        tabs[j].className = "";
+                        $G(tabs[j].getAttribute('data-content-id')).style.display = "none";
+                    }
+                }
+            });
+        }
+    }
+
+    /* 初始化颜色设置 */
+    function initColorSelector () {
+        var obj = editor.queryCommandValue('background');
+        if (obj) {
+            var color = obj['background-color'],
+                repeat = obj['background-repeat'] || 'repeat',
+                image = obj['background-image'] || '',
+                position = obj['background-position'] || 'center center',
+                pos = position.split(' '),
+                x = parseInt(pos[0]) || 0,
+                y = parseInt(pos[1]) || 0;
+
+            if(repeat == 'no-repeat' && (x || y)) repeat = 'self';
+
+            image = image.match(/url[\s]*\(([^\)]*)\)/);
+            image = image ? image[1]:'';
+            updateFormState('colored', color, image, repeat, x, y);
+        } else {
+            updateFormState();
+        }
+
+        var updateHandler = function () {
+            updateFormState();
+            updateBackground();
+        }
+        domUtils.on($G('nocolorRadio'), 'click', updateBackground);
+        domUtils.on($G('coloredRadio'), 'click', updateHandler);
+        domUtils.on($G('url'), 'keyup', function(){
+            if($G('url').value && $G('alignment').style.display == "none") {
+                utils.each($G('repeatType').children, function(item){
+                    item.selected = ('repeat' == item.getAttribute('value') ? 'selected':false);
+                });
+            }
+            updateHandler();
+        });
+        domUtils.on($G('repeatType'), 'change', updateHandler);
+        domUtils.on($G('x'), 'keyup', updateBackground);
+        domUtils.on($G('y'), 'keyup', updateBackground);
+
+        initColorPicker();
+    }
+
+    /* 初始化颜色选择器 */
+    function initColorPicker() {
+        var me = editor,
+            cp = $G("colorPicker");
+
+        /* 生成颜色选择器ui对象 */
+        var popup = new UE.ui.Popup({
+            content: new UE.ui.ColorPicker({
+                noColorText: me.getLang("clearColor"),
+                editor: me,
+                onpickcolor: function (t, color) {
+                    updateFormState('colored', color);
+                    updateBackground();
+                    UE.ui.Popup.postHide();
+                },
+                onpicknocolor: function (t, color) {
+                    updateFormState('colored', 'transparent');
+                    updateBackground();
+                    UE.ui.Popup.postHide();
+                }
+            }),
+            editor: me,
+            onhide: function () {
+            }
+        });
+
+        /* 设置颜色选择器 */
+        domUtils.on(cp, "click", function () {
+            popup.showAnchor(this);
+        });
+        domUtils.on(document, 'mousedown', function (evt) {
+            var el = evt.target || evt.srcElement;
+            UE.ui.Popup.postHide(el);
+        });
+        domUtils.on(window, 'scroll', function () {
+            UE.ui.Popup.postHide();
+        });
+    }
+
+    /* 初始化在线图片列表 */
+    function initImagePanel() {
+        onlineImage = onlineImage || new OnlineImage('imageList');
+    }
+
+    /* 更新背景色设置面板 */
+    function updateFormState (radio, color, url, align, x, y) {
+        var nocolorRadio = $G('nocolorRadio'),
+            coloredRadio = $G('coloredRadio');
+
+        if(radio) {
+            nocolorRadio.checked = (radio == 'colored' ? false:'checked');
+            coloredRadio.checked = (radio == 'colored' ? 'checked':false);
+        }
+        if(color) {
+            domUtils.setStyle($G("colorPicker"), "background-color", color);
+        }
+
+        if(url && /^\//.test(url)) {
+            var a = document.createElement('a');
+            a.href = url;
+            browser.ie && (a.href = a.href);
+            url = browser.ie ? a.href:(a.protocol + '//' + a.host + a.pathname + a.search + a.hash);
+        }
+
+        if(url || url === '') {
+            $G('url').value = url;
+        }
+        if(align) {
+            utils.each($G('repeatType').children, function(item){
+                item.selected = (align == item.getAttribute('value') ? 'selected':false);
+            });
+        }
+        if(x || y) {
+            $G('x').value = parseInt(x) || 0;
+            $G('y').value = parseInt(y) || 0;
+        }
+
+        $G('alignment').style.display = coloredRadio.checked && $G('url').value ? '':'none';
+        $G('custom').style.display = coloredRadio.checked && $G('url').value && $G('repeatType').value == 'self' ? '':'none';
+    }
+
+    /* 更新背景颜色 */
+    function updateBackground () {
+        if ($G('coloredRadio').checked) {
+            var color = domUtils.getStyle($G("colorPicker"), "background-color"),
+                bgimg = $G("url").value,
+                align = $G("repeatType").value,
+                backgroundObj = {
+                    "background-repeat": "no-repeat",
+                    "background-position": "center center"
+                };
+
+            if (color) backgroundObj["background-color"] = color;
+            if (bgimg) backgroundObj["background-image"] = 'url(' + bgimg + ')';
+            if (align == 'self') {
+                backgroundObj["background-position"] = $G("x").value + "px " + $G("y").value + "px";
+            } else if (align == 'repeat-x' || align == 'repeat-y' || align == 'repeat') {
+                backgroundObj["background-repeat"] = align;
+            }
+
+            editor.execCommand('background', backgroundObj);
+        } else {
+            editor.execCommand('background', null);
+        }
+    }
+
+
+    /* 在线图片 */
+    function OnlineImage(target) {
+        this.container = utils.isString(target) ? document.getElementById(target) : target;
+        this.init();
+    }
+    OnlineImage.prototype = {
+        init: function () {
+            this.reset();
+            this.initEvents();
+        },
+        /* 初始化容器 */
+        initContainer: function () {
+            this.container.innerHTML = '';
+            this.list = document.createElement('ul');
+            this.clearFloat = document.createElement('li');
+
+            domUtils.addClass(this.list, 'list');
+            domUtils.addClass(this.clearFloat, 'clearFloat');
+
+            this.list.id = 'imageListUl';
+            this.list.appendChild(this.clearFloat);
+            this.container.appendChild(this.list);
+        },
+        /* 初始化滚动事件,滚动到地步自动拉取数据 */
+        initEvents: function () {
+            var _this = this;
+
+            /* 滚动拉取图片 */
+            domUtils.on($G('imageList'), 'scroll', function(e){
+                var panel = this;
+                if (panel.scrollHeight - (panel.offsetHeight + panel.scrollTop) < 10) {
+                    _this.getImageData();
+                }
+            });
+            /* 选中图片 */
+            domUtils.on(this.container, 'click', function (e) {
+                var target = e.target || e.srcElement,
+                    li = target.parentNode,
+                    nodes = $G('imageListUl').childNodes;
+
+                if (li.tagName.toLowerCase() == 'li') {
+                    updateFormState('nocolor', null, '');
+                    for (var i = 0, node; node = nodes[i++];) {
+                        if (node == li && !domUtils.hasClass(node, 'selected')) {
+                            domUtils.addClass(node, 'selected');
+                            updateFormState('colored', null, li.firstChild.getAttribute("_src"), 'repeat');
+                        } else {
+                            domUtils.removeClasses(node, 'selected');
+                        }
+                    }
+                    updateBackground();
+                }
+            });
+        },
+        /* 初始化第一次的数据 */
+        initData: function () {
+
+            /* 拉取数据需要使用的值 */
+            this.state = 0;
+            this.listSize = editor.getOpt('imageManagerListSize');
+            this.listIndex = 0;
+            this.listEnd = false;
+
+            /* 第一次拉取数据 */
+            this.getImageData();
+        },
+        /* 重置界面 */
+        reset: function() {
+            this.initContainer();
+            this.initData();
+        },
+        /* 向后台拉取图片列表数据 */
+        getImageData: function () {
+            var _this = this;
+
+            if(!_this.listEnd && !this.isLoadingData) {
+                this.isLoadingData = true;
+                var url = editor.getActionUrl(editor.getOpt('imageManagerActionName')),
+                    isJsonp = utils.isCrossDomainUrl(url);
+                ajax.request(url, {
+                    'timeout': 100000,
+                    'dataType': isJsonp ? 'jsonp':'',
+                    'data': utils.extend({
+                            start: this.listIndex,
+                            size: this.listSize
+                        }, editor.queryCommandValue('serverparam')),
+                    'method': 'get',
+                    'onsuccess': function (r) {
+                        try {
+                            var json = isJsonp ? r:eval('(' + r.responseText + ')');
+                            if (json.state == 'SUCCESS') {
+                                _this.pushData(json.list);
+                                _this.listIndex = parseInt(json.start) + parseInt(json.list.length);
+                                if(_this.listIndex >= json.total) {
+                                    _this.listEnd = true;
+                                }
+                                _this.isLoadingData = false;
+                            }
+                        } catch (e) {
+                            if(r.responseText.indexOf('ue_separate_ue') != -1) {
+                                var list = r.responseText.split(r.responseText);
+                                _this.pushData(list);
+                                _this.listIndex = parseInt(list.length);
+                                _this.listEnd = true;
+                                _this.isLoadingData = false;
+                            }
+                        }
+                    },
+                    'onerror': function () {
+                        _this.isLoadingData = false;
+                    }
+                });
+            }
+        },
+        /* 添加图片到列表界面上 */
+        pushData: function (list) {
+            var i, item, img, icon, _this = this,
+                urlPrefix = editor.getOpt('imageManagerUrlPrefix');
+            for (i = 0; i < list.length; i++) {
+                if(list[i] && list[i].url) {
+                    item = document.createElement('li');
+                    img = document.createElement('img');
+                    icon = document.createElement('span');
+
+                    domUtils.on(img, 'load', (function(image){
+                        return function(){
+                            _this.scale(image, image.parentNode.offsetWidth, image.parentNode.offsetHeight);
+                        }
+                    })(img));
+                    img.width = 113;
+                    img.setAttribute('src', urlPrefix + list[i].url + (list[i].url.indexOf('?') == -1 ? '?noCache=':'&noCache=') + (+new Date()).toString(36) );
+                    img.setAttribute('_src', urlPrefix + list[i].url);
+                    domUtils.addClass(icon, 'icon');
+
+                    item.appendChild(img);
+                    item.appendChild(icon);
+                    this.list.insertBefore(item, this.clearFloat);
+                }
+            }
+        },
+        /* 改变图片大小 */
+        scale: function (img, w, h, type) {
+            var ow = img.width,
+                oh = img.height;
+
+            if (type == 'justify') {
+                if (ow >= oh) {
+                    img.width = w;
+                    img.height = h * oh / ow;
+                    img.style.marginLeft = '-' + parseInt((img.width - w) / 2) + 'px';
+                } else {
+                    img.width = w * ow / oh;
+                    img.height = h;
+                    img.style.marginTop = '-' + parseInt((img.height - h) / 2) + 'px';
+                }
+            } else {
+                if (ow >= oh) {
+                    img.width = w * ow / oh;
+                    img.height = h;
+                    img.style.marginLeft = '-' + parseInt((img.width - w) / 2) + 'px';
+                } else {
+                    img.width = w;
+                    img.height = h * oh / ow;
+                    img.style.marginTop = '-' + parseInt((img.height - h) / 2) + 'px';
+                }
+            }
+        },
+        getInsertList: function () {
+            var i, lis = this.list.children, list = [], align = getAlign();
+            for (i = 0; i < lis.length; i++) {
+                if (domUtils.hasClass(lis[i], 'selected')) {
+                    var img = lis[i].firstChild,
+                        src = img.getAttribute('_src');
+                    list.push({
+                        src: src,
+                        _src: src,
+                        floatStyle: align
+                    });
+                }
+
+            }
+            return list;
+        }
+    };
+
+    dialog.onok = function () {
+        updateBackground();
+        editor.fireEvent('saveScene');
+    };
+    dialog.oncancel = function () {
+        editor.execCommand('background', backupStyle);
+    };
+
+})();