优化钣金相关代码结构

zhanghl

2025-05-19 668eed92806a814d0ea20fbab1caa7d1e6d197ea

 aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsResourceGroupController.java

@@ -6,9 +6,9 @@
import com.aps.common.core.web.page.TableDataInfo;
import com.aps.common.log.annotation.Log;
import com.aps.common.log.enums.BusinessType;
import com.aps.common.security.annotation.RequiresPermissions;
import com.aps.core.domain.ApsResourceGroup;
import com.aps.core.domain.ApsResourceGroupTemp;
import com.aps.core.param.ApsResourceGroupParam;
import com.aps.core.service.IApsResourceGroupService;
import com.aps.core.service.IApsResourceGroupTempService;
import jakarta.annotation.Resource;
@@ -16,6 +16,8 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;

/**
@@ -25,7 +27,7 @@
 * @date  2025-04-10
 */
@RestController
@RequestMapping("/ApsResourceGroup")
@RequestMapping("/apsResourceGroup")
public class ApsResourceGroupController extends BaseController
{
    @Resource
@@ -36,9 +38,9 @@
    /**
     * 查询资源组列表
     */
    /*@RequiresPermissions("ApsResourceGroup:list")*/
    @RequiresPermissions("ApsResourceGroup:list")
    @GetMapping("/list")
    public TableDataInfo list(ApsResourceGroupParam apsResourceGroup)
    public TableDataInfo list(ApsResourceGroup apsResourceGroup)
    {
        //startPage();
        List<ApsResourceGroup> list = apsResourceGroupService.selectApsResourceGroupList(apsResourceGroup);
@@ -48,10 +50,10 @@
    /**
     * 导出资源组列表
     */
    /*@RequiresPermissions("ApsResourceGroup:ApsResourceGroup:export")*/
    @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:export")
    @Log(title = "资源组", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ApsResourceGroupParam apsResourceGroup)
    public void export(HttpServletResponse response, ApsResourceGroup apsResourceGroup)
    {
        List<ApsResourceGroup> list = apsResourceGroupService.selectApsResourceGroupList(apsResourceGroup);
        ExcelUtil<ApsResourceGroup> util = new ExcelUtil<>(ApsResourceGroup.class);
@@ -61,7 +63,7 @@
    /**
     * 获取资源组详细信息
     */
   /* @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:query")*/
    @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:query")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") String id)
    {
@@ -71,7 +73,7 @@
    /**
     * 新增资源组
     */
   /* @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:add")*/
    @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:add")
    @Log(title = "资源组", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody ApsResourceGroup apsResourceGroup)
@@ -82,7 +84,7 @@
    /**
     * 修改资源组
     */
    /*@RequiresPermissions("ApsResourceGroup:ApsResourceGroup:edit")*/
    @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:edit")
    @Log(title = "资源组", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody ApsResourceGroup apsResourceGroup)
@@ -93,7 +95,7 @@
    /**
     * 删除资源组
     */
    /*@RequiresPermissions("ApsResourceGroup:ApsResourceGroup:remove")*/
    @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:remove")
    @Log(title = "资源组", businessType = BusinessType.DELETE)
   @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable String[] ids)
@@ -111,6 +113,7 @@
    /**
     * 导入资源组
     */
    @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:importData")
    @PostMapping("/importData")
    public AjaxResult importData(MultipartFile file) throws Exception {
        ExcelUtil<ApsResourceGroupTemp> util = new ExcelUtil<>(ApsResourceGroupTemp.class);
@@ -126,10 +129,12 @@
    /**
     * 确认数据
     */
    @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:confirmData")
    @PostMapping("/confirmData")
    public AjaxResult confirmData(@RequestBody ApsResourceGroupTemp temp) {

        apsResourceGroupService.confirmData(temp.getBatchNumber(),temp.getRequestDate());
        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
        LocalDateTime localDateTime = LocalDateTime.parse(temp.getParams().get("requestDate").toString(), formatter);
        apsResourceGroupService.confirmData(temp.getBatchNumber(),localDateTime);
        return AjaxResult.success("确认成功！");
    }
}