fzzy-igdss-core/pom.xml

@@ -6,7 +6,7 @@

    <groupId>com.fzzy</groupId>
    <artifactId>fzzy-igdss-core</artifactId>
    <version>${fzzy-igdss.version}</version>
    <version>${fzzy.igdss.version}</version>

    <parent>
        <artifactId>fzzy-igdss-parent</artifactId>
@@ -26,14 +26,32 @@
        <dependency>
            <groupId>com.fzzy</groupId>
            <artifactId>fzzy-framework</artifactId>
            <version>4.7.8</version>
            <version>${fzzy.frame.version}</version>
        </dependency>

        <!--定时任务-->
        <dependency>
            <groupId>com.fzzy</groupId>
            <artifactId>fzzy-quartz</artifactId>
            <version>4.7.8</version>
            <version>${fzzy.frame.version}</version>
        </dependency>

        <dependency>
            <groupId>net.sf.ehcache</groupId>
            <artifactId>ehcache-core</artifactId>
            <version>2.6.3</version>
        </dependency>

        <dependency>
            <groupId>org.codehaus.jackson</groupId>
            <artifactId>jackson-mapper-asl</artifactId>
            <version>1.9.11</version>
        </dependency>

        <dependency>
            <groupId>org.apache.velocity</groupId>
            <artifactId>velocity</artifactId>
            <version>1.7</version>
        </dependency>

    </dependencies>

 fzzy-igdss-core/src/main/java/com/fzzy/igds/config/MyBatisPlusConfig.java

@@ -1,4 +1,4 @@
package com.fzzy.eoms.config;
package com.fzzy.igds.config;

import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;

 fzzy-igdss-core/src/main/java/com/fzzy/igds/data/BaseResp.java

@@ -1,4 +1,4 @@
package com.fzzy.eoms.data;
package com.fzzy.igds.data;

import lombok.Data;


 fzzy-igdss-core/src/main/java/com/fzzy/igds/data/ConfigData.java

ÎļþÒÑɾ³ý

 fzzy-igdss-core/src/main/java/com/fzzy/igds/data/FileData.java

@@ -1,4 +1,4 @@
package com.fzzy.eoms.data;
package com.fzzy.igds.data;

import lombok.Data;


 fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Bank.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,38 @@
package com.fzzy.igds.domain;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;

/**
 * é“¶è¡Œä¿¡æ¯
 */
@Data
@Entity
@Table(name = "t_bank")
@TableName("t_bank")
public class Bank extends BizBaseEntity implements Serializable {

    @Id
    @Column(name = "id", columnDefinition = "varchar(40) COMMENT '银行ID'")
    @TableField("id")
    private String id;

    @Column(name = "name", columnDefinition = "varchar(20) COMMENT '银行名称'")
    @TableField("name")
    private String name;

    @Column(name = "status", columnDefinition = "varchar(2) COMMENT '状态'")
    @TableField("status")
    private String status;

    @Column(name = "remark", columnDefinition = "varchar(100) COMMENT '备注说明'")
    @TableField("remark")
    private String remark;
}

 fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/BizBaseEntity.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,50 @@
package com.fzzy.igds.domain;

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.Data;

import javax.persistence.*;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;

/**
 *
 * @author sgj
 * @date 2025/7/8
 */
@Data
@MappedSuperclass // æ ‡è¯†ä¸ºå¯è¢«ç»§æ‰¿çš„实体基类
public abstract class BizBaseEntity {

    /** ç»„织编码 */
    @Column(name = "company_id", columnDefinition = "VARCHAR(20) COMMENT '组织编码'", nullable = false)
    @TableField("company_id")
    private String companyId;

    /** åˆ›å»ºäºº */
    @Column(name = "create_by", columnDefinition = "VARCHAR(100) COMMENT '创建人'", nullable = false)
    @TableField("create_by")
    private String createBy;

