bonus
/
cqdevicemgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

改路径

This commit is contained in:
sxu 2024-08-08 16:07:06 +08:00
parent 3d31f7d089
commit 5117d2052e
11 changed files with 44 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/SgzbMaterialApplication.java → sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/SgzbMaterialApplication.java
View File

@ -1,4 +1,4 @@
package com.bonus.sgzb.material;
package com.bonus.sgzb;
import com.bonus.sgzb.common.security.annotation.EnableCustomConfig;

6
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java → sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/AppBackApplyController.java
View File

@ -3,7 +3,7 @@ package com.bonus.sgzb.app.controller;
import cn.hutool.core.collection.CollUtil;
import com.bonus.sgzb.app.domain.BmAgreementInfo;
import com.bonus.sgzb.app.domain.TmTask;
import com.bonus.sgzb.app.service.BackApplyService;
import com.bonus.sgzb.app.service.AppBackApplyService;
import com.bonus.sgzb.app.service.TmTaskService;
import com.bonus.sgzb.base.api.domain.BackApplyInfo;
import com.bonus.sgzb.common.core.utils.DateUtils;
@ -32,10 +32,10 @@ import java.util.List;
*/
@RestController
@RequestMapping("/base/back_apply")
public class BackApplyController extends BaseController {
public class AppBackApplyController extends BaseController {
@Resource
private BackApplyService backApplyService;
private AppBackApplyService backApplyService;
/**
* 服务对象

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/BackApplyAppMapper.java → sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/AppBackApplyAppMapper.java
View File

@ -10,7 +10,7 @@ import java.util.List;
@Mapper
public interface BackApplyAppMapper {
public interface AppBackApplyAppMapper {
/**
* 查询退料单位列表
*/

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/BackApplyService.java → sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/AppBackApplyService.java
View File

@ -9,7 +9,7 @@ import java.util.List;
/**
* @author bns_han
*/
public interface BackApplyService {
public interface AppBackApplyService {
/**
* 查询退料单位列表

58
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java → sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/AppBackApplyServiceImpl.java
View File

@ -3,8 +3,8 @@ package com.bonus.sgzb.app.service.impl;
import cn.hutool.core.collection.CollUtil;
import com.bonus.sgzb.app.domain.BmAgreementInfo;
import com.bonus.sgzb.app.domain.TmTask;
import com.bonus.sgzb.app.mapper.BackApplyAppMapper;
import com.bonus.sgzb.app.service.BackApplyService;
import com.bonus.sgzb.app.mapper.AppBackApplyAppMapper;
import com.bonus.sgzb.app.service.AppBackApplyService;
import com.bonus.sgzb.base.api.domain.BackApplyInfo;
import com.bonus.sgzb.base.api.domain.MachinePart;
import com.bonus.sgzb.common.core.utils.StringUtils;
@ -23,60 +23,60 @@ import java.util.Set;
*/
@Service
public class BackApplyServiceImpl implements BackApplyService {
public class AppBackApplyServiceImpl implements AppBackApplyService {
@Resource
private BackApplyAppMapper backApplyMapper;
private AppBackApplyAppMapper appBackApplyMapper;
@Override
public List<BmAgreementInfo> getbackUnit(BmAgreementInfo record) {
return backApplyMapper.getbackUnit(record);
return appBackApplyMapper.getbackUnit(record);
}
@Override
public List<BmAgreementInfo> getbackPro(BmAgreementInfo record) {
return backApplyMapper.getbackPro(record);
return appBackApplyMapper.getbackPro(record);
}
@Override
public int insertTask(TmTask task) {
return backApplyMapper.insertTask(task);
return appBackApplyMapper.insertTask(task);
}
@Override
public List<BackApplyInfo> getbackList(BackApplyInfo record) {
return backApplyMapper.getbackList(record);
return appBackApplyMapper.getbackList(record);
}
@Override
public int insertTaskAgreement(TmTask task) {
return backApplyMapper.insertTaskAgreement(task);
return appBackApplyMapper.insertTaskAgreement(task);
}
@Override
public int insertBackApply(TmTask task) {
return backApplyMapper.insertBackApply(task);
return appBackApplyMapper.insertBackApply(task);
}
@Override
public List<BackApplyInfo> materialList(BackApplyInfo record) {
return backApplyMapper.materialList(record);
return appBackApplyMapper.materialList(record);
}
@Override
public int upload(BackApplyInfo record) {
return backApplyMapper.upload(record);
return appBackApplyMapper.upload(record);
}
@Override
public List<BackApplyInfo> view(BackApplyInfo record) {
return backApplyMapper.view(record);
return appBackApplyMapper.view(record);
}
@Override
public int del(BackApplyInfo record) {
return backApplyMapper.del(record);
return appBackApplyMapper.del(record);
}
@Override
@ -85,9 +85,9 @@ public class BackApplyServiceImpl implements BackApplyService {
Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId();
if (roles.contains("admin")) {
//管理员可以看到所有退料申请
return backApplyMapper.examineList(record);
return appBackApplyMapper.examineList(record);
}
List<BackApplyInfo> backApplyInfos = backApplyMapper.examineList(record);
List<BackApplyInfo> backApplyInfos = appBackApplyMapper.examineList(record);
List<BackApplyInfo> backApplyInfoList = new ArrayList<>();
if (CollUtil.isNotEmpty(backApplyInfos)) {
if (roles.contains("jjfgs")) {
@ -112,7 +112,7 @@ public class BackApplyServiceImpl implements BackApplyService {
@Override
public List<BackApplyInfo> examineView(BackApplyInfo record) {
List<BackApplyInfo> backApplyInfoList = backApplyMapper.examineView(record);
List<BackApplyInfo> backApplyInfoList = appBackApplyMapper.examineView(record);
return getMaTypeDetails(backApplyInfoList);
}
@ -121,10 +121,10 @@ public class BackApplyServiceImpl implements BackApplyService {
for (BackApplyInfo backApplyInfo : view) {
if ("2".equals(backApplyInfo.getManageType())) {
List<MachinePart> machineParts = new ArrayList<>();
List<TmTask> typeIds = backApplyMapper.getMaTypeDetails(backApplyInfo);
List<TmTask> typeIds = appBackApplyMapper.getMaTypeDetails(backApplyInfo);
typeIds.removeIf(item -> item == null);
for (TmTask typeId : typeIds) {
MachinePart machinePart = backApplyMapper.getMachineParts(typeId);
MachinePart machinePart = appBackApplyMapper.getMachineParts(typeId);
machinePart.setPartNum((typeId.getPartNum() * Double.parseDouble(backApplyInfo.getPreNum())));
machineParts.add(machinePart);
}
@ -144,17 +144,17 @@ public class BackApplyServiceImpl implements BackApplyService {
record.setCreateBy(userId);
if (roles.contains("admin")) {
record.setStatus("1");
backApplyMapper.audit(record);
appBackApplyMapper.audit(record);
}
if (companyId != null && companyId == 101) {
record.setStatus("1");
backApplyMapper.audit(record);
appBackApplyMapper.audit(record);
}
if (companyId != null && companyId == 102) {
record.setStatus("3");
backApplyMapper.audit(record);
appBackApplyMapper.audit(record);
}
List<Integer> taskIdById = backApplyMapper.getTaskIdById(record);
List<Integer> taskIdById = appBackApplyMapper.getTaskIdById(record);
if (CollUtil.isNotEmpty(taskIdById)) {
for (Integer taskId : taskIdById) {
if (taskId == 1 || taskId == 3) {
@ -164,7 +164,7 @@ public class BackApplyServiceImpl implements BackApplyService {
}
if (num == taskIdById.size()) {
record.setTaskStatus("38");
backApplyMapper.updateTmTask(record);
appBackApplyMapper.updateTmTask(record);
}
return num;
}
@ -178,17 +178,17 @@ public class BackApplyServiceImpl implements BackApplyService {
record.setCreateBy(userid.toString());
if(roles.contains("admin")){
record.setStatus("2");
backApplyMapper.refuse(record);
appBackApplyMapper.refuse(record);
}
if (companyId != null && companyId == 101) {
record.setStatus("2");
backApplyMapper.refuse(record);
appBackApplyMapper.refuse(record);
}
if (companyId != null && companyId == 102) {
record.setStatus("4");
backApplyMapper.refuse(record);
appBackApplyMapper.refuse(record);
}
List<Integer> taskIdById = backApplyMapper.getTaskIdById(record);
List<Integer> taskIdById = appBackApplyMapper.getTaskIdById(record);
if (CollUtil.isNotEmpty(taskIdById)) {
for (Integer taskId : taskIdById) {
if (taskId == 2 || taskId == 4) {
@ -198,7 +198,7 @@ public class BackApplyServiceImpl implements BackApplyService {
}
if (num == taskIdById.size()) {
record.setTaskStatus("101");
backApplyMapper.updateTmTask(record);
appBackApplyMapper.updateTmTask(record);
}
return 1;
}

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/IotMachineMapper.java → sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/BaseIotMachineMapper.java
View File

@ -12,7 +12,7 @@ import java.util.List;
* iot设备管理mapper层
*/
@Mapper
public interface IotMachineMapper {
public interface BaseIotMachineMapper {
/**
* 查询设备类型

4
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java
View File

@ -34,7 +34,7 @@ public class MaMachineServiceImpl implements MaMachineService {
private MaPropInfoMapper maPropInfoMapper;
@Resource
private IotMachineMapper iotMachineMapper;
private BaseIotMachineMapper baseIotMachineMapper;
@Override
@ -44,7 +44,7 @@ public class MaMachineServiceImpl implements MaMachineService {
if (listMaMachine.size() > 0){
for (MaMachine ma : listMaMachine) {
//根据机具编码查询iot设备
List<IotRecordVo> iotRecordVoList = iotMachineMapper.selectList(ma.getMaCode());
List<IotRecordVo> iotRecordVoList = baseIotMachineMapper.selectList(ma.getMaCode());
ma.setIotNum(iotRecordVoList.size());
//判断是否绑定了iot设备
if (iotRecordVoList.size()>0){

7
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ApplyInfoServiceImpl.java
View File

@ -3,7 +3,6 @@ package com.bonus.sgzb.material.service.impl;
import com.bonus.sgzb.material.domain.LeaseApplyInfo;
import com.bonus.sgzb.material.mapper.ApplyInfoMapper;
import com.bonus.sgzb.material.service.ApplyInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@ -17,15 +16,15 @@ import java.util.List;
public class ApplyInfoServiceImpl implements ApplyInfoService {
@Resource
private ApplyInfoMapper leaseApplyInfoMapper;
private ApplyInfoMapper applyInfoMapper;
@Override
public int genderLeaseCode(LeaseApplyInfo record) {
return leaseApplyInfoMapper.insertSelective(record);
return applyInfoMapper.insertSelective(record);
}
@Override
public List<LeaseApplyInfo> selectIdByTaskId(Integer id) {
return leaseApplyInfoMapper.selectIdByTaskId(id);
return applyInfoMapper.selectIdByTaskId(id);
}
}

2
sgzb-modules/sgzb-material/src/main/resources/mapper/app/BackApplyAppMapper.xml → sgzb-modules/sgzb-material/src/main/resources/mapper/app/AppBackApplyAppMapper.xml
View File

@ -1,6 +1,6 @@
<?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.bonus.sgzb.app.mapper.BackApplyAppMapper">
<mapper namespace="com.bonus.sgzb.app.mapper.AppBackApplyAppMapper">
<resultMap id="BaseResultMap" type="com.bonus.sgzb.app.domain.BmAgreementInfo">
<!--@mbg.generated-->
<!--@Table bm_agreement_info-->

2
sgzb-modules/sgzb-material/src/main/resources/mapper/base/IotMachineMapper.xml → sgzb-modules/sgzb-material/src/main/resources/mapper/base/BaseIotMachineMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.sgzb.base.mapper.IotMachineMapper">
<mapper namespace="com.bonus.sgzb.base.mapper.BaseIotMachineMapper">
<select id="selectList" resultType="com.bonus.sgzb.base.domain.vo.IotRecordVo">

2
sgzb-ui/package.json
View File

@ -39,7 +39,7 @@
"@riophae/vue-treeselect": "0.4.0",
"axios": "0.24.0",
"clipboard": "2.0.8",
"core-js": "3.25.3",
"core-js": "^3.38.0",
"echarts": "5.4.0",
"element-ui": "2.15.13",
"file-saver": "^2.0.5",