zss
2024-12-20 0a61b6eca828ff3a131a4f2d5251612872f1f6bc
运行调整
已修改27个文件
80 ■■■■■ 文件已修改
cnas-manage/src/main/java/com/yuanchu/mom/controller/ManageDocumentAlterController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-manage/src/main/java/com/yuanchu/mom/controller/ManageDocumentCancelController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-manage/src/main/java/com/yuanchu/mom/controller/ManageDocumentControlledController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-manage/src/main/java/com/yuanchu/mom/controller/ManageDocumentIssueRecycleController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-manage/src/main/java/com/yuanchu/mom/controller/ManageDocumentListController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-manage/src/main/java/com/yuanchu/mom/controller/ManageRecordAuditController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-manage/src/main/java/com/yuanchu/mom/controller/ManageRecordCancelController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-manage/src/main/java/com/yuanchu/mom/controller/ManageRecordCheckController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-manage/src/main/java/com/yuanchu/mom/controller/ManageRecordIntervalsController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-manage/src/main/java/com/yuanchu/mom/controller/ManageRecordIntervalsTotalController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-manage/src/main/java/com/yuanchu/mom/controller/ManageRecordIssueRecycleController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-manage/src/main/java/com/yuanchu/mom/controller/ManageRecordTotalController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-manage/src/main/java/com/yuanchu/mom/controller/ManageRecordVerifyController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-process/src/main/java/com/yuanchu/mom/controller/ProcessComplainController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-process/src/main/java/com/yuanchu/mom/controller/ProcessDealController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-process/src/main/java/com/yuanchu/mom/controller/ProcessEvaluateController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-process/src/main/java/com/yuanchu/mom/controller/ProcessOrderController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-process/src/main/java/com/yuanchu/mom/controller/ProcessReportController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-process/src/main/java/com/yuanchu/mom/controller/ProcessSampleController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-process/src/main/java/com/yuanchu/mom/controller/ProcessTotalSampleController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-process/src/main/java/com/yuanchu/mom/controller/ProcessTotaldealController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-resource-require/src/main/java/com/yuanchu/mom/controller/FeIlluminationController.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-resource-require/src/main/java/com/yuanchu/mom/controller/FeLightningProtectionController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-resource-require/src/main/java/com/yuanchu/mom/controller/FePowerStableController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-resource-require/src/main/java/com/yuanchu/mom/controller/FeTempHumDateController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
system-run/pom.xml 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-manage/src/main/java/com/yuanchu/mom/controller/ManageDocumentAlterController.java
@@ -30,7 +30,7 @@
 */