    /** åˆ›å»ºæ—¶é—´ */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @Column(name = "create_time", columnDefinition = "DATETIME COMMENT '创建时间'", nullable = false)
    @Temporal(TemporalType.TIMESTAMP)
    @TableField("create_time")
    private Date createTime;

    /** æ›´æ–°äºº */
    @Column(name = "update_by", columnDefinition = "VARCHAR(100) COMMENT '更新人'")
    @TableField("update_by")
    private String updateBy;

    /** æ›´æ–°æ—¶é—´ */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @Column(name = "update_time", columnDefinition = "DATETIME COMMENT '更新时间'")
    @Temporal(TemporalType.TIMESTAMP)
    @TableField("update_time")
    private Date updateTime;
}

 fzzy-igdss-core/src/main/java/com/fzzy/igds/file/CoreFileService.java

ÎļþÒÑɾ³ý

 fzzy-igdss-core/src/main/java/com/fzzy/igds/file/CoreFileServiceImpl.java

ÎļþÒÑɾ³ý

 fzzy-igdss-core/src/main/java/com/fzzy/igds/file/controller/FileController.java

ÎļþÒÑɾ³ý

 fzzy-igdss-core/src/main/java/com/fzzy/igds/file/mapper/FileServiceMapper.java

ÎļþÒÑɾ³ý

 fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java

@@ -1,9 +1,8 @@
package com.fzzy.eoms.utils;

import com.fzzy.eoms.data.ConfigData;
import com.ruoyi.common.config.FrameworkConfig;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.ShiroUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import org.apache.commons.lang3.RandomUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
@@ -135,8 +134,7 @@
        if (null != user) {
            return user.getCompanyId();
        } else {
            ConfigData configData = SpringUtils.getBean(ConfigData.class);
            return configData.getDefaultCompanyId();
           return FrameworkConfig.getCompanyId();
        }
    }


 fzzy-igdss-doc/pom.xml

@@ -6,7 +6,7 @@

    <groupId>com.fzzy</groupId>
    <artifactId>fzzy-igdss-doc</artifactId>
    <version>${fzzy-igdss.version}</version>
    <version>${fzzy.igdss.version}</version>
    <packaging>pom</packaging>

    <!-- ç”¨äºŽå­˜æ”¾é¡¹ç›®å„种档案库模板文件 -->

 fzzy-igdss-parent/pom.xml

@@ -9,7 +9,7 @@
    <packaging>pom</packaging>

    <properties>
        <fzzy-igdss.version>2.0.0</fzzy-igdss.version>
        <fzzy.igdss.version>2.0.0</fzzy.igdss.version>
        <fzzy.frame.version>4.7.8</fzzy.frame.version>
        <spring.boot.version>2.5.15</spring.boot.version>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -62,10 +62,10 @@
            <!--            </releases>-->
        </repository>

        <repository>
<!--        <repository>
            <id>bsdn-maven-repository</id>
            <url>http://nexus.bsdn.org/content/groups/public/</url>
        </repository>
        </repository>-->

    </repositories>


 fzzy-igdss-view/pom.xml

@@ -6,7 +6,7 @@

    <groupId>com.fzzy</groupId>
    <artifactId>fzzy-igdss-view</artifactId>
    <version>${fzzy-igdss.version}</version>
    <version>${fzzy.igdss.version}</version>

    <parent>
        <artifactId>fzzy-igdss-parent</artifactId>
@@ -21,6 +21,12 @@
    </description>

    <dependencies>

        <dependency>
            <groupId>com.fzzy</groupId>
            <artifactId>fzzy-igdss-core</artifactId>
            <version>${fzzy.igdss.version}</version>
        </dependency>

        <!--引入cglib避免与shiro-redis冲突 -->
        <dependency>
@@ -89,11 +95,17 @@
                </exclusion>
            </exclusions>
        </dependency>
        <dependency>

