Merge branch 'main' of http://182.92.169.222:3000/zhc077/hnjd_comp

jeecg-boot-master/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java

@@ -75,6 +75,7 @@ public class ShiroConfig {
             }
         }
         // 配置不会被拦截的链接 顺序判断
+        filterChainDefinitionMap.put("/sysconfiguration/sysConfiguration/**", "anon"); //系统配置
         filterChainDefinitionMap.put("/sys/cas/client/validateLogin", "anon"); //cas验证登录
         filterChainDefinitionMap.put("/sys/randomImage/**", "anon"); //登录验证码接口排除
         filterChainDefinitionMap.put("/sys/checkCaptcha", "anon"); //登录验证码接口排除

jeecg-boot-master/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/sysconfiguration/controller/SysConfigurationController.java

@@ -0,0 +1,176 @@
+package org.jeecg.modules.sysconfiguration.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.sysconfiguration.entity.SysConfiguration;
+import org.jeecg.modules.sysconfiguration.service.ISysConfigurationService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: 系统配置
+ * @Author: jeecg-boot
+ * @Date:   2024-08-21
+ * @Version: V1.0
+ */
+@Api(tags="系统配置")
+@RestController
+@RequestMapping("/sysconfiguration/sysConfiguration")
+@Slf4j
+public class SysConfigurationController extends JeecgController<SysConfiguration, ISysConfigurationService> {
+	@Autowired
+	private ISysConfigurationService sysConfigurationService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param sysConfiguration
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "系统配置-分页列表查询")
+	@ApiOperation(value="系统配置-分页列表查询", notes="系统配置-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<SysConfiguration>> queryPageList(SysConfiguration sysConfiguration,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<SysConfiguration> queryWrapper = QueryGenerator.initQueryWrapper(sysConfiguration, req.getParameterMap());
+		Page<SysConfiguration> page = new Page<SysConfiguration>(pageNo, pageSize);
+		IPage<SysConfiguration> pageList = sysConfigurationService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param sysConfiguration
+	 * @return
+	 */
+	@AutoLog(value = "系统配置-添加")
+	@ApiOperation(value="系统配置-添加", notes="系统配置-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody SysConfiguration sysConfiguration) {
+		List<SysConfiguration> list = sysConfigurationService.list();
+		if(list.size()>0){
+			sysConfigurationService.removeById(list.get(0).getId());
+		}
+		sysConfigurationService.save(sysConfiguration);
+		return Result.OK("成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param sysConfiguration
+	 * @return
+	 */
+	@AutoLog(value = "系统配置-编辑")
+	@ApiOperation(value="系统配置-编辑", notes="系统配置-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody SysConfiguration sysConfiguration) {
+		sysConfigurationService.updateById(sysConfiguration);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "系统配置-通过id删除")
+	@ApiOperation(value="系统配置-通过id删除", notes="系统配置-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		sysConfigurationService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "系统配置-批量删除")
+	@ApiOperation(value="系统配置-批量删除", notes="系统配置-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.sysConfigurationService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "系统配置-通过id查询")
+	@ApiOperation(value="系统配置-通过id查询", notes="系统配置-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<SysConfiguration> queryById(@RequestParam(name="id",required=true) String id) {
+		SysConfiguration sysConfiguration = sysConfigurationService.getById(id);
+		if(sysConfiguration==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(sysConfiguration);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param sysConfiguration
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, SysConfiguration sysConfiguration) {
+        return super.exportXls(request, sysConfiguration, SysConfiguration.class, "系统配置");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, SysConfiguration.class);
+    }
+
+}

jeecg-boot-master/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/sysconfiguration/entity/SysConfiguration.java

@@ -0,0 +1,86 @@
+package org.jeecg.modules.sysconfiguration.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 系统配置
+ * @Author: jeecg-boot
+ * @Date:   2024-08-21
+ * @Version: V1.0
+ */
+@Data
+@TableName("sys_configuration")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="sys_configuration对象", description="系统配置")
+public class SysConfiguration implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+	/**名称*/
+	@Excel(name = "名称", width = 15)
+    @ApiModelProperty(value = "名称")
+    private java.lang.String name;
+	/**logo*/
+	@Excel(name = "logo", width = 15)
+    @ApiModelProperty(value = "logo")
+    private java.lang.String logo;
+	/**新闻首页*/
+	@Excel(name = "新闻首页", width = 15)
+    @ApiModelProperty(value = "新闻首页")
+    private java.lang.String newsPage;
+	/**备案号*/
+	@Excel(name = "备案号", width = 15)
+    @ApiModelProperty(value = "备案号")
+    private java.lang.String recordNumber;
+	/**版权信息*/
+	@Excel(name = "版权信息", width = 15)
+    @ApiModelProperty(value = "版权信息")
+    private java.lang.String copyright;
+	/**比赛证书上传路径*/
+	@Excel(name = "比赛证书上传路径", width = 15)
+    @ApiModelProperty(value = "比赛证书上传路径")
+    private java.lang.String certificate;
+	/**作品上传路径*/
+	@Excel(name = "作品上传路径", width = 15)
+    @ApiModelProperty(value = "作品上传路径")
+    private java.lang.String composition;
+}

jeecg-boot-master/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/sysconfiguration/mapper/SysConfigurationMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.sysconfiguration.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.sysconfiguration.entity.SysConfiguration;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 系统配置
+ * @Author: jeecg-boot
+ * @Date:   2024-08-21
+ * @Version: V1.0
+ */
+public interface SysConfigurationMapper extends BaseMapper<SysConfiguration> {
+
+}

jeecg-boot-master/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/sysconfiguration/mapper/xml/SysConfigurationMapper.xml

@@ -0,0 +1,5 @@
+<?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="org.jeecg.modules.sysconfiguration.mapper.SysConfigurationMapper">
+
+</mapper>

jeecg-boot-master/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/sysconfiguration/service/ISysConfigurationService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.sysconfiguration.service;
+
+import org.jeecg.modules.sysconfiguration.entity.SysConfiguration;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 系统配置
+ * @Author: jeecg-boot
+ * @Date:   2024-08-21
+ * @Version: V1.0
+ */
+public interface ISysConfigurationService extends IService<SysConfiguration> {
+
+}

jeecg-boot-master/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/sysconfiguration/service/impl/SysConfigurationServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.sysconfiguration.service.impl;
+
+import org.jeecg.modules.sysconfiguration.entity.SysConfiguration;
+import org.jeecg.modules.sysconfiguration.mapper.SysConfigurationMapper;
+import org.jeecg.modules.sysconfiguration.service.ISysConfigurationService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 系统配置
+ * @Author: jeecg-boot
+ * @Date:   2024-08-21
+ * @Version: V1.0
+ */
+@Service
+public class SysConfigurationServiceImpl extends ServiceImpl<SysConfigurationMapper, SysConfiguration> implements ISysConfigurationService {
+
+}

jeecg-boot-master/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/CommonController.java

@@ -12,6 +12,8 @@ import org.jeecg.common.util.RestUtil;
 import org.jeecg.common.util.TokenUtils;
 import org.jeecg.common.util.filter.FileTypeFilter;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.sysconfiguration.service.ISysConfigurationService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
@@ -54,6 +56,9 @@ public class CommonController {
     @Value(value="${jeecg.uploadType}")
     private String uploadType;
 
+    @Autowired
+    private ISysConfigurationService sysConfigurationService;
+
     /**
      * @Author 政辉
      * @return
@@ -203,7 +208,12 @@ public class CommonController {
      */
     private String uploadLocalzs(MultipartFile mf,String bizPath){
         try {
-            String ctxPath = uploadpathzs;
+            String ctxPath="";
+            if(sysConfigurationService.list().size()>0){
+                 ctxPath = sysConfigurationService.list().get(0).getCertificate();
+            }else{
+                ctxPath = uploadpathzs;
+            }
             String fileName = null;
             File file = new File(ctxPath + File.separator + bizPath + File.separator );
             if (!file.exists()) {
@@ -400,7 +410,15 @@ public class CommonController {
             if (imgPath.endsWith(SymbolConstant.COMMA)) {
                 imgPath = imgPath.substring(0, imgPath.length() - 1);
             }
-            String filePath = uploadpathzs + File.separator + imgPath;
+
+            String filePath="";
+            if(sysConfigurationService.list().size()>0){
+                filePath = sysConfigurationService.list().get(0).getCertificate() + File.separator + imgPath;
+            }else{
+                filePath = uploadpathzs + File.separator + imgPath;
+            }
+
+
             File file = new File(filePath);
             if(!file.exists()){
                 response.setStatus(404);

jeecgboot-vue3-master/src/components/Form/src/jeecg/components/JImageUploadzs.vue

@@ -65,7 +65,7 @@
       bizPath: {
         type: String,
         required: false,
-        default: 'temp',
+        default: '',
       },
       //是否禁用
       disabled: {