设施和环境条件代码迁移

chenrui

2025-02-26 3ac5195d98526047062d8352a580a98d39813f66

设施和环境条件代码迁移

 cnas-process/src/main/java/com/ruoyi/process/controller/QualityMonitorController.java

@@ -68,7 +68,7 @@
     * @return
     */
    @ApiOperation(value = "鐩戞帶璁″垝鍒犻櫎")
    @GetMapping("/delQualitySupervise")
    @DeleteMapping("/delQualitySupervise")
    public Result delQualitySupervise(Integer qualityMonitorId) {
        return Result.success(qualityMonitorService.removeById(qualityMonitorId));
    }

 cnas-require/src/main/java/com/ruoyi/require/pojo/FeLightningProtection.java

@@ -6,6 +6,7 @@
import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.multipart.MultipartFile;

import java.io.Serializable;
import java.time.LocalDate;

 cnas-require/src/main/resources/mapper/FeIlluminationMapper.xml

对比新文件
@@ -0,0 +1,46 @@
<?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.ruoyi.require.mapper.FeIlluminationMapper">

    <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.require.pojo.FeIllumination">
        <id column="intensity_illumination_id" property="intensityIlluminationId" />
        <result column="device_id" property="deviceId" />
        <result column="conclusion" property="conclusion" />
        <result column="tester_id" property="testerId" />
        <result column="checker_id" property="checkerId" />
        <result column="test_date" property="testDate" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
    </resultMap>

    <select id="getFeLightningProtection" resultType="com.ruoyi.require.dto.FeIlluminationDto">
        SELECT cdi.*, u1.name checker_user, u2.name tester_user, dv.device_name, dv.management_number
        FROM cnas_fe_illumination cdi
                 left join device dv on dv.id = cdi.device_id
                 left join user u1 on u1.id = cdi.checker_id
                 left join user u2 on u2.id = cdi.tester_id
    </select>

    <!-- 鏌ヨ鐓ф槑璁板綍 -->
    <select id="selectFeIllumination" resultType="com.ruoyi.require.dto.FeIlluminationExportDto">
        SELECT cdi.*,
               dv.device_name,
               dv.management_number,
               DATE_FORMAT(d.calibration_date, '%Y-%m-%d') calibrationDateString,
               DATE_FORMAT(d.next_calibration_date, '%Y-%m-%d') nextCalibrationDateString
        FROM cnas_fe_illumination cdi
                 left join device dv on dv.id = cdi.device_id
                 LEFT JOIN (SELECT d.id,
                                   dmr.calibration_date,
                                   dmr.next_calibration_date
                            FROM device d
                                     LEFT JOIN device_metric_record dmr ON dmr.device_id = d.id
                                AND dmr.type = 'calibrate'
                            GROUP BY d.id
                            HAVING max(dmr.id)) d ON d.id = cdi.device_id
                 left join user u1 on u1.id = cdi.checker_id
                 left join user u2 on u2.id = cdi.tester_id
        where cdi.intensity_illumination_id = #{intensityIlluminationId}
    </select>
</mapper>

 cnas-require/src/main/resources/mapper/FeLightningProtectionMapper.xml

对比新文件
@@ -0,0 +1,20 @@
<?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.ruoyi.require.mapper.FeLightningProtectionMapper">

    <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.require.pojo.FeLightningProtection">
        <id column="lightning_protection_id" property="lightningProtectionId" />
        <result column="file_name" property="fileName" />
        <result column="system_file_name" property="systemFileName" />
        <result column="detection_date" property="detectionDate" />
        <result column="term_validity" property="termValidity" />
        <result column="detection_unit" property="detectionUnit" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
    </resultMap>

    <select id="exportOfLightningProtectionDetection" resultType="com.ruoyi.require.excel.FeLightningProtectionExcel">
        select * from cnas_fe_lightning_protection
    </select>
</mapper>

 cnas-require/src/main/resources/static/illumination.docx

Binary files differ

 cnas-require/src/main/resources/static/power-stable.docx

Binary files differ

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java

@@ -48,5 +48,15 @@
        return Result.success(userService.getUserNow());
    }

    /**
     * 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬
     * @return
     */
    @GetMapping ("/selectUserDepartmentLimsName")
    @ApiOperation(value = "鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬")
    public Result<?> selectUserDepartmentLimsName(){
        return Result.success("鎴愬姛", userService.selectUserDepartmentLimsName());
    }

}


 ruoyi-system/src/main/java/com/ruoyi/system/service/UserService.java

@@ -27,5 +27,11 @@
     * @return
     */
    User getUserNow();

    /**
     * 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬
     * @return
     */
    String selectUserDepartmentLimsName();
}


 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java

@@ -38,5 +38,14 @@
    public User getUserNow() {
        return baseMapper.getUserNow(SecurityUtils.getUserId().intValue());
    }

    /**
     * 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬
     * @return
     */
    @Override
    public String selectUserDepartmentLimsName() {
        return baseMapper.selectUserDepartmentLimsName(SecurityUtils.getUserId().intValue());
    }
}