增加国别的表和查询接口

yangys

2024-03-05 b542d4ff172d61e14a0c9428a82cf77bd4119498

增加国别的表和查询接口

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

@@ -21,9 +21,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.qianwen.mdc.common.OpResult;
import com.qianwen.mdc.dto.IdsDTO;
import com.qianwen.mdc.dto.manufacturer.ManufacturerDTO;
import com.qianwen.mdc.dto.manufacturer.ManufacturerQueryDTO;
import com.qianwen.mdc.service.manufacturer.ManufacturerService;
import com.qianwen.mdc.dto.usedepartment.UseDepartmentDTO;
import com.qianwen.mdc.dto.usedepartment.UseDepartmentQueryDTO;
import com.qianwen.mdc.service.usedepartment.UseDepartmentService;

/**
 * ä½¿ç”¨éƒ¨é—¨ç®¡ç†æŽ§åˆ¶å™¨
@@ -34,17 +34,17 @@
public class UseDepartmentController {
    
    @Autowired
    private ManufacturerService manufacturerService;
    private UseDepartmentService useDeptService;

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

    @PostMapping(value = "/create")
    public OpResult<Void> create(@RequestHeader(value = "mdc-token", defaultValue = "") String token,
          @RequestBody ManufacturerDTO dto, HttpServletRequest request) {
          @RequestBody UseDepartmentDTO dto, HttpServletRequest request) {
        
        try {
            //accountTokenService.checkToken(token);
            manufacturerService.save(dto);
            useDeptService.save(dto);
        }catch(Exception ex) {
            logger.error("新增生产厂商错误",ex);
            return OpResult.fail(ex.getMessage());
@@ -54,11 +54,11 @@

    @PostMapping(value = "/update")
    public OpResult<Void> update(@RequestHeader(value = "mdc-token", defaultValue = "") String token,
             @RequestBody ManufacturerDTO dto, HttpServletRequest request) {
             @RequestBody UseDepartmentDTO dto, HttpServletRequest request) {
        
        try {
            //accountTokenService.checkToken(token);
            manufacturerService.modify(dto);
            useDeptService.modify(dto);
        }catch(Exception ex) {
            logger.error("修改生产厂商错误",ex);
            return OpResult.fail(ex.getMessage());
@@ -68,11 +68,11 @@
    
    
    @PostMapping( "/pageQuery")
    public OpResult<Page<ManufacturerDTO>> pageQuery(@RequestHeader(value = "mdc-token", defaultValue = "") String token,
            @RequestBody ManufacturerQueryDTO dto) {
    public OpResult<Page<UseDepartmentDTO>> pageQuery(@RequestHeader(value = "mdc-token", defaultValue = "") String token,
            @RequestBody UseDepartmentQueryDTO dto) {
        
        try {
            return OpResult.success(manufacturerService.pageQuery(dto));
            return OpResult.success(useDeptService.pageQuery(dto));
        }catch(Exception e) {
            logger.error("生产厂商分页查询异常",e);
            return OpResult.fail(e.getMessage());
@@ -86,9 +86,9 @@
     * @return
     */
    @GetMapping(value = "/{id}")
    public OpResult<ManufacturerDTO> get(@PathVariable("id") Integer id) {
    public OpResult<UseDepartmentDTO> get(@PathVariable("id") Integer id) {
        try {
            ManufacturerDTO d = manufacturerService.get(id);
            UseDepartmentDTO d = useDeptService.get(id);
            return OpResult.success(d);
        }catch(Exception e) {
            logger.error("生产厂商详情查询异常",e);
@@ -98,9 +98,9 @@
    }
    
    @GetMapping(value = "/list")
    public OpResult<List<ManufacturerDTO>> list() {
    public OpResult<List<UseDepartmentDTO>> list() {
        try {
            return OpResult.success(manufacturerService.allList());
            return OpResult.success(useDeptService.allList());
        }catch(Exception e) {
            logger.error("生产厂商下拉列表查询异常",e);
            return OpResult.fail(e.getMessage());
@@ -114,7 +114,7 @@
        //accountTokenService.checkToken(token);@RequestParam List<Integer> ids
        
        try {
            manufacturerService.delete(dto.getIds());
            useDeptService.delete(dto.getIds());
            return OpResult.success();
        }catch(Exception e) {
            logger.error("删除生产厂商失败",e);

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

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



import java.util.List;

import java.util.stream.Collectors;



import javax.servlet.http.HttpServletRequest;



@@ -16,9 +17,12 @@
import org.springframework.web.bind.annotation.RestController;

import org.springframework.web.multipart.MultipartFile;



import com.baomidou.mybatisplus.core.toolkit.Wrappers;

import com.qianwen.mdc.common.OpResult;

import com.qianwen.mdc.dto.MachineCountryDTO;

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

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

import com.qianwen.mdc.mapper.MachineCountryMapper;

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

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



@@ -30,177 +34,155 @@
@RequestMapping(value = "/account")

public class MachineAccountAddController {



    @Autowired

    private MachineAccountAddService accountAddService;

   
    @Autowired

    private UseDepartmentService useDepartmentService;

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

    
    @PostMapping(value = "/create")

    public OpResult<Void> create(@RequestHeader(value = "mdc-token", defaultValue = "") String token,

          @RequestBody MachineAccountEditDTO dto, HttpServletRequest request) {

        
        try {

            //accountTokenService.checkToken(token);

			
    @Autowired

    private MachineAccountAddService accountAddService;



    @Autowired

    private UseDepartmentService useDepartmentService;



    @Autowired

    private MachineCountryMapper countryMapper;



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



    @PostMapping(value = "/create")

    public OpResult<Void> create(@RequestHeader(value = "mdc-token", defaultValue = "") String token,

            @RequestBody MachineAccountEditDTO dto, HttpServletRequest request) {



        try {

            // accountTokenService.checkToken(token);



            accountAddService.save(dto);

        }catch(Exception ex) {

            logger.error("新增台账错误",ex);

            return OpResult.fail(ex.getMessage());

        } catch (Exception ex) {

            logger.error("新增台账错误", ex);

            return OpResult.fail(ex.getMessage());

        }

        return OpResult.success();

    }

    }



    /**

     * ä¸Šä¼ æ–‡ä»¶

     * 
     * @param file

     * @param id   å°è´¦id

     * @return

     */

    @PostMapping(value = "/uploadPic")

    public OpResult<String> uploadPic(MultipartFile file, Integer id) {



    /**

     * ä¸Šä¼ æ–‡ä»¶

     * @param file

     * @param id å°è´¦id

     * @return

     */

    @PostMapping(value = "/uploadPic")

    public OpResult<String> uploadPic(MultipartFile file,Integer id) {

    	
        try {

            String path = accountAddService.uploadPic(file,id);

            return OpResult.success(path);

        }catch(Exception ex) {

            logger.error("上传设备图片失败",ex);

            return OpResult.fail(ex.getMessage());

        }

        try {

            String path = accountAddService.uploadPic(file, id);

            return OpResult.success(path);

        } catch (Exception ex) {

            logger.error("上传设备图片失败", ex);

            return OpResult.fail(ex.getMessage());

        }



    }

    
    @GetMapping(value = "/useDepartments")

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

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

    }

    /*

   
    }



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

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

            String fileId) {

       //TODO checktoken

    @GetMapping(value = "/useDepartments")

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

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

    }



        JSONObject jsonResult = new JSONObject();

    @GetMapping(value = "/countries")

    public OpResult<List<MachineCountryDTO>> getCountries() {

        return OpResult.success(this.countryMapper.selectList(Wrappers.emptyWrapper()).stream().map(c -> {

            MachineCountryDTO dto = new MachineCountryDTO();

            dto.setId(c.getId());

            dto.setName(c.getName());

            return dto;

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



        if (fileId == null) {

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

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

            return jsonResult;

        }



        String[] file = fileId.split("#");

        if ((file[0] == null) || (file[1] == null)) {

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

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

            return jsonResult;

        }



        MdcMachine mdcMachineObj = new MdcMachine();

        mdcMachineObj.setId(Integer.parseInt(file[0]));

        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 sb = new StringBuilder();

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

                .append("/").append(mdcMachine.getName()).append("/").append(file[1]);

        File fileDel = new File(sb.toString());

        fileDel.delete();



        return jsonResult;

    }



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

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

            String machineId) {

        MdcToken mdcTokenObj = new MdcToken();

        mdcTokenObj.setToken(token);

        MdcToken mdcToken = mdcTokenMapper.selectOne(mdcTokenObj);

        JSONObject tokenResult = MdcTokenServiceImpl.genTokenErrMsg(mdcToken);

        if (tokenResult != null) {

            return tokenResult;

        }



        mdcToken.setExpired(MdcTokenServiceImpl.genExpiredTime());

        mdcTokenMapper.updateByPrimaryKeySelective(mdcToken);



        JSONObject jsonResult = new JSONObject();



        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 sb = new StringBuilder();

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

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

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



        JSONArray jsonArray = new JSONArray();

        jsonResult.put("list", jsonArray);



        File[] files = path.listFiles();

        if (files != null) {

            for (File file : files) {

                JSONObject item = new JSONObject();

                jsonArray.add(item);

                item.put("fileName", file.getName());

            }

        }



        return jsonResult;

    }

    */

    }

    /*

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

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

     * String token, String fileId) { //TODO checktoken

     * 
     * JSONObject jsonResult = new JSONObject();

     * 
     * if (fileId == null) { jsonResult.put("result", "FAIL");

     * jsonResult.put("errCode", "407"); return jsonResult; }

     * 
     * String[] file = fileId.split("#"); if ((file[0] == null) || (file[1] ==

     * null)) { jsonResult.put("result", "FAIL"); jsonResult.put("errCode", "403");

     * return jsonResult; }

     * 
     * MdcMachine mdcMachineObj = new MdcMachine();

     * mdcMachineObj.setId(Integer.parseInt(file[0])); 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 sb = new StringBuilder();

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

     * append(mdcSection.getName())

     * .append("/").append(mdcMachine.getName()).append("/").append(file[1]); File

     * fileDel = new File(sb.toString()); fileDel.delete();

     * 
     * return jsonResult; }

     * 
     * @RequestMapping(value = "/file/get", method = RequestMethod.POST) JSONObject

     * fileGet(@RequestHeader(value = "mdc-token", defaultValue = "") String token,

     * String machineId) { MdcToken mdcTokenObj = new MdcToken();

     * mdcTokenObj.setToken(token); MdcToken mdcToken =

     * mdcTokenMapper.selectOne(mdcTokenObj); JSONObject tokenResult =

     * MdcTokenServiceImpl.genTokenErrMsg(mdcToken); if (tokenResult != null) {

     * return tokenResult; }

     * 
     * mdcToken.setExpired(MdcTokenServiceImpl.genExpiredTime());

     * mdcTokenMapper.updateByPrimaryKeySelective(mdcToken);

     * 
     * JSONObject jsonResult = new JSONObject();

     * 
     * 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 sb = new StringBuilder();

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

     * append(mdcSection.getName()) .append("/").append(mdcMachine.getName()); File

     * path = new File(sb.toString());

     * 
     * JSONArray jsonArray = new JSONArray(); jsonResult.put("list", jsonArray);

     * 
     * File[] files = path.listFiles(); if (files != null) { for (File file : files)

     * { JSONObject item = new JSONObject(); jsonArray.add(item);

     * item.put("fileName", file.getName()); } }

     * 
     * return jsonResult; }

     */

}


 mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/domain/MachineCountry.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,39 @@
package com.qianwen.mdc.domain;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

/**
 * è®¾å¤‡å›½åˆ«ï¼Œå­—典表
 */
@TableName( "machine_country")
public class MachineCountry{
	
    @TableId(type=IdType.ASSIGN_ID)
    private Long id;

    /**
     * åç§°
     */
    private String name;
   
   
    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public String getName() {
        return name;
    }

    public void setName(String name) {
        this.name = name;
    }


}

 mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/MachineCountryDTO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,33 @@
package com.qianwen.mdc.dto;

/**
 * å›½åˆ«æ•°æ®
 */

public class MachineCountryDTO{

    private Long id;

    /*
     * ç±»åž‹åç§°
     */
    private String name;
   

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public String getName() {
        return name;
    }

    public void setName(String name) {
        this.name = name;
    }

}

 mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/account/MachineAccountQueryDTO.java

@@ -1,5 +1,7 @@
package com.qianwen.mdc.dto.account;



import java.util.Date;



import com.qianwen.mdc.dto.BasePageDTO;



public class MachineAccountQueryDTO extends BasePageDTO{

@@ -53,6 +55,9 @@
     * è®¾å¤‡ç±»åž‹

     */

    private Long deviceTypeId;

    
    private Date productionDateBegin;

    private Date productionDateEnd;

    

    public String getUuid() {

        return uuid;

@@ -142,7 +147,21 @@
    public void setDeviceTypeId(Long deviceTypeId) {

        this.deviceTypeId = deviceTypeId;

    }

    
    


    public Date getProductionDateBegin() {

        return productionDateBegin;

    }



    public void setProductionDateBegin(Date productionDateBegin) {

        this.productionDateBegin = productionDateBegin;

    }



    public Date getProductionDateEnd() {

        return productionDateEnd;

    }



    public void setProductionDateEnd(Date productionDateEnd) {

        this.productionDateEnd = productionDateEnd;

    }



}


 mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/mapper/MachineCountryMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
package com.qianwen.mdc.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.qianwen.mdc.domain.MachineCountry;

public interface MachineCountryMapper extends BaseMapper<MachineCountry> {
	
}

 mdc-parent/mdc-showdb-mysql/src/main/resources/mapper/MachineCountryMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.qianwen.mdc.mapper.MachineCountryMapper">
  <resultMap id="BaseResultMap" type="com.qianwen.mdc.domain.MachineCountry">
    <id column="id" jdbcType="INTEGER" property="id" />
    <result column="name" jdbcType="VARCHAR" property="name" />
  </resultMap>

</mapper>