523096025 преди 1 година
родител
ревизия
1aa65abb78

+ 8 - 1
snowy-web-app/pom.xml

@@ -10,7 +10,8 @@
         <version>2.0.0</version>
     </parent>
 
-    <artifactId>snowy-web-app</artifactId>
+<!--    <artifactId>snowy-web-app</artifactId>-->
+    <artifactId>huimv-farm</artifactId>
     <packaging>jar</packaging>
     <description>主启动模块</description>
 
@@ -31,6 +32,12 @@
             <scope>test</scope>
         </dependency>
 
+<!--        <dependency>-->
+<!--            <groupId>org.yaml</groupId>-->
+<!--            <artifactId>snakeyaml</artifactId>-->
+<!--            <version>2.2</version>-->
+<!--        </dependency>-->
+
         <!-- dynamic-datasource -->
         <dependency>
             <groupId>com.baomidou</groupId>

+ 0 - 8
snowy-web-app/src/main/java/vip/xiaonuo/modular/base/pigFarm/service/impl/PigFarmServiceImpl.java

@@ -12,28 +12,20 @@
  */
 package vip.xiaonuo.modular.base.pigFarm.service.impl;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollStreamUtil;
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
-import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
 import vip.xiaonuo.biz.modular.org.mapper.BizOrgMapper;
-import vip.xiaonuo.common.enums.CommonSortOrderEnum;
 import vip.xiaonuo.common.exception.CommonException;
-import vip.xiaonuo.common.page.CommonPageRequest;
 import vip.xiaonuo.common.util.UploadImage;
 import vip.xiaonuo.core.param.OrgIdParam;
 import vip.xiaonuo.modular.base.pigFarm.entity.PigFarm;
 import vip.xiaonuo.modular.base.pigFarm.mapper.PigFarmMapper;
-import vip.xiaonuo.modular.base.pigFarm.param.PigFarmAddParam;
-import vip.xiaonuo.modular.base.pigFarm.param.PigFarmEditParam;
 import vip.xiaonuo.modular.base.pigFarm.param.PigFarmIdParam;
 import vip.xiaonuo.modular.base.pigFarm.service.PigFarmService;
 

+ 0 - 34
snowy-web-app/src/main/java/vip/xiaonuo/modular/energy/energyThreshold/enums/EnergyThresholdEnum.java

@@ -1,34 +0,0 @@
-/*
- * Copyright [2022] [https://www.xiaonuo.vip]
- *
- * Snowy采用APACHE LICENSE 2.0开源协议,您在使用过程中,需要注意以下几点:
- *
- * 1.请不要删除和修改根目录下的LICENSE文件。
- * 2.请不要删除和修改Snowy源码头部的版权声明。
- * 3.本项目代码可免费商业使用,商业使用请保留源码和相关描述文件的项目出处,作者声明等。
- * 4.分发源码时候,请注明软件出处 https://www.xiaonuo.vip
- * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
- * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
- */
-package vip.xiaonuo.modular.energy.energyThreshold.enums;
-
-import lombok.Getter;
-
-/**
- * 能耗阈值枚举
- *
- * @author newspaper
- * @date  2023/12/26 09:32
- **/
-@Getter
-public enum EnergyThresholdEnum {
-
-    /** 测试 */
-    TEST("TEST");
-
-    private final String value;
-
-    EnergyThresholdEnum(String value) {
-        this.value = value;
-    }
-}

+ 190 - 0
snowy-web-app/src/main/resources/application-test.properties