@RestController
@RequestMapping("/manageDocumentAlter")
@CustomClazzName(name = "体系管理要求", index = 10)
public class ManageDocumentAlterController {
    @Resource
cnas-manage/src/main/java/com/yuanchu/mom/controller/ManageDocumentCancelController.java
@@ -29,7 +29,7 @@
 */
@RestController
@RequestMapping("/manageDocumentCancel")
@CustomClazzName(name = "体系管理要求", index = 10)
public class ManageDocumentCancelController {
    @Resource
cnas-manage/src/main/java/com/yuanchu/mom/controller/ManageDocumentControlledController.java
@@ -29,7 +29,7 @@
 */
@RestController
@RequestMapping("/manageDocumentControlled")
@CustomClazzName(name = "体系管理要求",index = 10)
public class ManageDocumentControlledController {
    @Resource
cnas-manage/src/main/java/com/yuanchu/mom/controller/ManageDocumentIssueRecycleController.java
@@ -30,7 +30,7 @@
 */
@RestController
@RequestMapping("/manageDocumentIssueRecycle")
@CustomClazzName(name = "体系管理要求",index = 10)
public class ManageDocumentIssueRecycleController {
    @Resource
cnas-manage/src/main/java/com/yuanchu/mom/controller/ManageDocumentListController.java
@@ -36,7 +36,7 @@
 */
@RestController
@RequestMapping("/manageDocumentList")
@CustomClazzName(name = "体系管理要求",index = 10)
public class ManageDocumentListController {
    @Resource
cnas-manage/src/main/java/com/yuanchu/mom/controller/ManageRecordAuditController.java
@@ -29,7 +29,7 @@
 */
@RestController
@RequestMapping("/manageRecordAudit")
@CustomClazzName(name = "体系管理要求", index = 10)
public class ManageRecordAuditController {
    @Resource
cnas-manage/src/main/java/com/yuanchu/mom/controller/ManageRecordCancelController.java
@@ -31,7 +31,7 @@
 */
@RestController
@RequestMapping("/manageRecordCancel")
@CustomClazzName(name = "体系管理要求", index = 10)
public class ManageRecordCancelController {
    @Resource
cnas-manage/src/main/java/com/yuanchu/mom/controller/ManageRecordCheckController.java
@@ -31,7 +31,7 @@
 */
@RestController
@RequestMapping("/manageRecordCheck")
@CustomClazzName(name = "体系管理要求", index = 10)
public class ManageRecordCheckController {
    @Resource
cnas-manage/src/main/java/com/yuanchu/mom/controller/ManageRecordIntervalsController.java
@@ -30,7 +30,7 @@
 */
@RestController
@RequestMapping("/manageRecordIntervals")
@CustomClazzName(name = "体系管理要求", index = 10)
public class ManageRecordIntervalsController {
    @Resource
cnas-manage/src/main/java/com/yuanchu/mom/controller/ManageRecordIntervalsTotalController.java
@@ -28,7 +28,7 @@
 */
@RestController
@RequestMapping("/manageRecordIntervalsTotal")
@CustomClazzName(name = "体系管理要求", index = 10)
public class ManageRecordIntervalsTotalController {
    @Resource
cnas-manage/src/main/java/com/yuanchu/mom/controller/ManageRecordIssueRecycleController.java
@@ -32,7 +32,7 @@
 */
@RestController
@RequestMapping("/manageRecordIssueRecycle")
@CustomClazzName(name = "体系管理要求", index = 10)
public class ManageRecordIssueRecycleController {
    @Resource
cnas-manage/src/main/java/com/yuanchu/mom/controller/ManageRecordTotalController.java
@@ -26,7 +26,7 @@
 */
@RestController
@RequestMapping("/manageRecordTotal")
@CustomClazzName(name = "体系管理要求", index = 10)
public class ManageRecordTotalController {
    @Resource
cnas-manage/src/main/java/com/yuanchu/mom/controller/ManageRecordVerifyController.java
@@ -28,7 +28,7 @@
 */
@RestController
@RequestMapping("/manageRecordVerify")
@CustomClazzName(name = "体系管理要求", index = 10)
public class ManageRecordVerifyController {
    @Resource
cnas-process/src/main/java/com/yuanchu/mom/controller/ProcessComplainController.java
@@ -29,7 +29,7 @@
 */
@RestController
@RequestMapping("/processComplain")
@CustomClazzName(name = "过程要求",index = 9)
public class ProcessComplainController {
    @Resource
cnas-process/src/main/java/com/yuanchu/mom/controller/ProcessDealController.java
@@ -28,7 +28,7 @@
 */
@RestController
@RequestMapping("/processDeal")
@CustomClazzName(name = "过程要求",index = 9)
public class ProcessDealController {
    @Resource
cnas-process/src/main/java/com/yuanchu/mom/controller/ProcessEvaluateController.java
@@ -29,7 +29,7 @@
 */
@RestController
@RequestMapping("/processEvaluate")
@CustomClazzName(name = "过程要求",index = 9)
public class ProcessEvaluateController {
    @Resource
cnas-process/src/main/java/com/yuanchu/mom/controller/ProcessOrderController.java
@@ -27,7 +27,7 @@
 */
@RestController
@RequestMapping("/processOrder")
@CustomClazzName(name = "过程要求",index = 9)
public class ProcessOrderController {
    @Resource
cnas-process/src/main/java/com/yuanchu/mom/controller/ProcessReportController.java
@@ -31,7 +31,7 @@
 */
@RestController
@RequestMapping("/processReport")
@CustomClazzName(name = "过程要求",index = 9)
public class ProcessReportController {
    @Resource
cnas-process/src/main/java/com/yuanchu/mom/controller/ProcessSampleController.java
@@ -28,7 +28,7 @@
 */
@RestController
@RequestMapping("/processSample")
@CustomClazzName(name = "过程要求",index = 9)
public class ProcessSampleController {
    @Resource
cnas-process/src/main/java/com/yuanchu/mom/controller/ProcessTotalSampleController.java
@@ -27,7 +27,7 @@
 */
@RestController
@RequestMapping("/processTotalSample")
@CustomClazzName(name = "过程要求",index = 9)
public class ProcessTotalSampleController {
    @Resource
cnas-process/src/main/java/com/yuanchu/mom/controller/ProcessTotaldealController.java
@@ -28,7 +28,7 @@
 */
@RestController
@RequestMapping("/processTotaldeal")
@CustomClazzName(name = "过程要求",index = 9)
public class ProcessTotaldealController {
    @Resource
cnas-resource-require/src/main/java/com/yuanchu/mom/controller/FeIlluminationController.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.CustomClazzName;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.dto.FeIlluminationAddDto;
import com.yuanchu.mom.dto.FeIlluminationDto;
import com.yuanchu.mom.pojo.FeIllumination;
@@ -30,7 +31,7 @@
 */
@RestController
@RequestMapping("/feIllumination")
@CustomClazzName(name = "资源要求",index = 6)
public class FeIlluminationController {
    @Autowired
@@ -39,6 +40,7 @@
    @Autowired
    private FeIlluminationDetectionAreaService feIlluminationDetectionAreaService;
    @ValueClassify(value = "设施和环境条件要求")
    @PostMapping("addFeLightningProtection")
    @ApiOperation("设施和环境条件要求-照度记录表-检测区域 新增/修改")
    public Result<?> addFeLightningProtection(@RequestBody FeIlluminationAddDto feIlluminationAddDto) {
@@ -50,6 +52,7 @@
        return Result.success();
    }
    @ValueClassify(value = "设施和环境条件要求")
    @DeleteMapping("deleteFeLightningProtection")
    @ApiOperation("设施和环境条件要求-照度记录表-检测区域 删除")
    public Result<?> deleteFeLightningProtection(@RequestParam("intensityIlluminationId") Integer intensityIlluminationId) {
@@ -57,6 +60,7 @@
        return Result.success();
    }
    @ValueClassify(value = "设施和环境条件要求")
    @GetMapping("getFeLightningProtection")
    @ApiOperation("照度记录表-检测区域 查询")
    public Result<IPage<FeIlluminationDto>> getFeLightningProtection(Page page) {
@@ -64,12 +68,14 @@
        return Result.success(page1);
    }
    @ValueClassify(value = "设施和环境条件要求")
    @DeleteMapping("deleteFeIlluminationDetectionArea")
    @ApiOperation("照度记录表-检测区域 删除")
    public Result<?> deleteFeIlluminationDetectionArea(@RequestParam("detectionAreaId") Integer detectionAreaId) {
        return Result.success(feIlluminationDetectionAreaService.removeById(detectionAreaId));
    }
    @ValueClassify(value = "设施和环境条件要求")
    @GetMapping("getFeIlluminationDetectionArea")
    @ApiOperation("照度记录表-检测区域 根据照度记录查询")
    public Result<?> getFeIlluminationDetectionArea(@RequestParam("intensityIlluminationId") Integer intensityIlluminationId) {
cnas-resource-require/src/main/java/com/yuanchu/mom/controller/FeLightningProtectionController.java
@@ -39,7 +39,7 @@
@Api(tags = "设施和环境条件要求-防雷检测")
@RestController
@RequestMapping("/feLightningProtection")
@CustomClazzName(name = "资源要求",index = 6)
public class FeLightningProtectionController {
    @Autowired
@@ -62,7 +62,7 @@
    @ValueClassify(value = "设施和环境条件要求")
    @DeleteMapping("deleteLightningProtectionDetection")
    @ApiOperation("设施和环境条件要求-防雷检测删除")
    public Result<?> deleteFeLightningProtection(@RequestParam("lightningProtectionId") Integer lightningProtectionId) {
    public Result<?> deleteLightningProtectionDetection(@RequestParam("lightningProtectionId") Integer lightningProtectionId) {
        feLightningProtectionService.removeById(lightningProtectionId);
        return Result.success();
    }
@@ -70,7 +70,7 @@
    @ValueClassify(value = "设施和环境条件要求")
    @GetMapping("getLightningProtectionDetection")
    @ApiOperation("设施和环境条件要求-防雷检测查询")
    public Result<IPage<FeLightningProtection>> getFeLightningProtection(Page page) {
    public Result<IPage<FeLightningProtection>> getLightningProtectionDetection(Page page) {
        IPage<FeLightningProtection> page1 = feLightningProtectionService.page(page);
        return Result.success(page1);
    }
cnas-resource-require/src/main/java/com/yuanchu/mom/controller/FePowerStableController.java
@@ -31,7 +31,6 @@
@Api(tags = "设施和环境条件-设施和环境条件要求-电源稳定性")
@RestController
@RequestMapping("/fePowerStable")
@CustomClazzName(name = "资源要求-设施和环境条件要求",index = 6)
public class FePowerStableController {
    @Autowired
cnas-resource-require/src/main/java/com/yuanchu/mom/controller/FeTempHumDateController.java
@@ -28,7 +28,7 @@
 */
@RestController
@RequestMapping("/feTempHumDate")
@CustomClazzName(name = "资源要求",index = 6)
public class FeTempHumDateController {
    @Autowired
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
@@ -25,7 +25,9 @@
import com.yuanchu.mom.utils.QYWXApi;
import com.yuanchu.mom.utils.QueryWrappers;
import com.yuanchu.mom.vo.SampleDefectsFatherVo;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -89,8 +91,8 @@
    CustomMapper customMapper;
    @Resource
    QYWXApi qywxApi;
    @Resource
    private ProcessOrder1Mapper processOrderMapper;
    @Autowired
    ProcessOrder1Mapper processOrderMapper;
    //获取检验下单数据
system-run/pom.xml
@@ -53,6 +53,21 @@
            <artifactId>performance-server</artifactId>
            <version>0.0.1-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>com.yuanchu.mom</groupId>
            <artifactId>cnas-manage</artifactId>
            <version>0.0.1-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>com.yuanchu.mom</groupId>
            <artifactId>cnas-process</artifactId>
            <version>0.0.1-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>com.yuanchu.mom</groupId>
            <artifactId>cnas-resource-require</artifactId>
            <version>0.0.1-SNAPSHOT</version>
        </dependency>
        <!--druid-->
        <dependency>