<!--        <dependency>
            <groupId>commons-lang</groupId>
            <artifactId>commons-lang</artifactId>
            <version>2.4</version>
            <scope>compile</scope>
            <version>2.6</version>
        </dependency>-->

        <dependency>
            <groupId>org.apache.commons</groupId>
            <artifactId>commons-jexl</artifactId>
            <version>2.1.1</version>
        </dependency>

    </dependencies>
@@ -121,8 +133,8 @@

    <repositories>
        <repository>
            <id>bsdn-repository</id>
            <url>http://nexus.bsdn.org/content/groups/public/</url>
            <id>aliyunmaven</id>
            <url>https://maven.aliyun.com/repository/public</url>
            <releases>
                <enabled>true</enabled>
            </releases>

 fzzy-igdss-view/src/main/java/com/fzzy/d7/DoradoConfigure.java

@@ -1,7 +1,6 @@
package com.fzzy.d7;

import com.bstek.dorado.web.servlet.DoradoServlet;

import org.springframework.boot.web.servlet.ServletRegistrationBean;
import org.springframework.context.annotation.Bean;


 fzzy-igdss-view/src/main/java/models/eoms.model.xml

ÎļþÒÑɾ³ý

 fzzy-igdss-web/pom.xml

@@ -33,7 +33,7 @@
        <dependency>
            <groupId>com.fzzy</groupId>
            <artifactId>fzzy-igdss-core</artifactId>
            <version>${fzzy-igdss.version}</version>
            <version>${fzzy.igdss.version}</version>
        </dependency>
        
        <!-- -->
@@ -47,7 +47,7 @@
        <dependency>
            <groupId>com.fzzy</groupId>
            <artifactId>fzzy-igdss-view</artifactId>
            <version>${fzzy-igdss.version}</version>
            <version>${fzzy.igdss.version}</version>
        </dependency>
        
        <!-- d7皮肤包 -->

 fzzy-igdss-web/src/main/java/com/bstek/dorado/web/loader/DoradoLoader.java

@@ -28,8 +28,8 @@

import org.apache.commons.jexl2.JexlContext;
import org.apache.commons.jexl2.MapContext;
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.context.ConfigurableApplicationContext;

 fzzy-igdss-web/src/main/java/com/fzzy/Application.java

@@ -35,7 +35,6 @@

        System.setProperty("spring.devtools.restart.enabled", "false");


        System.setProperty("doradoHome", "classpath:dorado-home/");

        SpringApplication app = new SpringApplication(Application.class);

 fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysIndexController.java

@@ -14,11 +14,11 @@
import com.ruoyi.framework.shiro.service.SysPasswordService;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysMenuService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
@@ -28,15 +28,14 @@
/**
 * é¦–页 ä¸šåŠ¡å¤„理
 *
 * @author ruoyi
 */
@Controller
public class SysIndexController extends BaseController {
    @Autowired
    @Resource
    private ISysMenuService menuService;
    @Autowired
    @Resource
    private ISysConfigService configService;
    @Autowired
    @Resource
    private SysPasswordService passwordService;

    // ç³»ç»Ÿé¦–页
@@ -46,6 +45,7 @@
        // å–身份信息
        SysUser user = getSysUser();
        mmap.put("user", user);
        mmap.put("sysName", FrameworkConfig.getName());

        // æ ¹æ®ç”¨æˆ·id取出菜单
        List<SysMenu> menus = menuService.selectMenusByUser(user);

 fzzy-igdss-web/src/main/resources/application-dev.yml

@@ -6,7 +6,7 @@
    druid:
      # ä¸»åº“数据源
      master:
        url: jdbc:mysql://192.168.1.91:3306/fzzy_igdss_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        url: jdbc:mysql://192.168.1.91:3306/igdss_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        username: root
        password: ENC(54r4E0zmacpDLmIdPXh3tlJVT+8nvaqG)
      # ä»Žåº“数据源

