南网oss登录接口修改

pom.xml

@@ -222,6 +222,32 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-bootstrap</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-core</artifactId>
+            <version>8.5.94</version>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <artifactId>tomcat-annotations-api</artifactId>
+                    <groupId>org.apache.tomcat</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-el</artifactId>
+            <version>8.5.94</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-websocket</artifactId>
+            <version>8.5.94</version>
+            <scope>compile</scope>
+        </dependency>
+
     </dependencies>
 
     <build>

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java

@@ -16,38 +16,101 @@ import java.util.List;
 public interface BackApplyMapper {
     /**
      * 获取退料审核列表
+     * @param bean
+     * @return
      */
     List<BackApplyInfo> getBackApplyList(BackApplyInfo bean);
 
     /**
      * 获取在用物料列表
+     * @param bean
+     * @return
      */
     List<BackApplyInfo> getMaterialList(BackApplyInfo bean);
 
+    /**
+     * 查询
+     * @param date
+     * @param taskType
+     * @return
+     */
     int selectTaskNumByMonth(@Param("date") Date date, @Param("taskType") Integer taskType);
 
+    /**
+     * 增加
+     * @param bean
+     * @return
+     */
     int insertTask(BackApplyInfo bean);
 
+    /**
+     * 增加
+     * @param bean
+     * @return
+     */
     int insertTaskAgreement(BackApplyInfo bean);
 
+    /**
+     * 增加
+     * @param bean
+     * @return
+     */
     int insertBackApply(BackApplyInfo bean);
 
+    /**
+     * 上传
+     * @param bean
+     * @return
+     */
     int upload(BackApplyInfo bean);
 
+    /**
+     * 查询
+     * @param bean
+     * @return
+     */
     List<BackApplyInfo> getView(BackApplyInfo bean);
 
+    /**
+     * 修改
+     * @param detailsId
+     * @param num
+     * @return
+     */
     int setModify(@Param("detailsId") String detailsId, @Param("num") String num);
 
+    /**
+     * 删除
+     * @param bean
+     * @return
+     */
     int del(BackApplyInfo bean);
 
+    /**
+     * 通过
+     * @param bean
+     * @return
+     */
     int audit(BackApplyInfo bean);
 
+    /**
+     * 驳回
+     * @param bean
+     * @return
+     */
     int refuse(BackApplyInfo bean);
 
+    /**
+     * 查询类型树
+     * @param bean
+     * @return
+     */
     List<TypeTreeNode> getUseTypeTree(BackApplyInfo bean);
 
     /**
      * 退料申请导出
+     * @param bean
+     * @return
      */
     List<BackApplyInfo> exportList(BackApplyInfo bean);
 }

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseAccessoryMapper.java

@@ -26,6 +26,7 @@ public interface PurchaseAccessoryMapper
     public int insertPurchasePartInfo(PurchasePartInfo purchasePartInfo);
 
     /**
+     * 新增
     * @param purchasePartDetailsList
     * @return 结果
     * @description 新增新购任务详情
@@ -34,12 +35,32 @@ public interface PurchaseAccessoryMapper
     */
     int insertPurchasePartDetailsList(@Param("purchasePartDetailsList") List<PurchasePartDetails> purchasePartDetailsList);
 
+    /**
+     *查询新购配件任务验收列表
+     * @param purchasePartInfo
+     * @return
+     */
     List<PurchasePartInfo> selectPurchasePartInfoList(PurchasePartInfo purchasePartInfo);
 
+    /**
+     * 查询
+     * @param taskId
+     * @return
+     */
     String selectTypeNameByTaskId(Long taskId);
 
+    /**
+     * 查询
+     * @param taskId
+     * @return
+     */
     PurchasePartInfo selectPurchasePartInfoByTaskId(Long taskId);
 
+    /**
+     * 查询
+     * @param purchasePartDetails
+     * @return
+     */
     List<PurchasePartDetails> selectPurchasePartDetailsList(PurchasePartDetails purchasePartDetails);
 
     /**
@@ -70,8 +91,19 @@ public interface PurchaseAccessoryMapper
      */
     List<PurchasePartInfo> selectPutInListList(PurchasePartInfo purchasePartInfo);
 
+    /**
+     * 修改
+     * @param purchasePartDetails
+     * @return
+     */
     int updatePurchasePartDetails(PurchasePartDetails purchasePartDetails);
 
+    /**
+     * 查询
+     * @param taskId
+     * @param status
+     * @return
+     */
     int selectPurchasePartDetailsStatus(@Param("taskId") Long taskId,@Param("status") int status);
 
     /**
@@ -81,10 +113,26 @@ public interface PurchaseAccessoryMapper
      */
     List<PurchasePartInfo> getPartList(String level);
 