@@ -0,0 +1,190 @@
+#########################################
+# server configuration
+#########################################
+server.port=84
+
+#########################################
+# spring profiles configuration
+#########################################
+#spring.profiles.active=local
+#spring.profiles.active=test
+#spring.profiles.active=prod
+
+#########################################
+# multipart configurationapplication
+#########################################
+spring.servlet.multipart.max-request-size=100MB
+spring.servlet.multipart.max-file-size=100MB
+
+#########################################
+# datasource configuration
+#########################################
+
+# mysql
+spring.datasource.dynamic.datasource.master.driver-class-name=com.mysql.cj.jdbc.Driver
+#spring.datasource.dynamic.datasource.master.url=jdbc:mysql://localhost:3306/snowy?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&useInformationSchema=true
+spring.datasource.dynamic.datasource.master.url=jdbc:mysql://122.112.219.87:3306/huimv_farm?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&useInformationSchema=true
+spring.datasource.dynamic.datasource.master.username=root
+spring.datasource.dynamic.datasource.master.password=?root@huimv_farm!
+spring.datasource.dynamic.strict=true
+
+# postgres
+#spring.datasource.dynamic.datasource.master.driver-class-name=org.postgresql.Driver
+#spring.datasource.dynamic.datasource.master.url=jdbc:postgresql://localhost:5432/snowy
+#spring.datasource.dynamic.datasource.master.username=postgres
+#spring.datasource.dynamic.datasource.master.password=123456
+#spring.datasource.dynamic.strict=true
+
+# oracle
+#spring.datasource.dynamic.datasource.master.driver-class-name=oracle.jdbc.driver.OracleDriver
+#spring.datasource.dynamic.datasource.master.url=jdbc:oracle:thin:@//127.0.0.1:1521/XE?remarksReporting=true
+#spring.datasource.dynamic.datasource.master.username=SNOWY
+#spring.datasource.dynamic.datasource.master.password=12345678
+#spring.datasource.dynamic.strict=true
+
+# mssql
+#spring.datasource.dynamic.datasource.master.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver
+#spring.datasource.dynamic.datasource.master.url=jdbc:sqlserver://localhost:1433;DatabaseName=SNOWY
+#spring.datasource.dynamic.datasource.master.username=sa
+#spring.datasource.dynamic.datasource.master.password=123456
+#spring.datasource.dynamic.strict=true
+
+# dm database
+#spring.datasource.dynamic.datasource.master.driver-class-name=dm.jdbc.driver.DmDriver
+#spring.datasource.dynamic.datasource.master.url=jdbc:dm://localhost:5236/SYSDBA
+#spring.datasource.dynamic.datasource.master.username=SYSDBA
+#spring.datasource.dynamic.datasource.master.password=SYSDBA
+#spring.datasource.dynamic.strict=true
+
+# kingbase database
+#spring.datasource.dynamic.datasource.master.driver-class-name=com.kingbase8.Driver
+#spring.datasource.dynamic.datasource.master.url=jdbc:kingbase8://localhost:54321/snowy
+#spring.datasource.dynamic.datasource.master.username=SYSTEM
+#spring.datasource.dynamic.datasource.master.password=123456
+#spring.datasource.dynamic.strict=true
+
+# druid monitor configuration
+spring.datasource.druid.stat-view-servlet.enabled=true
+spring.datasource.druid.stat-view-servlet.login-username=admin
+spring.datasource.druid.stat-view-servlet.login-password=123456
+
+# druid global configuration
+spring.datasource.dynamic.public-key=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMWiTVtdXFVrgFHDDKELZM0SywkWY3KjugN90eY5Sogon1j8Y0ClPF7nx3FuE7pAeBKiv7ChIS0vvx/59WUpKmUCAwEAAQ==
+spring.datasource.dynamic.druid.initial-size=5
+spring.datasource.dynamic.druid.max-active=20
+spring.datasource.dynamic.druid.min-idle=5
+spring.datasource.dynamic.druid.max-wait=60000
+spring.datasource.dynamic.druid.pool-prepared-statements=true
+spring.datasource.dynamic.druid.max-pool-prepared-statement-per-connection-size=20
+spring.datasource.dynamic.druid.validation-query-timeout=2000
+spring.datasource.dynamic.druid.test-on-borrow=false
+spring.datasource.dynamic.druid.test-on-return=false
+spring.datasource.dynamic.druid.test-while-idle=true
+spring.datasource.dynamic.druid.time-between-eviction-runs-millis=60000
+spring.datasource.dynamic.druid.min-evictable-idle-time-millis=300000
+spring.datasource.dynamic.druid.filters=stat
+spring.datasource.dynamic.druid.break-after-acquire-failure=false
+
+#########################################
+# jackson configuration
+#########################################
+spring.jackson.time-zone=GMT+8
+spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
+spring.jackson.locale=zh_CN
+
+#########################################
+# redis configuration
+#########################################
+spring.redis.database=1
+spring.redis.host=122.112.224.199
+spring.redis.port=6379
+spring.redis.password=hm123456
+spring.redis.timeout=10s
+
+spring.redis.lettuce.pool.max-active=200
+spring.redis.lettuce.pool.max-wait=-1ms
+spring.redis.lettuce.pool.max-idle=10
+spring.redis.lettuce.pool.min-idle=0
+
+#########################################
+# mybatis-plus configuration
+#########################################
+mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
+mybatis-plus.configuration.jdbc-type-for-null=null
+mybatis-plus.global-config.banner=false
+mybatis-plus.global-config.enable-sql-runner=true
+mybatis-plus.global-config.db-config.id-type=ASSIGN_ID
+mybatis-plus.global-config.db-config.logic-delete-field=DELETE_FLAG
+mybatis-plus.global-config.db-config.logic-delete-value=DELETED
+mybatis-plus.global-config.db-config.logic-not-delete-value=NOT_DELETE
+mybatis-plus.mapper-locations=classpath*:vip/xiaonuo/**/mapping/*.xml
+mybatis-plus.type-handlers-package=vip.xiaonuo.common.handler
+
+#########################################
+# easy-trans configuration
+#########################################
+easy-trans.is-enable-redis=true
+easy-trans.is-enable-global=true
+easy-trans.is-enable-tile=true
+
+#########################################
+# sa-token configuration
+#########################################
+sa-token.token-name=token
+sa-token.timeout=2592000
+sa-token.activity-timeout=-1
+sa-token.is-concurrent=true
+sa-token.is-share=false
+sa-token.max-login-count=-1
+sa-token.token-style=random-32
+sa-token.is-log=false
+sa-token.is-print=false
+
+# sa-token alone-redis configuration
+sa-token.alone-redis.database=2
+sa-token.alone-redis.host=${spring.redis.host}
+sa-token.alone-redis.port=${spring.redis.port}
+sa-token.alone-redis.password=${spring.redis.password}
+sa-token.alone-redis.timeout=${spring.redis.timeout}
+sa-token.alone-redis.lettuce.pool.max-active=${spring.redis.lettuce.pool.max-active}
+sa-token.alone-redis.lettuce.pool.max-wait=${spring.redis.lettuce.pool.max-wait}
+sa-token.alone-redis.lettuce.pool.max-idle=${spring.redis.lettuce.pool.max-idle}
+sa-token.alone-redis.lettuce.pool.min-idle=${spring.redis.lettuce.pool.min-idle}
+
+#########################################
+# knife4j configuration
+#########################################
+knife4j.enable=true
+knife4j.production=false
+knife4j.basic.enable=true
+knife4j.basic.username=admin
+knife4j.basic.password=123456
+knife4j.setting.enableOpenApi=false
+knife4j.setting.enableSwaggerModels=false
+knife4j.setting.enableFooter=false
+knife4j.setting.enableFooterCustom=true
+knife4j.setting.footerCustomContent=Apache License 2.0 | Copyright 2022-[SNOWY](https://www.xiaonuo.vip)
+
+#########################################
+# snowy configuration
+#########################################
+
+# common configuration
+snowy.config.common.front-url=http://localhost:81
+snowy.config.common.backend-url=http://localhost:82
+
+
+img.url=https://img.ifarmcloud.com/images/
+img.basePath=/home/huimv/img/
+img.ip=119.3.44.183
+img.user=huimv
+img.password=!hm123@1
+img.port=22
+
+#img:
+#url: https://img.ifarmcloud.com/images/
+#basePath: /home/huimv/img/
+#ip: 139.9.172.209
+#user:  huimv
+#password: "!hm123@1"
+#port: 22

+ 3 - 3
snowy-web-app/src/main/resources/application.properties

@@ -6,12 +6,12 @@ server.port=82
 #########################################
 # spring profiles configuration
 #########################################
-spring.profiles.active=local
-#spring.profiles.active=test
+#spring.profiles.active=local
+spring.profiles.active=test
 #spring.profiles.active=prod
 
 #########################################
-# multipart configuration
+# multipart configurationapplication
 #########################################
 spring.servlet.multipart.max-request-size=100MB
 spring.servlet.multipart.max-file-size=100MB