 fzzy-igdss-web/src/main/resources/application.yml

@@ -81,7 +81,7 @@
framework:
  companyId: "1000"
  # åç§°
  name: fzzy-igdss
  name: æ™ºæ…§ç²®åº“监管系统
  # ç‰ˆæœ¬
  version: v2.0.0
  # ç‰ˆæƒå¹´ä»½

 fzzy-igdss-web/src/main/resources/templates/index-topnav.html

@@ -4,7 +4,7 @@
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <meta name="renderer" content="webkit">
    <title>设备动态感知运维管理系统</title>
    <title th:text="${sysName}">智慧粮库管理系统</title>
    <!-- é¿å…IE使用兼容模式 -->
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <link th:href="@{favicon.ico}" rel="shortcut icon"/>
@@ -27,7 +27,7 @@
        </div>
        <a th:href="@{/index}">
            <li class="logo hidden-xs">
                <span class="logo-lg">设备动态感知运维管理系统</span>
                <span class="logo-lg" th:text="${sysName}">智慧粮库管理系统</span>
            </li>
         </a>
        <div class="sidebar-collapse tab-content" id="side-menu">

 fzzy-igdss-web/src/main/resources/templates/index.html

@@ -4,7 +4,7 @@
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <meta name="renderer" content="webkit">
    <title>智慧粮库-设备动态感知运维管理系统</title>
    <title th:text="${sysName}">智慧粮库管理系统</title>
    <!-- é¿å…IE使用兼容模式 -->
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <link th:href="@{favicon.ico}" rel="shortcut icon"/>
@@ -27,7 +27,7 @@
        </div>
        <a th:href="@{/index}">
            <li class="logo hidden-xs">
                <span class="logo-lg">设备动态感知运维管理系统</span>
                <span class="logo-lg" th:text="${sysName}">智慧粮库管理系统</span>
            </li>
        </a>
        <div class="sidebar-collapse">

 fzzy-igdss-web/src/main/resources/templates/lock.html

@@ -4,7 +4,7 @@
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <!--360浏览器优先以webkit内核解析-->
    <title>锁定屏幕</title>
    <title th:text="${sysName}">智慧粮库管理系统</title>
    <link th:href="@{favicon.ico}" rel="shortcut icon"/>
    <link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
    <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>

 fzzy-igdss-web/src/main/resources/templates/login.html

@@ -3,7 +3,7 @@
<head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
    <title>登录若依系统</title>
    <title th:text="${sysName}">智慧粮库管理系统</title>
    <meta name="description" content="若依后台管理框架">
    <link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
    <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>

 fzzy-igdss-web/src/main/resources/templates/login_new.html

@@ -10,9 +10,7 @@
    <meta name="viewport" content="user-scalable=no, width=device-width" />
    <meta content="telephone=no" name="format-detection" />
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>智慧粮库管理系统-登录</title>
    <meta name="description" content="智慧粮库管理系统-登录">
    <meta name="keywords" content="智慧粮库管理系统-登录">
    <title th:text="${sysName}">智慧粮库管理系统</title>

    <link href="../static/axui/css/ax.css" th:href="@{/axui/css/ax.css}" rel="stylesheet"/>
    <link href="../static/axui/css/ax-response.css" th:href="@{/axui/css/ax-response.css}" rel="stylesheet"/>

 fzzy-igdss-web/src/main/resources/templates/main.html

@@ -4,7 +4,7 @@
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <!--360浏览器优先以webkit内核解析-->
    <title>若依介绍</title>
    <title th:text="${sysName}">智慧粮库管理系统</title>
    <link rel="shortcut icon" href="favicon.ico">
    <link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
    <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>

 fzzy-igdss-web/src/main/resources/templates/main_v1.html

@@ -3,7 +3,7 @@
<head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>统计</title>
    <title>智慧粮库管理系统</title>
    <link rel="shortcut icon" href="favicon.ico">
    <link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
    <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>