+    /**
+     * 查询
+     * @param purchasePartDetails
+     * @return
+     */
     List<PurchasePartDetails> selectPutinDetails(PurchasePartDetails purchasePartDetails);
 
+    /**
+     * 修改
+     * @param partId
+     * @param inputNum
+     * @return
+     */
     int updatePartTypeNum(@Param("partId") Long partId,@Param("inputNum") BigDecimal inputNum);
 
+    /**
+     * 查询
+     * @param id
+     * @return
+     */
     int setlectStatusById(Long id);
 
     /**

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckDetailsMapper.java

@@ -63,19 +63,61 @@ public interface PurchaseCheckDetailsMapper {
      */
     public int deletePurchaseCheckDetailsByTaskIds(Long[] taskIds);
 
+    /**
+     * 插入
+     * @param purchaseCheckDetailsList
+     * @return
+     */
     int insertPurchaseCheckDetailsList(@Param("purchaseCheckDetailsList") List<PurchaseCheckDetails> purchaseCheckDetailsList);
 
+    /**
+     * 修改
+     * @param taskId
+     * @return
+     */
     int updateCheckDetailsByTaskId(Long taskId);
 
+    /**
+     * 查询
+     * @param taskId
+     * @return
+     */
     int selectPurchaseCheckDetailsStatus(Long taskId);
 
+    /**
+     *删除全部的任务详情信息
+     * @param taskId
+     * @return
+     */
     int deleteCheckDetailsByTaskId(Long taskId);
 
+    /**
+     * 修改
+     * @param purchaseCheckDetails
+     * @return
+     */
     int updateByTaskIdTypeId(PurchaseCheckDetails purchaseCheckDetails);
 
+    /**
+     * 修改
+     * @param purchaseCheckDetails
+     * @return
+     */
     int updateBindByTaskIdTypeId(PurchaseCheckDetails purchaseCheckDetails);
 
+    /**
+     * 查询
+     * @param taskId
+     * @param typeId
+     * @return
+     */
     BigDecimal selectInputNumByTypeId(@Param("taskId") Long taskId, @Param("typeId") Long typeId);
 
+    /**
+     * 查询
+     * @param typeId
+     * @param taskId
+     * @return
+     */
     Integer selectBindNumByTypeId(@Param("typeId") Long typeId, @Param("taskId") Long taskId);
 }

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckInfoMapper.java

@@ -64,6 +64,11 @@ public interface PurchaseCheckInfoMapper
      */
     public int deletePurchaseCheckInfoByTaskIds(Long[] taskIds);
 
+    /**
+     * 查询新购入库任务列表
+     * @param taskId
+     * @return
+     */
     String selectTypeNameByTaskId(Long taskId);
 
     int insertBmNoticeInfo(BmNoticeInfo bmNoticeInfo);

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/AgreementInfoService.java

