Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager

longyvfengyun

2022-07-27 05fcd33a7d4bed53ab9b253ea7878aa699223176

Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager

 src/main/java/com/whyc/pojo/DocUser.java

@@ -69,6 +69,9 @@
    @ApiModelProperty(value = "人脸信息")
    private DocFace dface;

    @ApiModelProperty(value = "下载权限")
    private Integer dloadFlag;

    public DocUser(Long id, String name) {
        this.id = id;
        this.name = name;

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

@@ -121,6 +121,7 @@
            }
        }
        wrapper.ne("id", 0);
        wrapper.ne("oprate_type",UserOperation.TYPE_EXCEPTION.getType());
        wrapper.orderByDesc("oprate_day");
        List<DocLog> list=mapper.selectList(wrapper);
        list.stream().forEach(dlog->{

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

@@ -9,6 +9,8 @@
import com.whyc.dto.Page;
import com.whyc.dto.Response;
import com.whyc.mapper.DocUserMapper;
import com.whyc.pojo.DocDepart;
import com.whyc.pojo.DocRole;
import com.whyc.pojo.DocUser;
import com.whyc.util.ActionUtil;
import com.whyc.util.RSAUtil;
@@ -39,6 +41,12 @@
    @Autowired
    private DocFaceService faceService;

    @Autowired
    private DocRoleService roleService;

    @Autowired
    private DocDepartService departService;

    //查询所有用户信息
    public Response getAllUser(DocUser docUser, int pageCurr, int pageSize) {
        PageHelper.startPage(pageCurr,pageSize);
@@ -57,6 +65,7 @@
        wrapper.set("depart_id",docUser.getDepartId());
        wrapper.set("face_id",faceId);
        wrapper.set("role_id",docUser.getRoleId());
        wrapper.set("dload_flag",docUser.getDloadFlag());
        wrapper.eq("id",docUser.getId());
        int bl=mapper.update(null,wrapper);
        return new Response().set(1,bl>0?true:false);
@@ -137,7 +146,14 @@
        DocUser userDB = (DocUser) subject.getPrincipal();
        userDB.setSnId(null);
        request.getSession().setAttribute("user", userDB);
        return response.setII(1,true, userDB,"登录成功");
        //查询角色和部门列表信息
        Map<String,Object> map = new HashMap<>();
        List<DocDepart> departList = (List<DocDepart>) ((PageInfo)departService.getAllDepart().getData2()).getList();
        List<DocRole> roleList = (List<DocRole>)  ((PageInfo)roleService.getAllRole().getData2()).getList();
        map.put("departs",departList);
        map.put("roles",roleList);

        return response.setIII(1,true, userDB,map,"登录成功");
    }
    //修改密码
    public Response changeSnId(String name,String oldSnId, String newSnId) {

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

@@ -1,8 +1,10 @@
package com.whyc.service;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.whyc.dto.Response;
import com.whyc.mapper.ProductBomHistoryMapper;
import com.whyc.pojo.ProductBomHistory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -21,4 +23,15 @@
        List list=mapper.selectList(wrapper);
        return new Response().setII(1,list.size()>0?true:false,list,"返回数据");
    }

    /**指定版本的产品bom*/
    public List<ProductBomHistory> getListByParentModel(String parentModel, Integer version) {
        QueryWrapper<ProductBomHistory> query = Wrappers.query();
        query.eq("parent_model",parentModel).le("e_version",version).ge("s_version",version);
        return mapper.selectList(query);
    }

    public void addBatch(List<ProductBomHistory> newHistoryList) {
        mapper.insertBatchSomeColumn(newHistoryList);
    }
}

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

@@ -31,7 +31,7 @@
    public DocUser findPasswordByUserName(String userName) {
        DocUser userInf = null;
        QueryWrapper<DocUser> queryWrapper = Wrappers.query();
        queryWrapper.select("id","name","sn_id","role_id").eq("name",userName);
        queryWrapper.select("id","name","sn_id","role_id","dload_flag").eq("name",userName);
        userInf = userMapper.selectOne(queryWrapper);

        return userInf==null?new DocUser(0L,"用户不存在"):userInf;

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

@@ -4,17 +4,16 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.whyc.mapper.ProductBomApprovingMapper;
import com.whyc.mapper.WorksheetLinkMapper;
import com.whyc.pojo.DocUser;
import com.whyc.pojo.ProductBomApproving;
import com.whyc.pojo.WorksheetLink;
import com.whyc.pojo.WorksheetMain;
import com.whyc.pojo.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
import java.util.stream.Collectors;

@Service
public class WorksheetLinkService {
@@ -103,16 +102,61 @@
            //删除? TODO 需要约定逻辑

            //查询部件最新的版本号
            Integer version = bomService.getProduct(approvingList.get(0).getParentModel()).getVersion();
            if(version==null){
                version = 0;
            Integer currentVersion = bomService.getProduct(approvingList.get(0).getParentModel()).getVersion();
            if(currentVersion==null){
                currentVersion = 0;
            }
            Integer nextVersion = version+1;
            Integer nextVersion = currentVersion+1;
            //更新到product_bom_history,需要sVersion和eVersion
            //增加所有部件,排查出相关的原部件,非也是更新
            //historyService.get
            List<ProductBomHistory> currentHistoryList = historyService.getListByParentModel(approvingList.get(0).getParentModel(),currentVersion);
            List<String> currentSubNameList = currentHistoryList.stream().map(ProductBomHistory::getSubName).collect(Collectors.toList());

            List<ProductBomHistory> newHistoryList = new LinkedList<>();
            approvingList.forEach(approvingBom->{
                if(currentSubNameList.contains(approvingBom.getSubName())){
                    approvingBom.setVersion(1);
                }else{
                    approvingBom.setVersion(0);
                }
                //转化为productBomHistory
                ProductBomHistory his = new ProductBomHistory();
                his.setCategory(approvingBom.getCategory());
                his.setCreateDate(approvingBom.getCreateDate());
                his.setDwgUrl(approvingBom.getDwgUrl());
                his.seteVersion(nextVersion);
                his.setFileUrl(approvingBom.getFileUrl());
                his.setMaterial(approvingBom.getMaterial());
                his.setNotes(approvingBom.getNotes());
                his.setParentCode(approvingBom.getParentCode());
                his.setParentModel(approvingBom.getParentModel());
                his.setParentName(approvingBom.getParentName());
                his.setParentVersion(approvingBom.getParentVersion());
                his.setPictureUrl(approvingBom.getPictureUrl());
                his.setProducer(approvingBom.getProducer());
                his.setQuantity(approvingBom.getQuantity());
                his.setSubCode(approvingBom.getSubCode());
                his.setSubModel(approvingBom.getSubModel());
                his.setSubName(approvingBom.getSubName());
                his.setSurfaceDetail(approvingBom.getSurfaceDetail());
                his.setsVersion(nextVersion);
                his.setThickness(approvingBom.getThickness());
                his.setType(approvingBom.getType());
                his.setUnit(approvingBom.getUnit());
                his.setUpdateDate(approvingBom.getUpdateDate());
                his.setUpUser(approvingBom.getUpUser());

                newHistoryList.add(his);
            });
            //本次审核中子件被修改的子件集合
            List<String> approvingUpdateSubNameList = approvingList.stream().filter(approvingBom -> approvingBom.getVersion() == 1).map(ProductBomApproving::getSubName).collect(Collectors.toList());

            //更新到product_bom
            historyService.addBatch(newHistoryList);
            /*更新产品的当前版本,更新到最新的版本*/
            //当前版本的所有bom,排除
            //currentHistoryList.stream().filter(currentHistory->currentHistory.getSubName());


            /*String projectDir = CommonUtil.getProjectDir();
            FileUtil.copyDir()*/

 src/main/resources/mapper/DocUserMapper.xml

@@ -10,6 +10,7 @@
        <result column="depart_id" property="departId"></result>
        <result column="face_id" property="faceId"></result>
        <result column="role_id" property="roleId"></result>
        <result column="dload_flag" property="dloadFlag"></result>
        <association property="drole" javaType="docRole">
            <id column="rid" property="id" ></id>
            <result column="rrole_name" property="roleName"></result>