1.机器设备测算表段落模板上传相关接口

biz-base/src/main/java/com/dayou/controller/TmplAssetCalculateController.java

@@ -1,5 +1,6 @@
 package com.dayou.controller;
 
+import com.dayou.common.DropDownBoxData;
 import com.dayou.result.Result;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,6 +10,9 @@ import org.springframework.web.bind.annotation.RestController;
 import com.dayou.service.TmplAssetCalculateService;
 import com.dayou.entity.TmplAssetCalculate;
 import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
 /**
  * 资产测算表模板信息表
  *
@@ -18,6 +22,7 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping("tmplAssetCalculate")
 @Slf4j
+@CrossOrigin
 public class TmplAssetCalculateController {
     @Autowired
     private TmplAssetCalculateService tmplAssetCalculateService;
@@ -67,5 +72,14 @@ public class TmplAssetCalculateController {
         return Result.build(ret);
     }
 
+    /**
+     * 获取资产测算表的下拉框数据
+     * @return List<DropDownBoxData>
+     */
+    @GetMapping("/getDropDownBoxData")
+    public Result<List<DropDownBoxData>> getDropDownBoxData() {
+        return Result.build(tmplAssetCalculateService.getDropDownBoxData());
+    }
+
 }
 

biz-base/src/main/java/com/dayou/controller/TmplAssetCalculateSectionController.java

@@ -18,7 +18,9 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping("tmplAssetCalculateSection")
 @Slf4j
+@CrossOrigin
 public class TmplAssetCalculateSectionController {
+
     @Autowired
     private TmplAssetCalculateSectionService tmplAssetCalculateSectionService;
 

biz-base/src/main/resources/application-local.yaml

@@ -66,7 +66,7 @@ oa-api-url: localhost:8088/api/
 
 file-net:
   # 基础配置
-  base-dir: /Users/wuwei/opt/temp/
+  base-dir: E:\productivity-platform-files\
   max-file-size: 102400
   # 资产业务配置
   asset-template-report-path: assets\templates\report\

dao/src/main/java/com/dayou/mapper/TmplAssetCalculateMapper.java

@@ -1,8 +1,11 @@
 package com.dayou.mapper;
 
+import com.dayou.common.DropDownBoxData;
 import com.dayou.entity.TmplAssetCalculate;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 资产测算表模板信息表 Mapper 接口
@@ -13,4 +16,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface TmplAssetCalculateMapper extends BaseMapper<TmplAssetCalculate> {
 
+    /**
+     * 获取资产测算表的下拉框数据
+     * @return List<DropDownBoxData>
+     */
+    List<DropDownBoxData> getDropDownBoxData();
+
 }

dao/src/main/resources/mapper/TmplAssetCalculateMapper.xml

@@ -26,4 +26,12 @@
         calculate_name, file_name, file_url, calculate_type, calculate_sec_type, has_section, tmpl_code
     </sql>
 
+    <!--获取资产测算表的下拉框数据-->
+    <select id="getDropDownBoxData" resultType="com.dayou.common.DropDownBoxData">
+        SELECT id, calculate_name AS name
+        FROM tmpl_asset_calculate
+        WHERE delete_status = 0
+          AND has_section = 1
+    </select>
+
 </mapper>

domain/src/main/java/com/dayou/common/DropDownBoxData.java

@@ -0,0 +1,12 @@
+package com.dayou.common;
+
+import lombok.Data;
+
+@Data
+public class DropDownBoxData {
+
+    private Long id;
+
+    private String name;
+
+}

gen/src/main/resources/template/controller.java.vm

@@ -30,6 +30,7 @@ import org.springframework.web.bind.annotation.*;
 ##@RequestMapping("#if(${package.ModuleName})/${package.ModuleName}#end/#if(${controllerMappingHyphenStyle})${controllerMappingHyphen}#else${table.entityPath}#end")
 @RequestMapping("${table.entityPath}")
 @Slf4j
+@CrossOrigin
 #if(${kotlin})
 class ${table.controllerName}#if(${superControllerClass}) : ${superControllerClass}()#end
 

service/src/main/java/com/dayou/service/TmplAssetCalculateSectionService.java

@@ -1,10 +1,8 @@
 package com.dayou.service;
-
 import com.dayou.entity.TmplAssetCalculateSection;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-
 /**
  * <p>
  * 资产测算表段落模板信息表 服务类
@@ -15,14 +13,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  */
 public interface TmplAssetCalculateSectionService extends IService<TmplAssetCalculateSection> {
 
-    Page<TmplAssetCalculateSection> selectPage(Page page, TmplAssetCalculateSection tmplAssetCalculateSection);
+        Page<TmplAssetCalculateSection> selectPage(Page page,TmplAssetCalculateSection tmplAssetCalculateSection);
 
-    TmplAssetCalculateSection detail(Long id);
+        TmplAssetCalculateSection detail(Long id);
 
-    Boolean add(TmplAssetCalculateSection tmplAssetCalculateSection);
+        Boolean add(TmplAssetCalculateSection tmplAssetCalculateSection);
 
-    Boolean update(TmplAssetCalculateSection tmplAssetCalculateSection);
+        Boolean update(TmplAssetCalculateSection tmplAssetCalculateSection);
 
-    Boolean delete(Long id);
+        Boolean delete(Long id);
 
 }

service/src/main/java/com/dayou/service/TmplAssetCalculateService.java

@@ -1,10 +1,13 @@
 package com.dayou.service;
 
+import com.dayou.common.DropDownBoxData;
 import com.dayou.entity.TmplAssetCalculate;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import java.util.List;
+
 /**
  * <p>
  * 资产测算表模板信息表 服务类
@@ -25,4 +28,11 @@ public interface TmplAssetCalculateService extends IService<TmplAssetCalculate>
 
     Boolean delete(Long id);
 
+
+    /**
+     * 获取资产测算表的下拉框数据
+     * @return List<DropDownBoxData>
+     */
+    List<DropDownBoxData> getDropDownBoxData();
+
 }

service/src/main/java/com/dayou/service/impl/TmplAssetCalculateServiceImpl.java

@@ -1,9 +1,11 @@
 package com.dayou.service.impl;
 
+import com.dayou.common.DropDownBoxData;
 import com.dayou.entity.TmplAssetCalculate;
 import com.dayou.mapper.TmplAssetCalculateMapper;
 import com.dayou.service.TmplAssetCalculateService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -27,6 +29,8 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class TmplAssetCalculateServiceImpl extends ServiceImpl<TmplAssetCalculateMapper, TmplAssetCalculate> implements TmplAssetCalculateService {
 
+    @Autowired
+    private TmplAssetCalculateMapper tmplAssetCalculateMapper;
 
     @Override
     @SuppressWarnings("unchecked")
@@ -55,4 +59,13 @@ public class TmplAssetCalculateServiceImpl extends ServiceImpl<TmplAssetCalculat
         //逻辑删除
         return this.removeById(id);
     }
+
+    /**
+     * 获取资产测算表的下拉框数据
+     * @return List<DropDownBoxData>
+     */
+    @Override
+    public List<DropDownBoxData> getDropDownBoxData() {
+        return tmplAssetCalculateMapper.getDropDownBoxData();
+    }
 }