Merge branch 'master' of http://118.89.139.230:10101/r/powerIntelligenceSystem

whyclxw

6 天以前 2262618a51134d89b0d9390eaff152c7a9dc1f5d

 src/main/java/com/whyc/service/DeviceSpareService.java

@@ -1,16 +1,20 @@
package com.whyc.service;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.whyc.dto.Response;
import com.whyc.mapper.DeviceSpareMapper;
import com.whyc.pojo.web_site.DeviceSpare;
import com.whyc.pojo.web_site.DeviceSpareLog;
import com.whyc.util.CommonUtil;
import com.whyc.util.ThreadLocalUtil;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
@@ -24,6 +28,9 @@

    @Resource
    private DeviceSpareMapper mapper;

    @Autowired
    private DeviceSpareLogService deviceSpareLogService;

    public Response<PageInfo<DeviceSpare>> getPage(Integer pageNum, Integer pageSize, String type, String name) {
        PageHelper.startPage(pageNum, pageSize);
@@ -40,6 +47,7 @@
        return new Response<List<DeviceSpare>>().set(1, mapper.selectList(query));
    }

    @Transactional
    public Response add(DeviceSpare spare, List<MultipartFile> file) throws IOException {
        //对file进行处理,保存到文件夹中
        //对存储路径进行定义
@@ -73,10 +81,69 @@
        }
        spare.setPictureUrl(pictureUrlSb.toString());
        mapper.insert(spare);
        return new Response().setII(1,"增加完成");

        //变更日志
        DeviceSpareLog deviceSpareLog = new DeviceSpareLog();
        deviceSpareLog.setDeviceSpareId(spare.getId());
        deviceSpareLog.setCreateTime(now);
        deviceSpareLog.setOperationType(1);

        StringBuilder detailSb = new StringBuilder();
        detailSb.append("新增物料类型,");
        detailSb.append("物料名称:").append(spare.getName()).append(",");
        detailSb.append("物料型号:").append(spare.getModel()).append(",");
        detailSb.append("物料版本:").append(spare.getVersion()).append(",");
        detailSb.append("物料品牌:").append(spare.getBrand()).append(",");
        detailSb.append("物料数量:").append(spare.getQuantity()).append(",");
        detailSb.append("物料类型:").append(spare.getType()).append(",");
        detailSb.append("物料供应商:").append(spare.getSupplier());
        deviceSpareLog.setOperationDetail(detailSb.toString());

        deviceSpareLogService.add(deviceSpareLog);



        return new Response().setII(1,"新增完成");
    }

    @Transactional
    public Response update(DeviceSpare spare) {
        //根据id查询数据库中的物料
        DeviceSpare spareInDB = mapper.selectById(spare.getId());
        //对比每个字段是否一样,不一样的记录下来
        DeviceSpareLog deviceSpareLog = new DeviceSpareLog();
        deviceSpareLog.setDeviceSpareId(spare.getId());
        deviceSpareLog.setCreateTime(new Date());
        deviceSpareLog.setOperationType(2);

        StringBuilder detailSb = new StringBuilder();
        detailSb.append("修改物料,");
        if (!spareInDB.getName().equals(spare.getName())) {
            detailSb.append("物料名称:").append(spareInDB.getName()).append("->").append(spare.getName()).append(",");
        }
        if (!spareInDB.getModel().equals(spare.getModel())) {
            detailSb.append("物料型号:").append(spareInDB.getModel()).append("->").append(spare.getModel()).append(",");
        }
        if (!spareInDB.getVersion().equals(spare.getVersion())) {
            detailSb.append("物料版本:").append(spareInDB.getVersion()).append("->").append(spare.getVersion()).append(",");
        }
        if (!spareInDB.getBrand().equals(spare.getBrand())) {
            detailSb.append("物料品牌:").append(spareInDB.getBrand()).append("->").append(spare.getBrand()).append(",");
        }
        if (!spareInDB.getQuantity().equals(spare.getQuantity())) {
            detailSb.append("物料数量:").append(spareInDB.getQuantity()).append("->").append(spare.getQuantity()).append(",");
        }
        if (!spareInDB.getType().equals(spare.getType())) {
            detailSb.append("物料类型:").append(spareInDB.getType()).append("->").append(spare.getType()).append(",");
        }
        if (!spareInDB.getSupplier().equals(spare.getSupplier())) {
            detailSb.append("物料供应商:").append(spareInDB.getSupplier()).append("->").append(spare.getSupplier()).append(",");
        }
        //detailSb去除最后一个逗号
        detailSb.deleteCharAt(detailSb.length()-1);
        deviceSpareLog.setOperationDetail(detailSb.toString());
        deviceSpareLogService.add(deviceSpareLog);

        mapper.updateById(spare);
        return new Response().setII(1,"修改完成");
    }
@@ -85,4 +152,39 @@
        mapper.deleteById(id);
        return new Response().setII(1,"删除完成");
    }

    public Response<List<DeviceSpare>> getListByIds(String deviceSpareIds) {
        QueryWrapper<DeviceSpare> query = Wrappers.query();
        query.in("id",deviceSpareIds.split(","));
        List<DeviceSpare> deviceSpares = mapper.selectList(query);
        return new Response<List<DeviceSpare>>().set(1,deviceSpares);
    }

    public void add(List<DeviceSpare> spareList) {
        mapper.insertBatchSomeColumn(spareList);
    }

    public void addOrUpdate(List<DeviceSpare> spareList) {
        //查询库中是否存在该设备,存在则增加数量.
        for (DeviceSpare spare : spareList) {
            QueryWrapper<DeviceSpare> query = Wrappers.query();
            query.eq("name",spare.getName());
            query.eq("model",spare.getModel());
            query.eq("version",spare.getVersion());
            query.eq("brand",spare.getBrand());
            query.eq("type",spare.getType());
            query.eq("supplier",spare.getSupplier());
            query.last(" limit 1");
            DeviceSpare spareInDB = mapper.selectOne(query);
            if(spareInDB != null){
                spareInDB.setQuantity(spareInDB.getQuantity()+spare.getQuantity());
                mapper.updateById(spareInDB);

            }else{
                //不存在则新增
                mapper.insert(spare);
            }
        }

    }
}