@@ -31,28 +31,28 @@ public interface AgreementInfoService {
     List<AgreementInfo> getProjectList();
 
     /**
-     *添加
+     * 添加
      * @param bean
      * @return
      */
     int add(AgreementInfo bean);
 
     /**
-     *修改
+     * 修改
      * @param bean
      * @return
      */
     int update(AgreementInfo bean);
 
     /**
-     *
+     * 根据id删除
      * @param bean
      * @return
      */
     AjaxResult deleteByIds(AgreementInfo bean);
 
     /**
-     *
+     * 查询
      * @param bean
      * @return
      */
@@ -60,6 +60,8 @@ public interface AgreementInfoService {
 
     /**
      * 协议管理导出
+     * @param agreementInfo
+     * @return
      */
     List<AgreementInfo> exportList(AgreementInfo agreementInfo);
 }

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/BackApplyService.java

@@ -13,37 +13,97 @@ import java.util.List;
 public interface BackApplyService {
     /**
      * 获取退料审核列表
+     * @param bean
+     * @return
      */
     List<BackApplyInfo> getBackApplyList(BackApplyInfo bean);
     /**
      * 获取在用物料列表
+     * @param bean
+     * @return
      */
     List<BackApplyInfo> getMaterialList(BackApplyInfo bean);
 
+    /**
+     * 生成后台退料编号
+     * @return
+     */
     String genderBackCode();
 
+    /**
+     * 创建任务
+     * @param bean
+     * @return
+     */
     int insertSelective(BackApplyInfo bean);
 
+    /**
+     * 创建设备
+     * @param bean
+     * @return
+     */
     int insertTaskAgreement(BackApplyInfo bean);
 
+    /**
+     * 创建领料任务
+     * @param bean
+     * @return
+     */
     int insertBackApply(BackApplyInfo bean);
 
+    /**
+     * 上传
+     * @param bean
+     * @return
+     */
     int upload(BackApplyInfo bean);
 
+    /**
+     * 退料申请详情
+     * @param bean
+     * @return
+     */
     List<BackApplyInfo> getView(BackApplyInfo bean);
 
+    /**
+     * 退料申请详情修改
+     * @param bean
+     * @return
+     */
     AjaxResult setModify(BackApplyInfo bean);
 
+    /**
+     * 删除
+     * @param bean
+     * @return
+     */
     AjaxResult del(BackApplyInfo bean);
 
+    /**
+     * 退料审核-通过
+     * @param record
+     * @return
+     */
     AjaxResult audit(BackApplyInfo record);
 
+    /**
+     * 退料审核-驳回
+     * @param record
+     * @return
+     */
     AjaxResult refuse(BackApplyInfo record);
 
+    /**
+     * 在用设备类型树
+     * @param bean
+     * @return
+     */
     AjaxResult getUseTypeTree(BackApplyInfo bean);
 
     /**
      * 退料申请导出
+     * @param bean
+     * @return
      */
     List<BackApplyInfo> exportList(BackApplyInfo bean);
 }

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseAccessoryService.java

@@ -33,17 +33,16 @@ public interface IPurchaseAccessoryService
 
     /**
      * 查询新购配件任务purchase_part_info
-     *
+     * @param taskId
-     * @param taskId 新购配件任务purchase_part_info主键
+     * @param keyWord
-     * @return 新购配件任务purchase_part_info
+     * @return
      */
     PurchasePartInfo selectPurchasePartInfoByTaskId(Long taskId, String keyWord);
 
     /**
      * 修改新购配件任务purchase_part_info
-     *
+     * @param purchasePartInfo
-     * @param purchasePartInfo 新购配件任务purchase_part_info
+     * @return
-     * @return 结果
      */
     int updatePurchaseCheckInfo(PurchasePartInfo purchasePartInfo);
 
@@ -61,6 +60,11 @@ public interface IPurchaseAccessoryService
     */
     List<PurchasePartInfo> selectPutInListList(PurchasePartInfo purchasePartInfo);
 
+    /**
+     *  新购配件验收
+     * @param purchasePartDetailsList
+     * @return
+     */
     int updatePurchaseCheckDetails(List<PurchasePartDetails> purchasePartDetailsList);
 
     /**
@@ -70,8 +74,18 @@ public interface IPurchaseAccessoryService
     */
     List<PurchasePartInfo> getPartList(String level);
 
+    /**
+     * 获取新购配件入库详细信息
+     * @param purchasePartDetails
+     * @return
+     */
     List<PurchasePartDetails> selectPutinDetails(PurchasePartDetails purchasePartDetails);
 
+    /**
+     * 新购配件入库审核
+     * @param purchasePartDetails
+     * @return
+     */
     int checkInput(List<PurchasePartDetails> purchasePartDetails);
 
     /**

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseCheckInfoService.java

@@ -17,9 +17,9 @@ public interface IPurchaseCheckInfoService
 {
     /**
      * 查询新购验收任务purchase_check_info
-     * 
+     * @param taskId
-     * @param taskId 新购验收任务purchase_check_info主键
+     * @param keyword
-     * @return 新购验收任务purchase_check_info
+     * @return
      */
     public PurchaseCheckInfo selectPurchaseCheckInfoByTaskId(Long taskId,String keyword);
 
@@ -41,9 +41,9 @@ public interface IPurchaseCheckInfoService
 
     /**
      * 修改新购验收任务purchase_check_info
-     * 
+     * @param purchaseCheckInfo
-     * @param purchaseCheckInfo 新购验收任务purchase_check_info
+     * @return
-     * @return 结果
+     * @throws Exception
      */
     public int updatePurchaseCheckInfo(PurchaseCheckInfo purchaseCheckInfo) throws Exception;
 
@@ -63,16 +63,32 @@ public interface IPurchaseCheckInfoService
      */
     public int deletePurchaseCheckInfoByTaskId(Long taskId);
 
+    /**
+     * 验收通知
+     * @param noticeInfoVO
+     * @return
+     * @throws Exception
+     */
     Boolean insertBmNoticeInfo(NoticeInfoVO noticeInfoVO) throws Exception;
 
+    /**
+     * 查询新购入库任务列表
+     * @param purchaseCheckInfo
+     * @return
+     */
     List<PurchaseCheckInfo> selectPutInListList(PurchaseCheckInfo purchaseCheckInfo);
 
     /**
      * 新购工机具验收导出
+     * @param purchaseCheckInfo
+     * @return
      */
     List<PurchaseCheckInfo> exportList(PurchaseCheckInfo purchaseCheckInfo);
+
     /**
      * 新购工机具入库导出
+     * @param purchaseCheckInfo
+     * @return
      */
     List<PurchaseInput> putInExportList(PurchaseCheckInfo purchaseCheckInfo);
 }

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseMacodeInfoService.java

