diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/SgzbMaterialApplication.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/SgzbMaterialApplication.java similarity index 97% rename from sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/SgzbMaterialApplication.java rename to sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/SgzbMaterialApplication.java index 8731ebf..2e82735 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/SgzbMaterialApplication.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/SgzbMaterialApplication.java @@ -1,4 +1,4 @@ -package com.bonus.sgzb.material; +package com.bonus.sgzb; import com.bonus.sgzb.common.security.annotation.EnableCustomConfig; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/AppBackApplyController.java similarity index 98% rename from sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java rename to sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/AppBackApplyController.java index 99ffa96..97a49fc 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/AppBackApplyController.java @@ -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; /** * 服务对象 diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/BackApplyAppMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/AppBackApplyAppMapper.java similarity index 97% rename from sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/BackApplyAppMapper.java rename to sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/AppBackApplyAppMapper.java index 6086035..3563a06 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/BackApplyAppMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/AppBackApplyAppMapper.java @@ -10,7 +10,7 @@ import java.util.List; @Mapper -public interface BackApplyAppMapper { +public interface AppBackApplyAppMapper { /** * 查询退料单位列表 */ diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/BackApplyService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/AppBackApplyService.java similarity index 98% rename from sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/BackApplyService.java rename to sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/AppBackApplyService.java index 08d9c01..a2da06f 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/BackApplyService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/AppBackApplyService.java @@ -9,7 +9,7 @@ import java.util.List; /** * @author bns_han */ -public interface BackApplyService { +public interface AppBackApplyService { /** * 查询退料单位列表 diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/AppBackApplyServiceImpl.java similarity index 76% rename from sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java rename to sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/AppBackApplyServiceImpl.java index 674c0c8..9ef2b9e 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/AppBackApplyServiceImpl.java @@ -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 getbackUnit(BmAgreementInfo record) { - return backApplyMapper.getbackUnit(record); + return appBackApplyMapper.getbackUnit(record); } @Override public List 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 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 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 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 backApplyInfos = backApplyMapper.examineList(record); + List backApplyInfos = appBackApplyMapper.examineList(record); List backApplyInfoList = new ArrayList<>(); if (CollUtil.isNotEmpty(backApplyInfos)) { if (roles.contains("jjfgs")) { @@ -112,7 +112,7 @@ public class BackApplyServiceImpl implements BackApplyService { @Override public List examineView(BackApplyInfo record) { - List backApplyInfoList = backApplyMapper.examineView(record); + List 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 machineParts = new ArrayList<>(); - List typeIds = backApplyMapper.getMaTypeDetails(backApplyInfo); + List 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 taskIdById = backApplyMapper.getTaskIdById(record); + List 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 taskIdById = backApplyMapper.getTaskIdById(record); + List 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; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/IotMachineMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/BaseIotMachineMapper.java similarity index 91% rename from sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/IotMachineMapper.java rename to sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/BaseIotMachineMapper.java index 0c46e46..b3a5da4 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/IotMachineMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/BaseIotMachineMapper.java @@ -12,7 +12,7 @@ import java.util.List; * iot设备管理mapper层 */ @Mapper -public interface IotMachineMapper { +public interface BaseIotMachineMapper { /** * 查询设备类型 diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java index 18784e2..9d718f2 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java @@ -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 iotRecordVoList = iotMachineMapper.selectList(ma.getMaCode()); + List iotRecordVoList = baseIotMachineMapper.selectList(ma.getMaCode()); ma.setIotNum(iotRecordVoList.size()); //判断是否绑定了iot设备 if (iotRecordVoList.size()>0){ diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ApplyInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ApplyInfoServiceImpl.java index a85d25e..b13043a 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ApplyInfoServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ApplyInfoServiceImpl.java @@ -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 selectIdByTaskId(Integer id) { - return leaseApplyInfoMapper.selectIdByTaskId(id); + return applyInfoMapper.selectIdByTaskId(id); } } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/BackApplyAppMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/AppBackApplyAppMapper.xml similarity index 99% rename from sgzb-modules/sgzb-material/src/main/resources/mapper/app/BackApplyAppMapper.xml rename to sgzb-modules/sgzb-material/src/main/resources/mapper/app/AppBackApplyAppMapper.xml index 5d13413..1a84b81 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/BackApplyAppMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/AppBackApplyAppMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/IotMachineMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/BaseIotMachineMapper.xml similarity index 87% rename from sgzb-modules/sgzb-material/src/main/resources/mapper/base/IotMachineMapper.xml rename to sgzb-modules/sgzb-material/src/main/resources/mapper/base/BaseIotMachineMapper.xml index f47124b..3476aff 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/IotMachineMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/BaseIotMachineMapper.xml @@ -2,7 +2,7 @@ - +