增加厂商和使用部门维护功能

yangys

2024-03-04 c51a042cfb8453265acf2b764b82bd17019b9b1b

 mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/account/MachineAccountAddController.java

@@ -1,7 +1,6 @@
package com.qianwen.mdc.controller.account;



import java.util.List;

import java.util.stream.Collectors;



import javax.servlet.http.HttpServletRequest;



@@ -19,10 +18,9 @@


import com.qianwen.mdc.common.OpResult;

import com.qianwen.mdc.dto.account.MachineAccountEditDTO;

import com.qianwen.mdc.dto.account.UseDepartmentDTO;

import com.qianwen.mdc.mapper.UseDepartmentMapper;

import com.qianwen.mdc.dto.usedepartment.UseDepartmentDTO;

import com.qianwen.mdc.service.account.MachineAccountAddService;

import com.qianwen.mdc.service.account.StaticData;

import com.qianwen.mdc.service.usedepartment.UseDepartmentService;



/**

 * 台账新增控制器

@@ -34,10 +32,9 @@


    @Autowired

    private MachineAccountAddService accountAddService;

   
    @Autowired

    private StaticData staticData;

    @Autowired

    private UseDepartmentMapper useDepartmentMapper;

    private UseDepartmentService useDepartmentService;

    

    public static final Logger logger = LoggerFactory.getLogger(MachineAccountAddController.class);

    

@@ -78,79 +75,10 @@
    

    @GetMapping(value = "/useDepartments")

    public OpResult<List<UseDepartmentDTO>> getDepartments() {

    	
       return OpResult.success(useDepartmentMapper.selectList(null).stream().map(ud->{

          UseDepartmentDTO dto = new UseDepartmentDTO();

          dto.setId(ud.getId());

          dto.setName(ud.getName());

          return dto;

       }).collect(Collectors.toList()));

       return OpResult.success(useDepartmentService.allList());

    }

    /*

    @RequestMapping(value = "/file/upload", method = RequestMethod.POST)

    JSONObject fileUpload(@RequestHeader(value = "mdc-token", defaultValue = "") String token,

            String machineId, MultipartFile file) {

        //TODO checktoken



        JSONObject jsonResult = new JSONObject();



        if (file == null) {

            jsonResult.put("result", "FAIL");

            jsonResult.put("errCode", "403");

            return jsonResult;

        }



        MdcMachine mdcMachineObj = new MdcMachine();

        mdcMachineObj.setId(Integer.parseInt(machineId));

        MdcMachine mdcMachine = mdcMachineMapper.selectOne(mdcMachineObj);

        if (mdcMachine == null) {

            jsonResult.put("result", "FAIL");

            jsonResult.put("errCode", "404");

            return jsonResult;

        }



        MdcWorkshop mdcWorkshopObj = new MdcWorkshop();

        mdcWorkshopObj.setId(mdcMachine.getWorkshopId());

        MdcWorkshop mdcWorkshop = mdcWorkshopMapper.selectOne(mdcWorkshopObj);

        if (mdcWorkshop == null) {

            jsonResult.put("result", "FAIL");

            jsonResult.put("errCode", "405");

            return jsonResult;

        }



        MdcSection mdcSectionObj = new MdcSection();

        mdcSectionObj.setId(mdcMachine.getSectionId());

        MdcSection mdcSection = mdcSectionMapper.selectOne(mdcSectionObj);

        if (mdcSection == null) {

            jsonResult.put("result", "FAIL");

            jsonResult.put("errCode", "406");

            return jsonResult;

        }



        jsonResult.put("result", "SUCCESS");



        StringBuilder sbPath = new StringBuilder();

//        sb.append(uploadPath).append("/").append(mdcWorkshop.getName()).append("/").append(mdcSection.getName())

//                .append("/").append(mdcMachine.getName()).append("/").append(file.getName());

        sbPath.append(uploadPath).append("/").append(mdcWorkshop.getName()).append("/").append(mdcSection.getName())

                .append("/").append(mdcMachine.getName());

        try {

            File path = new File(sbPath.toString());

            if (!path.exists()) {

                path.mkdirs();

            }



            File uploadFile = new File(sbPath.append("/").append(file.getName()).toString());

            file.transferTo(uploadFile);

        } catch (IOException e) {

            e.printStackTrace();

        }



        String fileId = mdcMachine.getId() + "#" + file.getName();

        jsonResult.put("fileId", fileId);



        return jsonResult;

    }

   


    @RequestMapping(value = "/file/delete", method = RequestMethod.POST)

    JSONObject fileDelete(@RequestHeader(value = "mdc-token", defaultValue = "") String token,