@@ -1,6 +1,5 @@
 package com.bonus.sgzb.material.service;
 
-import com.alibaba.fastjson.JSONObject;
 import com.bonus.sgzb.base.api.domain.MaMachineLabel;
 import com.bonus.sgzb.common.core.web.domain.AjaxResult;
 import com.bonus.sgzb.material.domain.MaInputRecord;
@@ -36,17 +35,17 @@ public interface IPurchaseMacodeInfoService
 
     /**
      * 新增新购验收编号管理purchase_macode_info
-     * 
+     * @param purchaseMacodeInfoList
-     * @param purchaseMacodeInfoList 新购验收编号管理purchase_macode_info
+     * @return
-     * @return 结果
+     * @throws Exception
      */
     public AjaxResult insertPurchaseMacodeInfo(List<PurchaseMacodeInfo> purchaseMacodeInfoList) throws Exception;
 
     /**
      * 修改新购验收编号管理purchase_macode_info
-     * 
+     * @param purchaseMacodeInfoList
-     * @param purchaseMacodeInfo 新购验收编号管理purchase_macode_info
+     * @return
-     * @return 结果
+     * @throws Exception
      */
     public int updatePurchaseMacodeInfo(List<PurchaseMacodeInfo> purchaseMacodeInfoList) throws Exception;
 
@@ -66,16 +65,45 @@ public interface IPurchaseMacodeInfoService
      */
     public int deletePurchaseMacodeInfoByTaskId(Long taskId);
 
+    /**
+     * 生成设备编号
+     * @param maMachineLabel
+     * @return
+     */
     String generateEquipmentNumber(MaMachineLabel maMachineLabel);
 
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
     int deletePurchaseMacodeInfoById(Long id);
-
+    /**
+     * 修改编码管理的入库状态
+     * @param maInputVO
+     * @return
+     */
     int modifyManageStatus(MaInputVO maInputVO);
 
+    /**
+     * 删除新购验收编号管理
+     * @param maCode
+     * @return
+     */
     int deletePurchaseMacodeInfoByMaCode(String maCode);
 
+    /**
+     * 获取新购验收编号管理详细信息
+     * @param purchaseMacodeInfo
+     * @return
+     */
     List<PurchaseMacodeInfo> selectPurchaseMacodeInfo(PurchaseMacodeInfo purchaseMacodeInfo);
 
+    /**
+     * 新购入库清单明细
+     * @param purchaseMacodeInfo
+     * @return
+     */
     List<PurchaseMacodeInfo> selectPutinDetails(PurchaseMacodeInfo purchaseMacodeInfo);
 
 }

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IRepairAuditDetailsService.java

@@ -63,12 +63,33 @@ public interface IRepairAuditDetailsService
      */
     public int deleteRepairAuditDetailsById(Long id);
 
+    /**
+     * 查询修试审核任务列表
+     * @param repairAuditDetails
+     * @return
+     */
     List<ScrapApplyDetailsVO> selectRepairQuestList(RepairAuditDetails repairAuditDetails);
 
+    /**
+     * 查看修饰审核任务详细列表
+     * @param repairAuditDetails
+     * @return
+     */
     List<RepairAuditDetails> getRepairAuditList(RepairAuditDetails repairAuditDetails);
 
+    /**
+     * 修饰任务审核
+     * @param scrapAudit
+     * @return
+     * @throws Exception
+     */
     int auditRepair(ScrapAudit scrapAudit) throws Exception;
 
+    /**
+     * 导出修试审核任务列表
+     * @param bean
+     * @return
+     */
     List<RepairAuditDetailsVO> exportRepairQuestList(RepairAuditDetails bean);
 }
 

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IScrapApplyDetailsService.java

@@ -62,9 +62,25 @@ public interface IScrapApplyDetailsService
      */
     public int deleteScrapApplyDetailsById(Long id);
 
+    /**
+     * 查看报废任务详细列表
+     * @param scrapApplyDetails
+     * @return
+     */
     List<ScrapApplyDetails> getScrapAuditList(ScrapApplyDetails scrapApplyDetails);
 
+    /**
+     * 报废任务审核
+     * @param scrapAudit
+     * @return
+     * @throws Exception
+     */
     int auditScrap(ScrapAudit scrapAudit) throws Exception;
 
+    /**
+     * 导出报废任务列表
+     * @param bean
+     * @return
+     */
     List<ScrapApplyDetailsVO> exportScrapApplyDetailsList(ScrapApplyDetails bean);
 }