 fzzy-igdss-web/src/main/resources/templates/main_v2.html

@@ -4,7 +4,7 @@
    <meta charset="utf-8"/>
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <title>控制台</title>
    <title>智慧粮库管理系统</title>
    <link rel="stylesheet" th:href="@{/ajax/libs/layui/css/layui.css}"/>
<!--    <link rel="stylesheet" href="${ctxPath}/assets/module/admin.css">-->
    <!--[if lt IE 9]>

 fzzy-igdss-web/src/main/resources/templates/main_v3.html

@@ -4,7 +4,7 @@
    <meta charset="utf-8"/>
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <title>工作台</title>
    <title>智慧粮库管理系统</title>
    <link rel="stylesheet" href="/plugins/layui/css/layui.css" th:href="@{/plugins/layui/css/layui.css}"/>

<!--    <link rel="stylesheet" href="${ctxPath}/assets/module/admin.css">-->

 fzzy-igdss-web/src/main/resources/templates/register.html

@@ -3,8 +3,8 @@
<head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
    <title>注册若依系统</title>
    <meta name="description" content="若依后台管理框架">
    <title>智慧粮库管理系统</title>
    <meta name="description" content="智慧粮库管理系统">
    <link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
    <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
    <link href="../static/css/style.min.css" th:href="@{/css/style.min.css}" rel="stylesheet"/>

 fzzy-igdss-web/src/main/resources/templates/system/user/add.html

@@ -122,6 +122,32 @@
                </div>

            </div>

            <!--新增字段 -->
            <div class="row">
                <div class="col-sm-6">
                    <div class="form-group">
                        <label class="col-sm-4 control-label">用户类型：</label>
                        <div class="col-sm-8">
                            <select name="type" class="form-control m-b" th:with="type=${@dict.getType('sys_user_type')}">
                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                            </select>
                        </div>
                    </div>
                </div>

                <div class="col-sm-6">
                    <div class="form-group">
                        <label class="col-sm-4 control-label">所属银行：</label>
                        <div class="col-sm-8">
                            <input id="userData" name="userData" placeholder="用户类型=资方，选择所属银行" class="form-control" type="text" maxlength="30">
                        </div>
                    </div>
                </div>

            </div>
            <!--新增字段结束 -->

            <div class="row">
                <div class="col-sm-12">
                    <div class="form-group">

 fzzy-igdss-web/src/main/resources/templates/system/user/edit.html

@@ -120,6 +120,36 @@
                </div>

            </div>


            <!--新增字段 -->
            <div class="row">
                <div class="col-sm-6">
                    <div class="form-group">
                        <label class="col-sm-4 control-label">用户类型：</label>
                        <div class="col-sm-8">
                            <select name="type" class="form-control m-b" th:with="type=${@dict.getType('sys_user_type')}">
                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{type}"></option>
                            </select>
                        </div>
                    </div>
                </div>

                <div class="col-sm-6">
                    <div class="form-group">
                        <label class="col-sm-4 control-label">所属银行：</label>
                        <div class="col-sm-8">
                            <select id="userData" class="form-control select2-multiple" multiple>
                                <option th:each="post:${posts}" th:value="${post.postId}" th:text="${post.postName}" th:selected="${post.flag}" th:disabled="${post.status == '1'}"></option>
                            </select>
                        </div>
                    </div>
                </div>

            </div>
            <!--新增字段结束 -->


            <h4 class="form-header h4">其他信息</h4>
            <div class="row">
                <div class="col-sm-12">

 pom.xml

@@ -20,4 +20,21 @@
        <module>fzzy-igdss-doc</module>
    </modules>


    <build>
        <plugins>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
                <version>3.1</version>
                <configuration>
                    <source>1.8</source>
                    <target>1.8</target>
                    <encoding>UTF-8</encoding>
                </configuration>
            </plugin>
        </plugins>
    </build>


</project>