增加首页数据录入

web/runeconomy-xk/pom.xml

@@ -12,6 +12,13 @@
     <artifactId>runeconomy-xk</artifactId>
 
     <dependencies>
+
+        <!-- 工具类相关 -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>easyexcel</artifactId>
+            <version>3.2.0</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -105,6 +112,7 @@
             <version>1.5.21</version>
         </dependency>
 
+
     </dependencies>
     <build>
         <plugins>

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/config/GeneratorCodeConfig.java

@@ -39,7 +39,8 @@ public class GeneratorCodeConfig {
         // 全局配置
         GlobalConfig gc = new GlobalConfig();
         String projectPath = System.getProperty("user.dir");
-        gc.setOutputDir("D:\\work\\workspaces\\sis\\web\\runeconomy-xk\\src\\main\\java");
+//        gc.setOutputDir("D:\\work\\workspaces\\sis\\web\\runeconomy-xk\\src\\main\\java");
+        gc.setOutputDir("E:\\idea_workspace\\sis\\web\\runeconomy-xk\\src\\main\\java");
         gc.setAuthor("wang");
         gc.setOpen(false);
         //实体属性 Swagger2 注解
@@ -61,7 +62,7 @@ public class GeneratorCodeConfig {
         dsc.setDriverName("org.postgresql.Driver");
         dsc.setUsername("postgres");
         dsc.setPassword("gd123");
-        dsc.setUrl("jdbc:postgresql://124.70.75.91:5432/jn_test");
+        dsc.setUrl("jdbc:postgresql://127.0.0.1:5432/IMS_NEM_JN");
 
         mpg.setDataSource(dsc);
 

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/update/TargetdataFristController.java

@@ -0,0 +1,113 @@
+package com.gyee.runeconomy.controller.update;
+
+import com.gyee.common.model.StringUtils;
+import com.gyee.runeconomy.dto.R;
+import com.gyee.runeconomy.dto.ResultMsg;
+import com.gyee.runeconomy.model.auto.ProEconTargetdataFrist;
+import com.gyee.runeconomy.service.update.TargetdataFristService;
+import com.gyee.runeconomy.util.DateUtils;
+import com.gyee.runeconomy.util.ExcelUtils;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+@RestController
+@RequestMapping("//enterFrist")
+public class TargetdataFristController {
+    @Resource
+    private TargetdataFristService targetdataFristService;
+
+
+
+
+    @PostMapping(value = "/save")
+    @ApiOperation(value = "增", notes = "增")
+    public R save(@RequestBody ProEconTargetdataFrist data) {
+        boolean b = targetdataFristService.save(data);
+        if (b) {
+            return R.data(ResultMsg.ok(b));
+        } else {
+            return R.error(ResultMsg.error());
+        }
+    }
+
+
+    @PutMapping(value = "/update")
+    @ApiOperation(value = "改", notes = "改")
+    public R update(@RequestBody ProEconTargetdataFrist data) {
+        boolean b = targetdataFristService.update(data);
+        if (b) {
+            return R.data(ResultMsg.ok(b));
+        } else {
+            return R.error(ResultMsg.error());
+        }
+    }
+
+    @DeleteMapping(value = "/delete/{id}")
+    @ApiOperation(value = "删", notes = "删")
+    public R delete(@PathVariable String id) {
+        boolean b = targetdataFristService.delete(id);
+        if (b) {
+            return R.data(ResultMsg.ok(b));
+        } else {
+            return R.error(ResultMsg.error());
+        }
+    }
+
+    @GetMapping(value = "/get")
+    @ApiOperation(value = "查", notes = "查")
+    public R get(
+                 @RequestParam(value = "date", required = true) String date) {
+        List<ProEconTargetdataFrist> resultList  = targetdataFristService.get(date);
+        if (StringUtils.isNotNull(resultList)) {
+            return R.data(ResultMsg.ok(resultList));
+        } else {
+            return R.error(ResultMsg.error());
+        }
+    }
+
+    @GetMapping("/get-import-template")
+    @ApiOperation(value = "获得导入模板")
+    public void importTemplate(HttpServletResponse response) throws IOException {
+        // 手动创建导出 demo
+        List<ProEconTargetdataFrist> list = Arrays.asList(
+                ProEconTargetdataFrist.builder().id("").name("风电").type("FD").rfdl(1.0).yfdl(2.0).nfdl(3.0).recordDate(DateUtils.truncate(new Date())).build(),
+
+                ProEconTargetdataFrist.builder().id("").name("光伏").type("GF").rfdl(1.0).yfdl(2.0).nfdl(3.0).recordDate(DateUtils.truncate(new Date())).build()
+
+                );
+
+        // 输出
+        ExcelUtils.write(response, "导入模板.xls", "导入模板", ProEconTargetdataFrist.class, list);
+    }
+
+    @PostMapping("/import")
+    @ApiOperation(value = "导入",notes = "导入")
+    public R importExcel(@RequestParam("file") MultipartFile file) throws Exception {
+        List<ProEconTargetdataFrist> list = ExcelUtils.read(file, ProEconTargetdataFrist.class);
+
+        if(StringUtils.notEmp(list) && list.isEmpty())
+        {
+            for(ProEconTargetdataFrist vo:list)
+            {
+                vo.setId(StringUtils.getUUID());
+                vo.setOperationTime(new Date());
+                targetdataFristService.save(vo);
+            }
+        }
+        if (StringUtils.isNotNull(list)) {
+            return R.data(ResultMsg.ok(list));
+        } else {
+            return R.error(ResultMsg.error());
+        }
+    }
+
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/update/TargetdataFristService.java

@@ -0,0 +1,52 @@
+package com.gyee.runeconomy.service.update;/*
+@author   谢生杰
+@date   2023/5/16-10:10
+*/
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.common.util.CommonUtils;
+import com.gyee.runeconomy.model.auto.ProEconTargetdataFrist;
+import com.gyee.runeconomy.service.auto.IProEconTargetdataFristService;
+import com.gyee.runeconomy.util.DateUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class TargetdataFristService {
+
+    @Resource
+    private IProEconTargetdataFristService proEconTargetdataFristService;
+
+
+
+    public boolean save(ProEconTargetdataFrist data) {
+        data.setId(CommonUtils.getUUID());
+        return proEconTargetdataFristService.save(data);
+    }
+
+    public boolean update(ProEconTargetdataFrist data) {
+        return proEconTargetdataFristService.saveOrUpdate(data);
+    }
+
+    public boolean delete(String ids) {
+        String[] split = ids.split(",");
+        List<String> list = Arrays.asList(split);
+        return proEconTargetdataFristService.removeByIds(list);
+    }
+
+    public List<ProEconTargetdataFrist> get( String date) {
+        Date date1 = DateUtils.pareDateNoHours(date);
+        QueryWrapper<ProEconTargetdataFrist> query = new QueryWrapper<>();
+
+        query.lambda().eq(ProEconTargetdataFrist::getRecordDate,date1);
+
+        List<ProEconTargetdataFrist> list = proEconTargetdataFristService.list(query);
+        return list;
+    }
+
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/util/ExcelUtils.java

@@ -0,0 +1,48 @@
+package com.gyee.runeconomy.util;
+
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.util.List;
+
+/**
+ * Excel 工具类
+ *
+ * @author 芋道源码
+ */
+public class ExcelUtils {
+
+    /**
+     * 将列表以 Excel 响应给前端
+     *
+     * @param response 响应
+     * @param filename 文件名
+     * @param sheetName Excel sheet 名
+     * @param head Excel head 头
+     * @param data 数据列表哦
+     * @param <T> 泛型，保证 head 和 data 类型的一致性
+     * @throws IOException 写入失败的情况
+     */
+    public static <T> void write(HttpServletResponse response, String filename, String sheetName,
+                                 Class<T> head, List<T> data) throws IOException {
+        // 输出 Excel
+        EasyExcel.write(response.getOutputStream(), head)
+                .autoCloseStream(false) // 不要自动关闭，交给 Servlet 自己处理
+                .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) // 基于 column 长度，自动适配。最大 255 宽度
+                .sheet(sheetName).doWrite(data);
+        // 设置 header 和 contentType。写在最后的原因是，避免报错时，响应 contentType 已经被修改了
+        response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(filename, "UTF-8"));
+        response.setContentType("application/vnd.ms-excel;charset=UTF-8");
+    }
+
+    public static <T> List<T> read(MultipartFile file, Class<T> head) throws IOException {
+       return EasyExcel.read(file.getInputStream(), head, null)
+                .autoCloseStream(false)  // 不要自动关闭，交给 Servlet 自己处理
+                .doReadAllSync();
+    }
+
+}

web/runeconomy-xk/src/main/resources/application-hf.yml

@@ -0,0 +1,110 @@
+server:
+  port: 6060
+  servlet:
+    context-path: /
+
+spring:
+  application:
+    name: run-economy
+  main:
+    allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册
+  #  cloud:
+  #    nacos:
+  #      discovery:
+  #        server-addr: 10.81.3.155:8848
+  #        #指定yaml格式的配置
+  #        file-extension: yaml
+  #        cluster-name: master
+  #      username: nacos
+  #      password: nacos
+  #redis集群
+  redis:
+    host: 10.157.128.44
+    #host: 192.168.11.250
+    port: 6379
+    timeout: 100000
+    #    集群环境打开下面注释，单机不需要打开
+    #    cluster:
+    #      #集群信息
+    #      nodes: 10.83.68.151:6379,10.83.68.152:6379,10.83.68.153:6379,10.83.68.154:6379,10.83.68.155:6379,10.83.68.156:6379,10.83.68.157:6379,10.83.68.158:6379,10.83.68.159:6379
+    #      #默认值是5 一般当此值设置过大时，容易报：Too many Cluster redirections
+    #      maxRedirects: 3
+    password:
+    application:
+      name: test
+    jedis:
+      pool:
+        max-active: 8
+        min-idle: 0
+        max-idle: 8
+        max-wait: -1
+    database: 9
+  autoconfigure:
+    exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driver-class-name: org.postgresql.Driver
+    url: jdbc:postgresql://10.157.128.44:5432/IMS_NEM?rewriteBatchedStatements=true
+    username: postgres
+    password: gd123
+    #华为云测试地址
+    #    url: jdbc:postgresql://124.70.75.91:5432/jn_test #IMS_NEM_SD
+    #    username: postgres
+    #    password: gd123
+
+    oracle-schema=:
+    #    type: com.alibaba.druid.pool.DruidDataSource
+    #    url: jdbc:mysql://127.0.0.1:3306/test?characterEncoding=utf8&serverTimezone=UTC
+    #    username: root
+    #    password: root
+    #    driver-class-name: com.mysql.jdbc.Driver
+    druid:
+      max-active: 20
+      initial-size: 1
+      min-idle: 3
+      max-wait: 60000
+      time-between-eviction-runs-millis: 60000
+      min-evictable-idle-time-millis: 300000
+      test-while-idle: true
+      test-on-borrow: false
+      test-on-return: false
+  servlet:
+    multipart:
+      # 开启 multipart 上传功能
+      enabled: true
+      # 文件写入磁盘的阈值
+      file-size-threshold: 2KB
+      # 最大文件大小
+      max-file-size: 200MB
+      # 最大请求大小
+      max-request-size: 215MB
+
+mybatis-plus:
+  configuration:
+    map-underscore-to-camel-case: true
+    auto-mapping-behavior: full
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    default-enum-type-handler: org.apache.ibatis.type.EnumOrdinalTypeHandler
+  mapper-locations: classpath*:mapper/**/*Mapper.xml
+  global-config:
+    # 逻辑删除配置
+    db-config:
+      #id-type: auto
+      # 删除前
+      logic-not-delete-value: 1
+      # 删除后
+      logic-delete-value: 0
+      #table-prefix: t_
+      id-type: assign_uuid
+  #配置类型别名对应的包
+  type-aliases-package: com.gyee.runeconomy.model.auto
+  #用于扫描通用枚举包
+  type-enums-package: com.gyee.runeconomy.config
+logging:
+  level:
+    root: info
+    com.example: debug
+initialcode: INITIAL
+db:
+  baseURL: http://10.157.128.44:8011/ts
+  #url: http://192.168.11.250:8011/ts

web/runeconomy-xk/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: jn
+    active: test
 #    active: yun
 #    active: xk
 #    active: sd