修改了孔板流量计代码，精度更高了。
This commit is contained in:
commit
7965caba67
12
.vscode/settings.json
vendored
12
.vscode/settings.json
vendored
@ -51,6 +51,18 @@
|
||||
"password": "123456",
|
||||
"savePassword": "secretStorage",
|
||||
"connectionTimeout": 30
|
||||
},
|
||||
{
|
||||
"connectionId": "fNsY4HlOb21w_5TnIGy_d",
|
||||
"name": "localhost",
|
||||
"driver": "redis",
|
||||
"connectionType": "host",
|
||||
"host": "127.0.0.1",
|
||||
"port": 6379,
|
||||
"ssl": false,
|
||||
"savePassword": "na",
|
||||
"readOnly": false,
|
||||
"connectionTimeout": 30
|
||||
}
|
||||
],
|
||||
}
|
||||
@ -1,6 +1,6 @@
|
||||
<mxfile host="65bd71144e">
|
||||
<diagram id="IyeDk-cAWrKOq7F3gyWb" name="第 1 页">
|
||||
<mxGraphModel dx="573" dy="322" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" background="#FFFFFF" math="0" shadow="0">
|
||||
<mxGraphModel dx="344" dy="766" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" background="#FFFFFF" math="0" shadow="0">
|
||||
<root>
|
||||
<mxCell id="0"/>
|
||||
<mxCell id="1" parent="0"/>
|
||||
@ -8,131 +8,122 @@
|
||||
<mxGeometry relative="1" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="5" value="访问/login" style="html=1;" parent="1" vertex="1">
|
||||
<mxGeometry x="304" y="60" width="110" height="50" as="geometry"/>
|
||||
<mxGeometry x="300" y="30" width="110" height="50" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="9" value="" style="edgeStyle=none;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="6" target="20" edge="1">
|
||||
<mxCell id="9" value="" style="edgeStyle=none;html=1;" parent="1" source="6" target="20" edge="1">
|
||||
<mxGeometry relative="1" as="geometry">
|
||||
<mxPoint x="359.0000000000001" y="240" as="targetPoint"/>
|
||||
<mxPoint x="359.0000000000001" y="200" as="targetPoint"/>
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="6" value="被SysLoginController.login()捕获" style="html=1;" parent="1" vertex="1">
|
||||
<mxGeometry x="265.5" y="130" width="187" height="40" as="geometry"/>
|
||||
<mxGeometry x="261.5" y="100" width="187" height="30" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="20" value="<span style="font-weight: 400;">调用方法SysLoginService.login()执行登录逻辑</span>" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
||||
<mxGeometry x="110" y="195" width="500" height="1075" as="geometry">
|
||||
<mxGeometry x="110" y="155" width="490" height="935" as="geometry">
|
||||
<mxRectangle x="109" y="195" width="290" height="30" as="alternateBounds"/>
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="22" value="" style="edgeStyle=none;html=1;" parent="20" source="10" target="21" edge="1">
|
||||
<mxGeometry relative="1" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="10" value="调用方法SysLoginService.validateCaptcha()<br>1. <font color="#00ffff">从redis里拿到验证码对应的验证信息</font><br>2. <font color="#00ffff">删除redis中验证码对应的验证信息</font><br>3. 如果验证信息为空，<font color="#ff0000">抛出验证码过期的异常</font><br>4. 如果code与验证信息的值不同，<font color="#ff0000">抛出验证码错误的异常</font>" style="html=1;" parent="20" vertex="1">
|
||||
<mxGeometry x="104.85" y="45" width="312.25" height="100" as="geometry"/>
|
||||
<mxCell id="10" value="<div style="text-align: center;"><span style="background-color: transparent;">调用方法SysLoginService.validateCaptcha()</span></div><div style=""><span style="background-color: transparent;">1. </span><font style="background-color: transparent; color: rgb(0, 0, 204);">从redis里拿到验证码对应的验证信息</font></div><div style=""><span style="background-color: transparent;">2. </span><font style="background-color: transparent; color: rgb(0, 0, 204);">删除redis中验证码对应的验证信息</font></div><div style=""><span style="background-color: transparent;">3. 如果验证信息为空，</span><font style="background-color: transparent;">抛出验证码过期的异常</font></div><div style=""><span style="background-color: transparent;">4. 如果code与验证信息的值不同，</span><font style="background-color: transparent;">抛出验证码错误的异常</font></div>" style="html=1;align=left;" parent="20" vertex="1">
|
||||
<mxGeometry x="87.42999999999999" y="35" width="315.15" height="100" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="24" value="" style="edgeStyle=none;html=1;" parent="20" source="21" target="23" edge="1">
|
||||
<mxGeometry relative="1" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="21" value="调用方法SysLoginService.loginPreCheck()<br>1. <font color="#ff0000">用户名或密码为空 -&gt; 错误 抛出异常</font><br>2. <font color="#ff0000">密码不在指定范围内 -&gt; 错误 抛出异常</font><br>3. <font color="#ff0000">用户名不在指定范围内 -&gt; 错误 抛出异常</font><br>4. <font color="#ff0000">IP黑名单校验 -&gt; 错误 抛出异常</font>" style="html=1;" parent="20" vertex="1">
|
||||
<mxGeometry x="104.85" y="170" width="312.25" height="100" as="geometry"/>
|
||||
<mxCell id="21" value="调用方法SysLoginService.loginPreCheck()<br><div style="text-align: left;"><span style="background-color: transparent;">1. </span><font style="background-color: transparent;">用户名或密码为空 -&gt; 错误 <font style="color: rgb(255, 0, 0);">抛出异常</font></font></div><div style="text-align: left;"><span style="background-color: transparent;">2. </span><font style="background-color: transparent;">密码不在指定范围内 -&gt; 错误 <font style="color: rgb(255, 0, 0);">抛出异常</font></font></div><div style="text-align: left;"><span style="background-color: transparent;">3. </span><font style="background-color: transparent;">用户名不在指定范围内 -&gt; 错误 <font style="color: rgb(255, 0, 0);">抛出异常</font></font></div><div style="text-align: left;"><span style="background-color: transparent;">4. </span><font style="background-color: transparent;">IP黑名单校验 -&gt; 错误 <font style="color: rgb(255, 0, 0);">抛出异常</font></font></div>" style="html=1;" parent="20" vertex="1">
|
||||
<mxGeometry x="112.91" y="170" width="267.1" height="100" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="26" style="edgeStyle=none;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="20" source="23" target="25" edge="1">
|
||||
<mxCell id="26" style="edgeStyle=none;html=1;" parent="20" source="23" target="25" edge="1">
|
||||
<mxGeometry relative="1" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="23" value="<font color="#00ff00">通过new UsernamePasswordAuthenticationToken生成一个认证信息<br>通过AuthenticationContextHolder.setContext将认证信息设置到上下文</font><br>通过AuthenticationManager.authenticate()对认证信息进行认证，这个方法<br>会去调用UserDetailsServiceImpl.loadUserByUsername()方法进行认证" style="html=1;" parent="20" vertex="1">
|
||||
<mxGeometry x="57.91" y="300" width="406.13" height="70" as="geometry"/>
|
||||
<mxCell id="23" value="<font style="color: rgb(0, 204, 0);">通过new UsernamePasswordAuthenticationToken生成一个认证信息<br>通过AuthenticationContextHolder.setContext将认证信息设置到上下文</font><br>通过AuthenticationManager.authenticate()对认证信息进行认证，这个方法<br>会去调用UserDetailsServiceImpl.loadUserByUsername()方法进行认证" style="html=1;" parent="20" vertex="1">
|
||||
<mxGeometry x="43.39" y="295" width="406.13" height="70" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="39" value="" style="edgeStyle=none;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" parent="20" source="25" target="40" edge="1">
|
||||
<mxGeometry relative="1" as="geometry">
|
||||
<mxPoint x="261" y="785" as="sourcePoint"/>
|
||||
<mxPoint x="245.01" y="805" as="targetPoint"/>
|
||||
</mxGeometry>
|
||||
<mxCell id="68" style="edgeStyle=none;html=1;" edge="1" parent="20" source="25" target="40">
|
||||
<mxGeometry relative="1" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="25" value="<span style="font-weight: 400;">loadUserByUsername</span>" style="swimlane;whiteSpace=wrap;html=1;" parent="20" vertex="1">
|
||||
<mxGeometry x="41.94" y="385" width="438.06" height="390" as="geometry">
|
||||
<mxGeometry x="27.43" y="385" width="438.06" height="355" as="geometry">
|
||||
<mxRectangle x="25.97999999999999" y="380" width="160" height="30" as="alternateBounds"/>
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="29" value="" style="edgeStyle=none;html=1;" parent="25" source="27" target="28" edge="1">
|
||||
<mxGeometry relative="1" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="27" value="调用ISysUserService.selectUserByUserName()获取用户信息<br>校验是否为空 -&gt; <font color="#ff0000">抛出用户不存在的异常</font><br>校验是否已被删除 -&gt; <font color="#ff0000">抛出用户已被删除的异常</font><br>校验是否已被停用 -&gt; <font color="#ff0000">抛出用户已被停用的异常</font>" style="whiteSpace=wrap;html=1;" parent="25" vertex="1">
|
||||
<mxGeometry x="30.04" y="30" width="379.96" height="60" as="geometry"/>
|
||||
<mxCell id="27" value="调用ISysUserService.selectUserByUserName()获取用户信息<br><div style="text-align: left;"><span style="background-color: transparent;">校验是否为空 -&gt; </span><font style="background-color: transparent; color: rgb(255, 0, 0);">抛出用户不存在的异常</font></div><div style="text-align: left;"><span style="background-color: transparent;">校验是否已被删除 -&gt; </span><font style="background-color: transparent; color: rgb(255, 0, 0);">抛出用户已被删除的异常</font></div><div style="text-align: left;"><span style="background-color: transparent;">校验是否已被停用 -&gt; </span><font style="background-color: transparent; color: rgb(255, 0, 0);">抛出用户已被停用的异常</font></div>" style="whiteSpace=wrap;html=1;" parent="25" vertex="1">
|
||||
<mxGeometry x="48.55" y="40" width="340.95" height="60" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="28" value="调用SysPasswordService.validate()进行认证<br>1. 获取上下文的认证信息，并获取认证信息中携带的用户名和密码<br>2. <font color="#00ffff">从redis中获取该用户名密码错误次数</font><br>3. 校验该用户名密码错误次数是否过多<br>若次数过多，则<font color="#ff0000">抛出密码错误次数过多的异常</font><br>4. 调用SecurityUtils.matchesPassword方法校验用户名密码是否匹配<br>5. 若不匹配，则密码错误次数加一，且<font color="#ff0000">抛出密码错误的异常</font><br>否则清楚密码错误次数，校验结束即校验通过" style="whiteSpace=wrap;html=1;" parent="25" vertex="1">
|
||||
<mxGeometry x="29.05" y="120" width="379.96" height="120" as="geometry"/>
|
||||
<mxCell id="28" value="调用SysPasswordService.validate()进行认证<br><div style="text-align: left;"><span style="background-color: transparent;">1. 获取上下文的认证信息，并获取认证信息中携带的用户名和密码</span></div><div style="text-align: left;"><span style="background-color: transparent;">2. </span><font style="background-color: transparent; color: rgb(0, 0, 255);">从redis中获取该用户名密码错误次数</font></div><div style="text-align: left;"><span style="background-color: transparent;">3. 校验该用户名密码错误次数是否过多</span><span style="background-color: transparent;">若次数过多，则</span><font style="background-color: transparent; color: rgb(255, 0, 0);">抛出密码错误次数过多的异常</font></div><div style="text-align: left;"><span style="background-color: transparent;">4. 调用SecurityUtils.matchesPassword方法校验用户名密码是否匹配</span></div><div style="text-align: left;"><span style="background-color: transparent;">5. 若不匹配，<font style="color: rgb(0, 0, 255);">则密码错误次数加一</font>，且</span><font style="background-color: transparent;">抛<font style="color: rgb(255, 0, 0);">出密码错误的异常</font></font></div><div style="text-align: left;"><span style="background-color: transparent;">6. 若匹配，<font style="color: rgb(0, 0, 255);">则清除密码错误次数</font>，校验结束即校验通过</span></div>" style="whiteSpace=wrap;html=1;" parent="25" vertex="1">
|
||||
<mxGeometry x="33.56" y="135" width="370.95" height="120" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="36" value="调用createLoginUser方法new&nbsp;LoginUser()创建一个UserDetails凭证<br>调用SysPermissionService.getMenuPermission()方法获取用户角色权限" style="html=1;" parent="25" vertex="1">
|
||||
<mxGeometry x="15.960000000000008" y="275" width="406.13" height="70" as="geometry"/>
|
||||
<mxGeometry x="27.98" y="290" width="382.09" height="50" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="37" style="edgeStyle=none;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="25" source="28" target="36" edge="1">
|
||||
<mxGeometry relative="1" as="geometry"/>
|
||||
<mxCell id="37" style="edgeStyle=none;html=1;" parent="25" source="28" target="36" edge="1">
|
||||
<mxGeometry relative="1" as="geometry">
|
||||
<mxPoint x="324.02" y="280" as="targetPoint"/>
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="44" value="" style="edgeStyle=none;html=1;" parent="20" source="40" target="43" edge="1">
|
||||
<mxGeometry relative="1" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="40" value="1. <font color="#ff0000">若上述环节抛出异常则处理异常并抛出对应的新的异常，校验环节结束</font><br>2. 无论校验结果如何，清除上下文" style="html=1;" parent="20" vertex="1">
|
||||
<mxGeometry x="57.91" y="805" width="406.13" height="70" as="geometry"/>
|
||||
<mxCell id="40" value="1. <font color="#ff0000">若上述环节抛出异常则处理异常并抛出对应的新的异常</font><div><font style="color: rgb(0, 0, 0);">2. 若上述环节正常运行，则校验环节结束</font><br>3. 无论校验结果如何，清除上下文</div>" style="html=1;align=left;" parent="20" vertex="1">
|
||||
<mxGeometry x="90.98" y="765" width="308.06" height="55" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="43" value="1. 调用createToken()记录并更新用户信息<br>2. 调用TokenService.createToken()生成token，<br>设置用户代理信息LoginUser，将<font color="#00ffff">LoginUser存入redis</font>" style="html=1;" parent="20" vertex="1">
|
||||
<mxGeometry x="57.91" y="925" width="406.13" height="70" as="geometry"/>
|
||||
<mxCell id="43" value="1. 调用createToken()记录并更新用户信息<br>2. 调用TokenService.createToken()生成token，<br>3. 设置用户代理信息LoginUser，将<font style="color: rgb(0, 0, 255);">LoginUser存入redis</font>" style="html=1;align=left;" parent="20" vertex="1">
|
||||
<mxGeometry x="92.42999999999999" y="845" width="308.06" height="70" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="45" style="edgeStyle=none;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="40" target="46" edge="1">
|
||||
<mxCell id="47" style="edgeStyle=none;html=1;" parent="1" source="43" target="48" edge="1">
|
||||
<mxGeometry relative="1" as="geometry">
|
||||
<mxPoint x="660" y="1055" as="targetPoint"/>
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="46" value="认证失败" style="html=1;fontColor=#FF0000;labelBorderColor=none;strokeColor=#FF0000;" parent="1" vertex="1">
|
||||
<mxGeometry x="660" y="1010" width="100" height="50" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="47" style="edgeStyle=none;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="43" target="48" edge="1">
|
||||
<mxGeometry relative="1" as="geometry">
|
||||
<mxPoint x="333.06500000000005" y="1330.0000000000002" as="targetPoint"/>
|
||||
<mxPoint x="333.06500000000005" y="1290.0000000000002" as="targetPoint"/>
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="65" value="" style="edgeStyle=none;html=1;fontColor=#00FFFF;" parent="1" source="48" target="64" edge="1">
|
||||
<mxGeometry relative="1" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="48" value="认证成功<br>将Token返回给前端" style="html=1;" parent="1" vertex="1">
|
||||
<mxGeometry x="302.51" y="1300" width="136.93" height="80" as="geometry"/>
|
||||
<mxCell id="48" value="认证成功，将Token返回给前端" style="html=1;" parent="1" vertex="1">
|
||||
<mxGeometry x="254.73000000000002" y="1110" width="203.46" height="31" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="51" value="" style="edgeStyle=none;html=1;" parent="1" source="49" target="50" edge="1">
|
||||
<mxGeometry relative="1" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="49" value="Token认证" style="whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
||||
<mxGeometry x="310.98" y="1570" width="120" height="60" as="geometry"/>
|
||||
<mxGeometry x="765" y="1010" width="120" height="60" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="53" value="" style="edgeStyle=none;html=1;" parent="1" source="50" target="52" edge="1">
|
||||
<mxGeometry relative="1" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="50" value="触发JwtAuthenticationTokenFilter拦截器<br>调用doFilterInternal方法进行处理" style="whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
||||
<mxGeometry x="235.98" y="1680" width="270" height="60" as="geometry"/>
|
||||
<mxGeometry x="690" y="920" width="270" height="60" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="55" value="" style="edgeStyle=none;html=1;" parent="1" source="52" target="54" edge="1">
|
||||
<mxGeometry relative="1" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="52" value="调用TokenService.getLoginUser()方法<br>1. 调用方法getToken从request的请求头中获取token<br><font color="#00ffff">2. 通过token在redis中获取用户代理信息LoginUser</font>" style="whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
||||
<mxGeometry x="185.98" y="1780" width="370" height="60" as="geometry"/>
|
||||
<mxCell id="52" value="调用TokenService.getLoginUser()方法<br>1. 调用方法getToken从request的请求头中获取token<br><font style="color: rgb(0, 0, 204);">2. 通过token在redis中获取用户代理信息LoginUser</font>" style="whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
||||
<mxGeometry x="675" y="830" width="300" height="60" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="57" value="" style="edgeStyle=none;html=1;" parent="1" source="54" target="56" edge="1">
|
||||
<mxGeometry relative="1" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="54" value="判断用户凭证是非空并且判断上下文认证信息为空<br>调用TokenService.verifyToken()校验token并判断最小时间刷新token" style="whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
||||
<mxGeometry x="175.98" y="1860" width="390" height="60" as="geometry"/>
|
||||
<mxGeometry x="630" y="750" width="390" height="60" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="59" value="" style="edgeStyle=none;html=1;" parent="1" source="56" target="58" edge="1">
|
||||
<mxGeometry relative="1" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="56" value="<font color="#00ff00">1. 通过UsernamePasswordAuthenticationToken创建一个认证信息<br>2. 通过WebAuthenticationDetailsSource构建一个用户凭证并通过UsernamePasswordAuthenticationToken.setDetails设置到认证信息里<br>3. 将认证信息通过SecurityContextHolder.getContext().setAuthentication<br>拿到上下文并设置到上下文</font>" style="whiteSpace=wrap;html=1;strokeColor=#00FF00;" parent="1" vertex="1">
|
||||
<mxGeometry x="161.45999999999998" y="1950" width="419.02" height="80" as="geometry"/>
|
||||
<mxCell id="56" value="<font style="color: rgb(0, 153, 0);">1. 通过UsernamePasswordAuthenticationToken创建一个认证信息<br>2. 通过WebAuthenticationDetailsSource构建一个用户凭证并通过UsernamePasswordAuthenticationToken.setDetails设置到认证信息里<br>3. 将认证信息通过SecurityContextHolder.getContext().setAuthentication拿到上下文并设置到上下文</font>" style="whiteSpace=wrap;html=1;strokeColor=#00CC00;align=left;" parent="1" vertex="1">
|
||||
<mxGeometry x="632.75" y="640" width="384.51" height="80" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="58" value="继续过滤<br>在鉴权系统中会用到上述设置的上下文" style="whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
||||
<mxGeometry x="300.98" y="2060" width="140" height="60" as="geometry"/>
|
||||
<mxGeometry x="755" y="555" width="140" height="60" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="66" style="edgeStyle=none;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;fontColor=#00FFFF;" parent="1" source="64" target="49" edge="1">
|
||||
<mxCell id="66" style="edgeStyle=none;html=1;fontColor=#00FFFF;" parent="1" source="64" target="49" edge="1">
|
||||
<mxGeometry relative="1" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="64" value="前端拿到token后存到浏览器中<br>后续发送请求在浏览器中拿到token<br>并将token设置到请求头里" style="whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
||||
<mxGeometry x="251.46" y="1430" width="239.02" height="90" as="geometry"/>
|
||||
<mxGeometry x="705.49" y="1090" width="239.02" height="70" as="geometry"/>
|
||||
</mxCell>
|
||||
</root>
|
||||
</mxGraphModel>
|
||||
|
||||
2
pom.xml
2
pom.xml
@ -291,6 +291,8 @@
|
||||
<version>${ruoyi.version}</version>
|
||||
</dependency>
|
||||
|
||||
|
||||
|
||||
<!-- 模块启动器 -->
|
||||
<dependency>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
|
||||
@ -76,6 +76,10 @@
|
||||
<artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
|
||||
</dependency>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
|
||||
@ -11,4 +11,8 @@ public interface TfaService {
|
||||
public void doRegister(RegisterBody registerBody);
|
||||
|
||||
public void doRegisterVerify(RegisterBody registerBody);
|
||||
|
||||
public void doLogin(LoginBody loginBody);
|
||||
|
||||
public String doLoginVerify(LoginBody loginBody);
|
||||
}
|
||||
|
||||
@ -67,4 +67,19 @@ public class TfaController extends BaseController {
|
||||
tfaService.doRegisterVerify(registerBody);
|
||||
return success();
|
||||
}
|
||||
|
||||
@PostMapping("/send/login")
|
||||
@Anonymous
|
||||
public AjaxResult sendLogin(@PathVariable String channel, @RequestBody LoginBody loginBody) {
|
||||
TfaService tfaService = tfaServiceMap.get(channel + "AuthService");
|
||||
tfaService.doLogin(loginBody);
|
||||
return success();
|
||||
}
|
||||
|
||||
@PostMapping("/verify/login")
|
||||
@Anonymous
|
||||
public AjaxResult verifyLogin(@PathVariable String channel, @RequestBody LoginBody loginBody) {
|
||||
TfaService tfaService = tfaServiceMap.get(channel + "AuthService");
|
||||
return success(tfaService.doLoginVerify(loginBody));
|
||||
}
|
||||
}
|
||||
|
||||
@ -10,14 +10,19 @@ import org.springframework.stereotype.Service;
|
||||
import com.ruoyi.auth.common.enums.OauthVerificationUse;
|
||||
import com.ruoyi.auth.common.utils.RandomCodeUtil;
|
||||
import com.ruoyi.common.constant.CacheConstants;
|
||||
import com.ruoyi.common.constant.Constants;
|
||||
import com.ruoyi.common.core.domain.entity.SysUser;
|
||||
import com.ruoyi.common.core.domain.model.LoginBody;
|
||||
import com.ruoyi.common.core.domain.model.LoginUser;
|
||||
import com.ruoyi.common.core.domain.model.RegisterBody;
|
||||
import com.ruoyi.common.exception.ServiceException;
|
||||
import com.ruoyi.common.utils.CacheUtils;
|
||||
import com.ruoyi.common.utils.MessageUtils;
|
||||
import com.ruoyi.common.utils.SecurityUtils;
|
||||
import com.ruoyi.common.utils.StringUtils;
|
||||
import com.ruoyi.framework.manager.AsyncManager;
|
||||
import com.ruoyi.framework.manager.factory.AsyncFactory;
|
||||
import com.ruoyi.framework.web.service.SysLoginService;
|
||||
import com.ruoyi.framework.web.service.TokenService;
|
||||
import com.ruoyi.framework.web.service.UserDetailsServiceImpl;
|
||||
import com.ruoyi.system.service.ISysUserService;
|
||||
@ -33,6 +38,8 @@ public class MailServiceImpl implements IMailService {
|
||||
private TokenService tokenService;
|
||||
@Autowired
|
||||
private UserDetailsServiceImpl userDetailsServiceImpl;
|
||||
@Autowired
|
||||
private SysLoginService sysLoginService;
|
||||
|
||||
private static final Logger log = LoggerFactory.getLogger(MailServiceImpl.class);
|
||||
|
||||
@ -65,30 +72,25 @@ public class MailServiceImpl implements IMailService {
|
||||
return isValid;
|
||||
}
|
||||
|
||||
public void doLogin(LoginBody loginBody, boolean isRegister) {
|
||||
public void doLogin(LoginBody loginBody) {
|
||||
SysUser sysUser = userService.selectUserByEmail(loginBody.getEmail());
|
||||
if (sysUser == null && !isRegister) {
|
||||
if (sysUser == null) {
|
||||
throw new ServiceException("该邮箱未绑定用户");
|
||||
} else {
|
||||
sendCode(loginBody.getEmail(), RandomCodeUtil.numberCode(6), OauthVerificationUse.LOGIN);
|
||||
}
|
||||
}
|
||||
|
||||
public String doLoginVerify(LoginBody loginBody, boolean isRegister) {
|
||||
public String doLoginVerify(LoginBody loginBody) {
|
||||
if (checkCode(loginBody.getEmail(), loginBody.getCode(), OauthVerificationUse.LOGIN)) {
|
||||
SysUser sysUser = userService.selectUserByEmail(loginBody.getEmail());
|
||||
if (sysUser == null) {
|
||||
if (isRegister) {
|
||||
sysUser = new SysUser();
|
||||
sysUser.setUserName(loginBody.getEmail());
|
||||
sysUser.setPassword(SecurityUtils.encryptPassword(RandomCodeUtil.code(16)));
|
||||
sysUser.setEmail(loginBody.getEmail());
|
||||
userService.registerUser(sysUser);
|
||||
} else {
|
||||
throw new ServiceException("该邮箱未绑定用户");
|
||||
}
|
||||
throw new ServiceException("该邮箱未绑定用户");
|
||||
}
|
||||
AsyncManager.me().execute(AsyncFactory.recordLogininfor(sysUser.getUserName(), Constants.LOGIN_SUCCESS,
|
||||
MessageUtils.message("user.login.success")));
|
||||
LoginUser loginUser = (LoginUser) userDetailsServiceImpl.createLoginUser(sysUser);
|
||||
sysLoginService.recordLoginInfo(loginUser.getUserId());
|
||||
return tokenService.createToken(loginUser);
|
||||
} else {
|
||||
throw new ServiceException("验证码错误");
|
||||
@ -112,6 +114,8 @@ public class MailServiceImpl implements IMailService {
|
||||
sysUser.setPassword(SecurityUtils.encryptPassword(registerBody.getPassword()));
|
||||
sysUser.setEmail(registerBody.getEmail());
|
||||
userService.registerUser(sysUser);
|
||||
AsyncManager.me().execute(AsyncFactory.recordLogininfor(sysUser.getUserName(), Constants.REGISTER,
|
||||
MessageUtils.message("user.register.success")));
|
||||
} else {
|
||||
throw new ServiceException("验证码错误");
|
||||
}
|
||||
|
||||
@ -11,14 +11,19 @@ import com.alibaba.fastjson2.JSONObject;
|
||||
import com.ruoyi.auth.common.enums.OauthVerificationUse;
|
||||
import com.ruoyi.auth.common.utils.RandomCodeUtil;
|
||||
import com.ruoyi.common.constant.CacheConstants;
|
||||
import com.ruoyi.common.constant.Constants;
|
||||
import com.ruoyi.common.core.domain.entity.SysUser;
|
||||
import com.ruoyi.common.core.domain.model.LoginBody;
|
||||
import com.ruoyi.common.core.domain.model.LoginUser;
|
||||
import com.ruoyi.common.core.domain.model.RegisterBody;
|
||||
import com.ruoyi.common.exception.ServiceException;
|
||||
import com.ruoyi.common.utils.CacheUtils;
|
||||
import com.ruoyi.common.utils.MessageUtils;
|
||||
import com.ruoyi.common.utils.SecurityUtils;
|
||||
import com.ruoyi.common.utils.StringUtils;
|
||||
import com.ruoyi.framework.manager.AsyncManager;
|
||||
import com.ruoyi.framework.manager.factory.AsyncFactory;
|
||||
import com.ruoyi.framework.web.service.SysLoginService;
|
||||
import com.ruoyi.framework.web.service.TokenService;
|
||||
import com.ruoyi.framework.web.service.UserDetailsServiceImpl;
|
||||
import com.ruoyi.system.service.ISysUserService;
|
||||
@ -41,6 +46,8 @@ public class DySmsServiceImpl implements DySmsService {
|
||||
private UserDetailsServiceImpl userDetailsServiceImpl;
|
||||
@Autowired
|
||||
private TokenService tokenService;
|
||||
@Autowired
|
||||
private SysLoginService sysLoginService;
|
||||
|
||||
private static final Logger log = LoggerFactory.getLogger(DySmsServiceImpl.class);
|
||||
|
||||
@ -75,30 +82,25 @@ public class DySmsServiceImpl implements DySmsService {
|
||||
return isValid;
|
||||
}
|
||||
|
||||
public void doLogin(LoginBody loginBody, boolean isRegister) {
|
||||
public void doLogin(LoginBody loginBody) {
|
||||
SysUser sysUser = userService.selectUserByPhone(loginBody.getPhonenumber());
|
||||
if (sysUser == null && !isRegister) {
|
||||
if (sysUser == null) {
|
||||
throw new ServiceException("该手机号未绑定用户");
|
||||
} else {
|
||||
sendCode(loginBody.getPhonenumber(), RandomCodeUtil.numberCode(6), OauthVerificationUse.LOGIN);
|
||||
}
|
||||
}
|
||||
|
||||
public String doLoginVerify(LoginBody loginBody, boolean isRegister) {
|
||||
public String doLoginVerify(LoginBody loginBody) {
|
||||
if (checkCode(loginBody.getPhonenumber(), loginBody.getCode(), OauthVerificationUse.LOGIN)) {
|
||||
SysUser sysUser = userService.selectUserByPhone(loginBody.getPhonenumber());
|
||||
if (sysUser == null) {
|
||||
if (isRegister) {
|
||||
sysUser = new SysUser();
|
||||
sysUser.setUserName(loginBody.getPhonenumber());
|
||||
sysUser.setPassword(SecurityUtils.encryptPassword(RandomCodeUtil.code(16)));
|
||||
sysUser.setPhonenumber(loginBody.getPhonenumber());
|
||||
userService.registerUser(sysUser);
|
||||
} else {
|
||||
throw new ServiceException("该手机号未绑定用户");
|
||||
}
|
||||
throw new ServiceException("该手机号未绑定用户");
|
||||
}
|
||||
AsyncManager.me().execute(AsyncFactory.recordLogininfor(sysUser.getUserName(), Constants.LOGIN_SUCCESS,
|
||||
MessageUtils.message("user.login.success")));
|
||||
LoginUser loginUser = (LoginUser) userDetailsServiceImpl.createLoginUser(sysUser);
|
||||
sysLoginService.recordLoginInfo(loginUser.getUserId());
|
||||
return tokenService.createToken(loginUser);
|
||||
} else {
|
||||
throw new ServiceException("验证码错误");
|
||||
@ -122,6 +124,8 @@ public class DySmsServiceImpl implements DySmsService {
|
||||
sysUser.setPassword(SecurityUtils.encryptPassword(registerBody.getPassword()));
|
||||
sysUser.setPhonenumber(registerBody.getPhonenumber());
|
||||
userService.registerUser(sysUser);
|
||||
AsyncManager.me().execute(AsyncFactory.recordLogininfor(sysUser.getUserName(), Constants.REGISTER,
|
||||
MessageUtils.message("user.register.success")));
|
||||
} else {
|
||||
throw new ServiceException("验证码错误");
|
||||
}
|
||||
|
||||
@ -1 +1 @@
|
||||
Subproject commit 3489a065a6c361142c08e70b910ba87b30dd01e4
|
||||
Subproject commit a758a24b4ec0e2e538b3a137a3d60fab48c0368f
|
||||
@ -1 +1 @@
|
||||
Subproject commit 1f9d80c33fb09c7d1c5b848419772f92fc090b63
|
||||
Subproject commit 26446e5304424bcfe69036a30867cc428e5a929c
|
||||
@ -51,6 +51,19 @@
|
||||
<version>${ruoyi.version}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- 天然气模块-->
|
||||
<dependency>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<artifactId>ruoyi-ngtools</artifactId>
|
||||
<version>${ruoyi.version}</version>
|
||||
</dependency>
|
||||
<!-- 家庭媒体管理模块-->
|
||||
<dependency>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<artifactId>ruoyi-music</artifactId>
|
||||
<version>${ruoyi.version}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- 手机号认证-->
|
||||
<dependency>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
@ -75,6 +88,8 @@
|
||||
<module>ruoyi-quartz</module>
|
||||
<module>ruoyi-online</module>
|
||||
<module>ruoyi-message</module>
|
||||
<module>ruoyi-ngtools</module>
|
||||
<module>ruoyi-music</module>
|
||||
</modules>
|
||||
<packaging>pom</packaging>
|
||||
</project>
|
||||
@ -28,6 +28,7 @@ public class GenTableVo extends BaseEntity {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 业务表 */
|
||||
@Valid
|
||||
private GenTable table;
|
||||
|
||||
/** 业务表的列 */
|
||||
@ -39,11 +40,9 @@ public class GenTableVo extends BaseEntity {
|
||||
private List<GenJoinTable> joinTablesMate;
|
||||
|
||||
/** 参与关联的表 */
|
||||
@Valid
|
||||
private Collection<GenTable> joinTables;
|
||||
|
||||
/** 参与关联的列 */
|
||||
@Valid
|
||||
private List<GenTableColumn> joinColumns;
|
||||
|
||||
public List<GenTable> getAllGenTables() {
|
||||
|
||||
@ -40,6 +40,18 @@
|
||||
<artifactId>ruoyi-message</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- 天然气模块-->
|
||||
<dependency>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<artifactId>ruoyi-ngtools</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- 音乐管理模块-->
|
||||
<dependency>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<artifactId>ruoyi-music</artifactId>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
|
||||
</project>
|
||||
|
||||
53
ruoyi-models/ruoyi-music/pom.xml
Normal file
53
ruoyi-models/ruoyi-music/pom.xml
Normal file
@ -0,0 +1,53 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<artifactId>ruoyi-models</artifactId>
|
||||
<version>3.8.8.3.1</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>ruoyi-music</artifactId>
|
||||
|
||||
<properties>
|
||||
<maven.compiler.source>17</maven.compiler.source>
|
||||
<maven.compiler.target>17</maven.compiler.target>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<artifactId>ruoyi-common</artifactId>
|
||||
<version>${ruoyi.version}</version>
|
||||
|
||||
</dependency>
|
||||
|
||||
<!-- 音频元数据解析 -->
|
||||
<dependency>
|
||||
<groupId>com.github.sbordes</groupId>
|
||||
<artifactId>jaudiotagger</artifactId>
|
||||
<version>2.2.6</version>
|
||||
<scope>system</scope>
|
||||
<systemPath>${project.basedir}/src/main/resources/lib/jaudiotagger-2.2.6.jar</systemPath>
|
||||
</dependency>
|
||||
|
||||
<!-- 网络路径支持 -->
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>jcifs</groupId>-->
|
||||
<!-- <artifactId>jcifs</artifactId>-->
|
||||
<!-- <version>1.3.17</version>-->
|
||||
<!-- </dependency>-->
|
||||
<!-- -->
|
||||
<dependency>
|
||||
<groupId>eu.agno3.jcifs</groupId>
|
||||
<artifactId>jcifs-ng</artifactId>
|
||||
<version>2.1.9</version>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
|
||||
</project>
|
||||
@ -0,0 +1,34 @@
|
||||
package com.ruoyi.music.controller;
|
||||
|
||||
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.music.domain.MusicFile;
|
||||
import com.ruoyi.music.service.IMusicService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import static com.ruoyi.common.core.domain.AjaxResult.success;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/music/file")
|
||||
public class MusicController {
|
||||
|
||||
@Autowired
|
||||
private IMusicService musicService;
|
||||
@PostMapping("/scan")
|
||||
@PreAuthorize("@ss.hasPermi('music:file:scan')")
|
||||
public AjaxResult scanSmbPath(@RequestBody SmbScanParam smbInfo) {
|
||||
String smbPath=smbInfo.getSmbPath();
|
||||
String username=smbInfo.getUsername();
|
||||
String password=smbInfo.getPassword();
|
||||
musicService.scanSmbPath(smbPath, username, password);
|
||||
return success("扫描完成");
|
||||
}
|
||||
|
||||
@GetMapping("/list")
|
||||
@PreAuthorize("@ss.hasPermi('music:file:list')")
|
||||
public AjaxResult list(MusicFile musicFile) {
|
||||
return success(musicService.selectMusicList(musicFile));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,35 @@
|
||||
package com.ruoyi.music.controller;
|
||||
|
||||
// 创建参数接收类
|
||||
public class SmbScanParam {
|
||||
private String smbPath;
|
||||
|
||||
public String getSmbPath() {
|
||||
return smbPath;
|
||||
}
|
||||
|
||||
public void setSmbPath(String smbPath) {
|
||||
this.smbPath = smbPath;
|
||||
}
|
||||
|
||||
public String getUsername() {
|
||||
return username;
|
||||
}
|
||||
|
||||
public void setUsername(String username) {
|
||||
this.username = username;
|
||||
}
|
||||
|
||||
public String getPassword() {
|
||||
return password;
|
||||
}
|
||||
|
||||
public void setPassword(String password) {
|
||||
this.password = password;
|
||||
}
|
||||
|
||||
private String username;
|
||||
private String password;
|
||||
|
||||
// Getter and Setter
|
||||
}
|
||||
@ -0,0 +1,19 @@
|
||||
package com.ruoyi.music.domain;
|
||||
|
||||
import com.ruoyi.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
public class MusicFile extends BaseEntity {
|
||||
private Long musicId;
|
||||
private String filePath;
|
||||
private String fileName;
|
||||
private String title;
|
||||
private String artist;
|
||||
private String album;
|
||||
private Integer duration;
|
||||
private Long fileSize;
|
||||
private Long userId;
|
||||
private Long deptId;
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
package com.ruoyi.music.mapper;
|
||||
|
||||
import com.ruoyi.music.domain.MusicFile;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
@Mapper
|
||||
public interface MusicFileMapper {
|
||||
int insertMusicFile(MusicFile musicFile);
|
||||
List<MusicFile> selectMusicFileList(MusicFile musicFile);
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package com.ruoyi.music.service;
|
||||
|
||||
import com.ruoyi.music.domain.MusicFile;
|
||||
import java.util.List;
|
||||
|
||||
public interface IMusicService {
|
||||
void scanSmbPath(String smbPath, String username, String password);
|
||||
List<MusicFile> selectMusicList(MusicFile musicFile);
|
||||
}
|
||||
@ -0,0 +1,94 @@
|
||||
package com.ruoyi.music.service.impl;
|
||||
|
||||
import com.ruoyi.common.utils.StringUtils;
|
||||
import com.ruoyi.common.utils.SecurityUtils;
|
||||
import com.ruoyi.music.domain.MusicFile;
|
||||
import com.ruoyi.music.mapper.MusicFileMapper;
|
||||
import com.ruoyi.music.service.IMusicService;
|
||||
import jcifs.smb.SmbFile;
|
||||
import jcifs.smb.SmbFileInputStream;
|
||||
import org.jaudiotagger.audio.AudioFile;
|
||||
import org.jaudiotagger.audio.AudioFileIO;
|
||||
import org.jaudiotagger.tag.FieldKey;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.InputStream;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class MusicServiceImpl implements IMusicService {
|
||||
|
||||
@Autowired
|
||||
private MusicFileMapper musicFileMapper;
|
||||
|
||||
@Override
|
||||
public void scanSmbPath(String smbPath, String username, String password) {
|
||||
try {
|
||||
String authStr = username + ":" + password + "@";
|
||||
String fullPath = "smb://" + authStr + smbPath.replace("\\", "/");
|
||||
|
||||
SmbFile rootFile = new SmbFile(fullPath);
|
||||
rootFile.connect();
|
||||
|
||||
processDirectory(rootFile, SecurityUtils.getUserId(), SecurityUtils.getDeptId());
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException("SMB连接失败：" + e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
private void processDirectory(SmbFile dir, Long userId, Long deptId) throws Exception {
|
||||
for (SmbFile file : dir.listFiles()) {
|
||||
if (file.isDirectory()) {
|
||||
processDirectory(file, userId, deptId);
|
||||
} else {
|
||||
if (file.getName().toLowerCase().matches(".*\\.(mp3|flac|wav)$")) {
|
||||
saveMusicInfo(file, userId, deptId);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void saveMusicInfo(SmbFile file, Long userId, Long deptId) {
|
||||
File tempFile = null;
|
||||
|
||||
|
||||
try {
|
||||
// 创建临时文件
|
||||
tempFile = File.createTempFile("music", null);
|
||||
try (InputStream in = new SmbFileInputStream(file);
|
||||
FileOutputStream out = new FileOutputStream(tempFile)) {
|
||||
byte[] buffer = new byte[4096];
|
||||
int bytesRead;
|
||||
while ((bytesRead = in.read(buffer)) != -1) {
|
||||
out.write(buffer, 0, bytesRead);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
System.err.println("解析失败：" + e.getMessage());
|
||||
}
|
||||
AudioFile audioFile = AudioFileIO.read(tempFile);
|
||||
MusicFile music = new MusicFile();
|
||||
music.setFilePath(file.getCanonicalPath());
|
||||
music.setFileName(file.getName());
|
||||
music.setTitle(audioFile.getTag().getFirst(FieldKey.TITLE));
|
||||
music.setArtist(audioFile.getTag().getFirst(FieldKey.ARTIST));
|
||||
music.setAlbum(audioFile.getTag().getFirst(FieldKey.ALBUM));
|
||||
music.setDuration(audioFile.getAudioHeader().getTrackLength());
|
||||
music.setFileSize(file.length());
|
||||
music.setUserId(userId);
|
||||
music.setDeptId(deptId);
|
||||
music.setCreateTime(new Date());
|
||||
musicFileMapper.insertMusicFile(music);
|
||||
} catch (Exception e) {
|
||||
System.err.println("解析失败：" + file.getName() + " - " + e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<MusicFile> selectMusicList(MusicFile musicFile) {
|
||||
return musicFileMapper.selectMusicFileList(musicFile);
|
||||
}
|
||||
}
|
||||
Binary file not shown.
@ -0,0 +1,41 @@
|
||||
<?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.music.mapper.MusicFileMapper">
|
||||
<insert id="insertMusicFile" parameterType="MusicFile" useGeneratedKeys="true" keyProperty="musicId">
|
||||
INSERT INTO music_file (
|
||||
file_path,
|
||||
file_name,
|
||||
title,
|
||||
artist,
|
||||
album,
|
||||
duration,
|
||||
file_size,
|
||||
create_time,
|
||||
update_time,
|
||||
user_id,
|
||||
dept_id
|
||||
) VALUES (
|
||||
#{filePath},
|
||||
#{fileName},
|
||||
#{title},
|
||||
#{artist},
|
||||
#{album},
|
||||
#{duration},
|
||||
#{fileSize},
|
||||
#{createTime},
|
||||
#{updateTime},
|
||||
#{userId},
|
||||
#{deptId}
|
||||
)
|
||||
</insert>
|
||||
|
||||
<select id="selectMusicFileList" parameterType="MusicFile" resultType="MusicFile">
|
||||
SELECT * FROM music_file
|
||||
<where>
|
||||
<if test="title != null and title != ''"> AND title LIKE CONCAT('%', #{title}, '%')</if>
|
||||
<if test="artist != null and artist != ''"> AND artist LIKE CONCAT('%', #{artist}, '%')</if>
|
||||
</where>
|
||||
</select>
|
||||
</mapper>
|
||||
@ -4,33 +4,27 @@
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<artifactId>ruoyi</artifactId>
|
||||
<version>3.8.9</version>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<version>3.8.8.3.1</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>ruoyi-ngtools</artifactId>
|
||||
|
||||
<properties>
|
||||
<maven.compiler.source>8</maven.compiler.source>
|
||||
<maven.compiler.target>8</maven.compiler.target>
|
||||
<maven.compiler.source>17</maven.compiler.source>
|
||||
<maven.compiler.target>17</maven.compiler.target>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
</properties>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<artifactId>ruoyi-common</artifactId>
|
||||
<version>${ruoyi.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
<scope>provided</scope>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-web</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<artifactId>ruoyi-system</artifactId>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
|
||||
</project>
|
||||
@ -0,0 +1,7 @@
|
||||
package com.ruoyi;
|
||||
|
||||
public class Main {
|
||||
public static void main(String[] args) {
|
||||
System.out.println("Hello world!");
|
||||
}
|
||||
}
|
||||
@ -11,8 +11,8 @@ import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.swing.*;
|
||||
import java.util.Optional;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/flowCalcTools")
|
||||
@ -72,7 +72,11 @@ public class FlowController {
|
||||
//计算流量
|
||||
switch (flowProps.getdMeterType()) {
|
||||
case 0: //差压式流量计
|
||||
OFlowCal(gasProps, flowProps);
|
||||
// 执行计算
|
||||
thermalExpansionCorrection(flowProps); // 热膨胀修正
|
||||
iterativeFlowCalculation(flowProps, gasProps);
|
||||
|
||||
//OFlowCal(gasProps,flowProps);
|
||||
break;
|
||||
case 1:// 速度式流量计
|
||||
SdFlowCal(gasProps, flowProps);
|
||||
@ -129,7 +133,7 @@ public class FlowController {
|
||||
// flowProps.setdKappa(1.357);
|
||||
|
||||
//求动力粘度 dlnd
|
||||
flowProps.setdDViscosity(Dlndjs(flowProps.getdPf(), flowProps.getdTf(), 2, 1));
|
||||
flowProps.setdDViscosity(Dlndjs(flowProps.getdPf()/1e6, flowProps.getdTf()));
|
||||
// flowProps.setdDViscosity(0.01096);
|
||||
|
||||
//求可膨胀系数
|
||||
@ -142,13 +146,12 @@ public class FlowController {
|
||||
|
||||
//迭代计算流量和流出系数
|
||||
|
||||
double conQvA = 0;
|
||||
conQvA = 0.0000031795 * (1530000.0D * gasProps.dRD_Real / (flowProps.getdDViscosity() * flowProps.getdOrificeD())) * flowProps.getdE() * Math.pow(flowProps.getdOrificeD(), 2) * gasProps.dFpv * flowProps.getdFG() * flowProps.getdDExpCoefficient() * flowProps.getdFT() * Math.sqrt(flowProps.getdPf() * flowProps.getdDp() / 1e6);
|
||||
double conQvA = 0.0000031795 * (1530000.0D * gasProps.dRD_Real / (flowProps.getdDViscosity() * flowProps.getdOrificeD())) * flowProps.getdE() * Math.pow(flowProps.getdOrificeD(), 2) * gasProps.dFpv * flowProps.getdFG() * flowProps.getdDExpCoefficient() * flowProps.getdFT() * Math.sqrt(flowProps.getdPf() * flowProps.getdDp() / 1e6);
|
||||
double[] XQv = new double[4];
|
||||
double[] CQv = new double[4];
|
||||
double[] dQv = new double[4];
|
||||
double Qn = 0;
|
||||
int n = 0;
|
||||
int n ;
|
||||
XQv[0] = 1000000.0F;
|
||||
boolean xhFlag=true;
|
||||
_100000:
|
||||
@ -209,6 +212,336 @@ public class FlowController {
|
||||
flowProps.setdPressLost(YaLiSunShi(flowProps.getdCd(), flowProps.getdBeta(), flowProps.getdDp(), flowProps.getdCoreType()));
|
||||
}
|
||||
|
||||
/**
|
||||
* 计算管道绝对粗糙度 K (GB/T 21446-2008 附录C)
|
||||
* @param flowProps
|
||||
* @return 粗糙度修正系数 K (保留4位小数)
|
||||
*/
|
||||
public static double calculateK(FlowProps flowProps){
|
||||
double Jdccd;
|
||||
switch (flowProps.getdPipeType()) {
|
||||
|
||||
case 0:
|
||||
Jdccd = 0.029F;
|
||||
break;
|
||||
case 1:
|
||||
case 2:
|
||||
case 3:
|
||||
Jdccd = 0.075F;
|
||||
break;
|
||||
case 4:
|
||||
Jdccd = 0.1F;
|
||||
break;
|
||||
case 5:
|
||||
Jdccd = 0.15F;
|
||||
break;
|
||||
case 6:
|
||||
Jdccd = 1;
|
||||
break;
|
||||
case 7:
|
||||
Jdccd = 2.1F;
|
||||
break;
|
||||
case 8:
|
||||
Jdccd = 0.04F;
|
||||
break;
|
||||
case 9:
|
||||
Jdccd = 0.15F;
|
||||
break;
|
||||
case 10:
|
||||
Jdccd = 0.13F;
|
||||
break;
|
||||
case 11:
|
||||
Jdccd = 0.25F;
|
||||
break;
|
||||
default:
|
||||
// 处理未知类型（可选）
|
||||
throw new IllegalArgumentException("未知的管道类型: ");
|
||||
}
|
||||
return Jdccd;
|
||||
}
|
||||
|
||||
/**
|
||||
* 计算管道粗糙度修正系数 G_me (GB/T 21446-2008 附录C)
|
||||
* @param D_pipe 管道内径 (mm)
|
||||
* @param K 绝对粗糙度 (mm)
|
||||
* @param C 未修正的流出系数
|
||||
* @return 粗糙度修正系数 G_me (保留4位小数)
|
||||
*/
|
||||
public static double calculateRoughnessFactor(double D_pipe, double K, double C) {
|
||||
// 计算相对粗糙度 K/D
|
||||
double K_over_D = K / D_pipe;
|
||||
|
||||
// 判断是否需要修正
|
||||
if (K_over_D <= 0.0004) {
|
||||
return 1.0000;
|
||||
}
|
||||
|
||||
// 计算修正项
|
||||
double term = (K_over_D * 1e6) - 400; // 转换为无量纲项
|
||||
if (term < 0) {
|
||||
throw new IllegalArgumentException("K/D 超出修正公式适用范围");
|
||||
}
|
||||
|
||||
double G_me = 1 + (0.011 / C) * Math.sqrt(term);
|
||||
return FormatUtil.format(G_me, Optional.of(4)); // 保留四位小数
|
||||
}
|
||||
|
||||
/**
|
||||
* 热膨胀修正（GB/T 21446-2008 第6.2.1节）
|
||||
* @param flowProps 流量参数
|
||||
*/
|
||||
public static void thermalExpansionCorrection(FlowProps flowProps) {
|
||||
// 孔板孔径修正
|
||||
double dOrificeMaterial = flowProps.getdOrificeMaterial(); // 材料膨胀系数 (e.g. 16e-6/℃)
|
||||
double dOrificeD = flowProps.getdOrificeD(); // 初始孔径(mm)
|
||||
double dOrificeD_corrected = dOrificeD * (1 + 0.000001*dOrificeMaterial * (flowProps.getdTf() - 293.15)); // 20℃为参考温度
|
||||
flowProps.setdOrificeD(FormatUtil.format(dOrificeD_corrected, Optional.of(2)));
|
||||
|
||||
// 管道内径修正
|
||||
double dPipeMaterial = flowProps.getdPipeMaterial();
|
||||
double dPipeD = flowProps.getdPipeD();
|
||||
double dPipeD_corrected = dPipeD * (1 + 0.000001*dPipeMaterial * (flowProps.getdTf() - 293.15));
|
||||
flowProps.setdPipeD(FormatUtil.format(dPipeD_corrected,Optional.of(2)));
|
||||
|
||||
// 更新直径比β
|
||||
flowProps.setdBeta( FormatUtil.format(flowProps.getdOrificeD() / flowProps.getdPipeD(),Optional.of(4)));
|
||||
}
|
||||
|
||||
/**
|
||||
* 计算渐近速度系数E（GB/T 21446-2008 式(8)）
|
||||
*/
|
||||
public static void calculateE(FlowProps flowProps) {
|
||||
double beta = flowProps.getdBeta();
|
||||
flowProps.setdE( FormatUtil.format(1 / Math.sqrt(1 - Math.pow(beta, 4)),Optional.of(4)));
|
||||
}
|
||||
|
||||
/**
|
||||
* 计算相对密度系数FG（GB/T 21446-2008 式(9)）
|
||||
*/
|
||||
public static void calculateFG(FlowProps flowProps,GasProps gasProps) {
|
||||
gasProps.setdRD_Real(gasProps.getdRD_Real());
|
||||
flowProps.setdFG( FormatUtil.format(1 / Math.sqrt(gasProps.dRD_Real),Optional.of(4)));
|
||||
}
|
||||
|
||||
/**
|
||||
* 计算流动温度系数FT（GB/T 21446-2008 式(10)）
|
||||
*/
|
||||
public static void calculateFT(FlowProps flowProps) {
|
||||
double Tb = flowProps.getdTb_M() ; // 参比温度转K
|
||||
double Tf = flowProps.getdTf() ; // 工况温度转K
|
||||
flowProps.setdFT( FormatUtil.format(Math.sqrt(Tb / Tf),Optional.of(4)));
|
||||
}
|
||||
|
||||
/**
|
||||
* 计算可膨胀系数ε（GB/T 21446-2008 式(11)）
|
||||
*/
|
||||
public static void calculateEpsilon(FlowProps flowProps, GasProps gasProps) {
|
||||
double P1 = flowProps.getdPf(); // 上游绝对压力(Pa)
|
||||
double deltaP = flowProps.getdDp(); // 差压(Pa)
|
||||
double beta = flowProps.getdBeta();
|
||||
double kappa = flowProps.getdKappa();
|
||||
|
||||
double tau = FormatUtil.format((P1 - deltaP) / P1, Optional.of(4)); // 压力比
|
||||
double epsilon=1 - (0.351 + 0.256 * Math.pow(beta, 4) + 0.93 * Math.pow(beta, 8)) * (1 - Math.pow(tau, 1/kappa));
|
||||
|
||||
flowProps.setdDExpCoefficient( FormatUtil.format(epsilon,Optional.of(4)));
|
||||
}
|
||||
/**
|
||||
* 计算等熵指数κ（GB/T 21446-2008 推荐方法）
|
||||
* @param gasProps 气体参数（需包含等熵指数或热容比）
|
||||
* @return 等熵指数κ
|
||||
*/
|
||||
public static double calculateKappa(GasProps gasProps) {
|
||||
// 若已通过AGA 8或其他方法计算，直接返回
|
||||
// if (gasProps.getdKappa() > 0) {
|
||||
// return gasProps.getdKappa();
|
||||
// }
|
||||
|
||||
// 近似公式：基于理想气体比热比和压缩因子修正
|
||||
double gamma = 1.3; // 天然气典型比热比（Cp/Cv≈1.3）
|
||||
double Z = gasProps.getdZf(); // 工况压缩因子
|
||||
|
||||
// 修正公式（经验关系）
|
||||
double kappa = gamma / (1 - (gamma - 1) * (1 / Z - 1));
|
||||
return FormatUtil.format(kappa,Optional.of(4));
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 迭代计算流量（GB/T 21446-2008 第7章）
|
||||
* @param flowProps 流量参数
|
||||
* @param gasProps 气体参数
|
||||
*/
|
||||
public static void iterativeFlowCalculation(FlowProps flowProps, GasProps gasProps) {
|
||||
// 0. 单位转换
|
||||
double D = flowProps.getdPipeD() / 1000.0; // 管道内径(m)
|
||||
double d = flowProps.getdOrificeD() / 1000.0; // 孔板孔径(m)
|
||||
double beta = flowProps.getdBeta();
|
||||
double P1 = flowProps.getdPf(); // 绝对压力(Pa)
|
||||
double deltaP = flowProps.getdDp(); // 差压(Pa)
|
||||
double Tf = flowProps.getdTf() ; // 工况温度(K)
|
||||
|
||||
flowProps.setdPb_M(gasProps.getdPb());
|
||||
flowProps.setdTb_M(gasProps.getdTb());
|
||||
flowProps.setdFpv(FormatUtil.format(gasProps.dFpv,Optional.of(4)));
|
||||
|
||||
// 1. 计算中间参数
|
||||
calculateE(flowProps);
|
||||
calculateFG(flowProps,gasProps);
|
||||
calculateFT(flowProps);
|
||||
|
||||
flowProps.setdKappa( calculateKappa(gasProps));
|
||||
// flowProps.setdDViscosity( calculateDynamicViscosity(gasProps));
|
||||
flowProps.setdDViscosity(FormatUtil.format( Dlndjs(flowProps.getdPf()/1e6,flowProps.getdTf()),Optional.of(5)));
|
||||
calculateEpsilon(flowProps, gasProps);
|
||||
|
||||
flowProps.setdKappa(1.357);
|
||||
// flowProps.setdBeta(0.5792);
|
||||
// flowProps.setdFpv(1.0195);
|
||||
// flowProps.setdFG(1.2531);
|
||||
// flowProps.setdE(1.0615);
|
||||
// flowProps.setdDExpCoefficient(0.9977);
|
||||
// flowProps.setdFT(1.0086);
|
||||
|
||||
|
||||
// 2. 初始雷诺数估算（假设初始C=0.6）
|
||||
double C_initial = 0.6;
|
||||
double Qf_initial = (C_initial * flowProps.getdE() * flowProps.getdDExpCoefficient() * Math.PI * Math.pow(d, 2) / 4)
|
||||
* Math.sqrt(2 * deltaP / (gasProps.dRhof * (1 - Math.pow(beta, 4))));
|
||||
flowProps.setdVFlowf(Qf_initial); // 初始工况流量(m³/s)
|
||||
|
||||
// 3. 迭代参数
|
||||
double tolerance = 1e-6;
|
||||
int maxIter = 100;
|
||||
double currentC = C_initial;
|
||||
double currentReD = calculateReD(Qf_initial, D, gasProps.dRhof, flowProps.getdDViscosity());
|
||||
int iter = 0;
|
||||
double prevC=0;
|
||||
// 4. 迭代循环
|
||||
do {
|
||||
prevC = currentC;
|
||||
|
||||
// 4.1 计算流出系数C（GB/T 21446-2008 附录A）
|
||||
currentC =FormatUtil.format( calculateCd(beta, currentReD, flowProps.getdPipeD(), flowProps.getdPtmode()),Optional.of(4));
|
||||
|
||||
// 4.2 更新流量
|
||||
double Qf =FormatUtil.format ((currentC * flowProps.getdDExpCoefficient() * Math.PI * Math.pow(d, 2) / 4)
|
||||
* Math.sqrt(2 * deltaP / (gasProps.dRhof * (1 - Math.pow(beta, 4)))),Optional.of(4));
|
||||
flowProps.setdVFlowf(Qf);
|
||||
|
||||
// 4.3 更新雷诺数
|
||||
currentReD =FormatUtil.format( calculateReD(Qf, D, gasProps.dRhof, flowProps.getdDViscosity()), Optional.of(2));
|
||||
|
||||
iter++;
|
||||
if (iter > maxIter) {
|
||||
throw new RuntimeException("迭代未收敛，超过最大迭代次数！");
|
||||
}
|
||||
} while (Math.abs(currentC - prevC) / currentC > tolerance);
|
||||
// 5. 保存最终结果
|
||||
|
||||
// 在迭代计算流出系数后，添加粗糙度修正
|
||||
|
||||
double K = calculateK(flowProps); // 根据实际管道类型选择
|
||||
double G_me = calculateRoughnessFactor(flowProps.getdPipeD(), K, currentC);
|
||||
double C_corrected = FormatUtil.format(currentC * G_me, Optional.of(4));
|
||||
|
||||
flowProps.setdCd(C_corrected);
|
||||
flowProps.setdRoughNessPipe(G_me);
|
||||
flowProps.setdRnPipe(currentReD);
|
||||
|
||||
|
||||
|
||||
|
||||
// 6. 计算标况流量（GB/T 21446-2008 式(1)）
|
||||
double Qn = flowProps.getdVFlowf() * (flowProps.getdFpv()*flowProps.getdFpv() * P1 / flowProps.getdPb_M())
|
||||
* (flowProps.getdTb_M()) / Tf;
|
||||
flowProps.setdVFlowb(FormatUtil.format(Qn,Optional.of(4)));
|
||||
|
||||
//标况质量流量
|
||||
flowProps.setdMFlowb(FormatUtil.format(flowProps.getdVFlowb() * gasProps.dRhob,Optional.of(4)));
|
||||
//标况能量流量
|
||||
flowProps.setdEFlowb(FormatUtil.format(flowProps.getdVFlowb() * gasProps.dHhvv,Optional.of(4)));
|
||||
//管道内天然气流速
|
||||
flowProps.setdVelocityFlow(FormatUtil.format(flowProps.getdVFlowf() / (Math.PI * Math.pow((flowProps.getdPipeD() / 2000), 2)),Optional.of(3)));
|
||||
//压力损失
|
||||
flowProps.setdPressLost(FormatUtil.format(YaLiSunShi(flowProps.getdCd(), flowProps.getdBeta(), flowProps.getdDp(), flowProps.getdCoreType()),Optional.of(2)));
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 计算天然气动力粘度（Sutherland公式简化版，适用于低压天然气）
|
||||
* @param gasProps 气体参数（需包含温度、密度、组分）
|
||||
* @return 动力粘度 (Pa·s)
|
||||
*/
|
||||
public static double calculateDynamicViscosity(GasProps gasProps) {
|
||||
double T = gasProps.getdTf() ; // 工况温度(K)
|
||||
double rho = gasProps.getdRhof(); // 工况密度(kg/m³)
|
||||
double Rd = gasProps.getdRD_Real(); // 真实相对密度
|
||||
|
||||
// Sutherland常数（天然气典型值，C=120）
|
||||
double C = 120.0; // Sutherland常数
|
||||
double mu0 = 1.0e-5; // 参考粘度 (Pa·s，@293.15K)
|
||||
|
||||
// 计算粘度（简化公式，忽略压力修正）
|
||||
double mu = mu0 * Math.pow(T / 293.15, 0.7) * (293.15 + C) / (T + C);
|
||||
|
||||
// 密度修正（经验公式）
|
||||
mu *= 1 + 0.001 * (rho - 1.2); // 密度对粘度的粗略修正
|
||||
|
||||
return FormatUtil.format( mu*1000,Optional.of(5));
|
||||
}
|
||||
/**
|
||||
* 计算雷诺数ReD（GB/T 21446-2008 式(5)）
|
||||
*/
|
||||
public static double calculateReD(double Qf, double D, double rho, double mu) {
|
||||
return FormatUtil.format( (4 * Qf * rho*1000) / (Math.PI * D * mu),Optional.of(2)); // Qf: m³/s, D: m, rho: kg/m³, mu: Pa·s
|
||||
}
|
||||
|
||||
/**
|
||||
* 计算流出系数C（GB/T 21446-2008 附录A）
|
||||
*/
|
||||
public static double calculateCd(double beta, double ReD, double D_mm, int ptMode) {
|
||||
double L1, L2;
|
||||
// 根据取压方式确定L1/L2（角接取压）
|
||||
switch (ptMode) {
|
||||
case 1: // 角接取压
|
||||
L1 = L2 = 0; // D单位为mm
|
||||
break;
|
||||
case 0: // 法兰取压
|
||||
L1 = L2 = 25.4 / D_mm;
|
||||
break;
|
||||
case 2: // D-D/2取压
|
||||
L1 = 1.0;
|
||||
L2 = 0.47;
|
||||
break;
|
||||
default:
|
||||
throw new IllegalArgumentException("不支持的取压方式");
|
||||
}
|
||||
|
||||
double term1 = 0.5961 + 0.0261 * Math.pow(beta, 2) - 0.216 * Math.pow(beta, 8);
|
||||
double term2 = 0.000521 * Math.pow(1e6 * beta / ReD, 0.7);
|
||||
double A = Math.pow(19000 * beta / ReD, 0.8);
|
||||
double term3 = (0.0188 + 0.0063 * A) * Math.pow(beta, 3.5) * Math.pow(1e6 / ReD, 0.3);
|
||||
double term4 = (0.043 + 0.08 * Math.exp(-10 * L1) - 0.123 * Math.exp(-7 * L1))
|
||||
* (1 - 0.11 * A) * Math.pow(beta, 4) / (1 - Math.pow(beta, 4));
|
||||
double term5 = -0.031 * (2 * L2 / (1 - beta) - 0.8 * Math.pow(2 * L2 / (1 - beta), 1.1))
|
||||
* Math.pow(beta, 1.3);
|
||||
|
||||
double Cd = term1 + term2 + term3 + term4 + term5;
|
||||
|
||||
// 孔径<71.12mm修正
|
||||
if (D_mm < 71.12) {
|
||||
Cd += 0.011 * (0.75 - beta) * (2.8 - D_mm / 25.4);
|
||||
}
|
||||
return FormatUtil.format(Cd,Optional.of(4));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
天然气音速喷嘴流量计算
|
||||
*/
|
||||
@ -263,11 +596,11 @@ public class FlowController {
|
||||
double[] Tik1 = new double[9];
|
||||
double C0 = 0;
|
||||
double C1 = 0;
|
||||
double Pai = 0;
|
||||
double Tuo = 0;
|
||||
double b = 0;
|
||||
double F0 = 0;
|
||||
double F1 = 0;
|
||||
double Pai ;
|
||||
double Tuo ;
|
||||
double b ;
|
||||
double F0 ;
|
||||
double F1 ;
|
||||
double Rf = 0.65;
|
||||
// 直径比大于0.25的修正因子
|
||||
nik0[0] = 1.068826e-3;
|
||||
@ -338,7 +671,7 @@ public class FlowController {
|
||||
}
|
||||
|
||||
//压力损失计算
|
||||
public final double YaLiSunShi(double tempLiuChuXiShu, double tempZjb, double tempDp, int JieLiuZhuangZhi)
|
||||
public static final double YaLiSunShi(double tempLiuChuXiShu, double tempZjb, double tempDp, int JieLiuZhuangZhi)
|
||||
{
|
||||
double ylss = 0;
|
||||
switch (JieLiuZhuangZhi)
|
||||
@ -356,18 +689,15 @@ public class FlowController {
|
||||
return ylss;
|
||||
}
|
||||
//查表计算粘度μ
|
||||
// VBConversions Note: Former VB static variables moved to class level because they aren't supported in C#.
|
||||
private final double[][] Dlndjs_Dlnd_Data = new double[8][11];
|
||||
private final double[] Dlndjs_Dlnd_T = new double[8];
|
||||
private final double[] Dlndjs_Dlnd_P = new double[11];
|
||||
|
||||
public final double Dlndjs(double tempP_jy, double tempT, int PU, int TU)
|
||||
{
|
||||
double s1 = 0;
|
||||
double s2 = 0;
|
||||
double ky = 0;
|
||||
double kx = 0;
|
||||
int i = 0;
|
||||
public static double Dlndjs(double tempP_jy, double tempT)
|
||||
{ double[][] Dlndjs_Dlnd_Data = new double[8][11];
|
||||
double[] Dlndjs_Dlnd_T = new double[8];
|
||||
double[] Dlndjs_Dlnd_P = new double[11];
|
||||
double s1 ;
|
||||
double s2 ;
|
||||
double ky ;
|
||||
double kx ;
|
||||
int i ;
|
||||
int m = 0;
|
||||
int n = 0;
|
||||
//On Error Resume Next VBConversions Warning: On Error Resume Next not supported in C#
|
||||
@ -548,7 +878,7 @@ public class FlowController {
|
||||
//6粗焊铁板收缩段经典文丘里管
|
||||
//7 1/4圆孔板
|
||||
|
||||
double tuo = 0;
|
||||
double tuo ;
|
||||
switch (JIeliuType)
|
||||
{
|
||||
case 0: //孔板流量计算
|
||||
@ -561,7 +891,6 @@ public class FlowController {
|
||||
case 1: //6143-1996
|
||||
returnValue = 1 - (0.41 + 0.35 * Math.pow(tempZjb, 4)) * tempDp_Pa / ( tempP_jy * tempDszs);
|
||||
break;
|
||||
|
||||
}
|
||||
break;
|
||||
case 1:
|
||||
@ -573,7 +902,6 @@ public class FlowController {
|
||||
switch (JiSuanBiaoZhun)
|
||||
{
|
||||
case 0:
|
||||
|
||||
//标准喷嘴 iso5167-2002
|
||||
tuo = (tempP_jy - tempDp_Pa) / (tempP_jy );
|
||||
returnValue = Math.pow((((tempDszs * Math.pow(tuo, (2 / tempDszs))) / (tempDszs - 1)) * ((1 - Math.pow(tempZjb, 4)) / (1 - Math.pow(tempZjb, 4) * Math.pow(tuo, (2 / tempDszs)))) * ((1 - Math.pow(tuo, ((tempDszs - 1) / tempDszs))) / (1 - tuo))), 0.5);
|
||||
@ -640,14 +968,12 @@ public class FlowController {
|
||||
L2 = 0.47F;
|
||||
break;
|
||||
}
|
||||
|
||||
switch (JiSuanBiaoZhun)
|
||||
{
|
||||
case 0: //6143-2004
|
||||
if (tempGj >= 71.12)
|
||||
{
|
||||
returnValue = 0.5961 + 0.0261 * Math.pow(tempZjb, 2) - 0.216 * Math.pow(tempZjb, 8) + 0.000521 * Math.pow((1000000.0D * tempZjb / tempReD), 0.7) + (0.0188 + 0.0063 * Math.pow((19000 * tempZjb / tempReD), 0.8)) * Math.pow(tempZjb, 3.5) * Math.pow((1000000.0D / tempReD), 0.3) + (0.043 + 0.08 * Math.exp(-10 * L1) - 0.123 * Math.exp(-7 * L1)) * (1 - 0.11 * Math.pow((19000 * tempZjb / tempReD), 0.8)) * (Math.pow(tempZjb, 4) * Math.pow((1 - Math.pow(tempZjb, 4)), (-1))) - 0.031 * (2 * L2 / (1 - tempZjb) - 0.8 * Math.pow((2 * L2 / (1 - tempZjb)), 1.1)) * Math.pow(tempZjb, 1.3);
|
||||
|
||||
}
|
||||
else if (tempGj < 71.12)
|
||||
{
|
||||
@ -666,9 +992,6 @@ public class FlowController {
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
|
||||
case 1: //ISA1932喷嘴
|
||||
returnValue = (0.99 - 0.2262 * Math.pow(tempZjb, 4.1) - (0.00175 * Math.pow(tempZjb, 2) - 0.0033 * Math.pow(tempZjb, 4.15)) * (1000000.0D / Math.pow(tempReD, 1.15)));
|
||||
break;
|
||||
@ -696,11 +1019,9 @@ public class FlowController {
|
||||
break;
|
||||
case 9: //偏心孔板
|
||||
returnValue = 0.9355 - 1.6889 * tempZjb + 3.0428 * Math.pow(tempZjb, 2) - 1.7989 * Math.pow(tempZjb, 3);
|
||||
|
||||
|
||||
break;
|
||||
}
|
||||
double tempRed1 = 0;
|
||||
double tempRed1 ;
|
||||
switch (JieLiuType)
|
||||
{
|
||||
case 0: //孔板流量计算
|
||||
@ -752,8 +1073,6 @@ public class FlowController {
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
case 2: //长径喷嘴
|
||||
tempRed1 = tempconQvA * returnValue;
|
||||
if (tempRed1 < 10000.0D | tempRed1 > 10000000.0D)
|
||||
@ -806,24 +1125,15 @@ public class FlowController {
|
||||
return returnValue;
|
||||
}
|
||||
|
||||
private double BkTable(double temPrk, double tempKj, int tempBkjsff)
|
||||
{
|
||||
|
||||
double[] BkTable_x = new double[10];
|
||||
double[] BkTable_Y = new double[10];
|
||||
|
||||
|
||||
private double BkTable(double temPrk, double tempKj, int tempBkjsff) {
|
||||
double[] BkTable_x = new double[10];
|
||||
double[] BkTable_Y = new double[10];
|
||||
//On Error Resume Next VBConversions Warning: On Error Resume Next not supported in C#
|
||||
|
||||
if (tempBkjsff == 1)
|
||||
{
|
||||
|
||||
double tempRkBiKj = 0;
|
||||
tempRkBiKj = temPrk / tempKj;
|
||||
|
||||
if (tempBkjsff == 1) {
|
||||
double tempRkBiKj = temPrk / tempKj;
|
||||
// static double[] x = new double[10]; //VBConversions Note: Static variable moved to class level and renamed BkTable_x. Local static variables are not supported in C#.
|
||||
// static double[] Y = new double[10]; //VBConversions Note: Static variable moved to class level and renamed BkTable_Y. Local static variables are not supported in C#.
|
||||
int i = 0;
|
||||
int i;
|
||||
int xIndex = 0;
|
||||
//If x(0) = 0 Then
|
||||
BkTable_x[0] = 0.0004F;
|
||||
@ -849,21 +1159,14 @@ public class FlowController {
|
||||
BkTable_Y[9] = 1.065F;
|
||||
//End If
|
||||
|
||||
if (tempRkBiKj <= 0.0004)
|
||||
{
|
||||
if (tempRkBiKj <= 0.0004) {
|
||||
return 1;
|
||||
|
||||
}
|
||||
if (tempRkBiKj > 0.015)
|
||||
{
|
||||
if (tempRkBiKj > 0.015) {
|
||||
return 1.065F;
|
||||
|
||||
}
|
||||
|
||||
for (i = 0; i <= 8; i++)
|
||||
{
|
||||
if (tempRkBiKj >= BkTable_x[i] && tempRkBiKj <= BkTable_x[i + 1])
|
||||
{
|
||||
for (i = 0; i <= 8; i++) {
|
||||
if (tempRkBiKj >= BkTable_x[i] && tempRkBiKj <= BkTable_x[i + 1]) {
|
||||
xIndex = i;
|
||||
break;
|
||||
}
|
||||
@ -875,52 +1178,63 @@ public class FlowController {
|
||||
//管道粗糙度计算
|
||||
private double CcdXsjs(double tempPipeType, double tempGj, double tempZjb, double TempRed)
|
||||
{
|
||||
double returnValue = 0;
|
||||
double returnValue ;
|
||||
//粗糙度系数计算
|
||||
double Jdccd = 0; //绝对粗糙度
|
||||
double Xdccd = 0; //相对粗糙度
|
||||
double Xdccd ; //相对粗糙度
|
||||
//Dim CcdXs As single
|
||||
double s1 = 0;
|
||||
double s2 = 0;
|
||||
double ky = 0;
|
||||
double kx = 0;
|
||||
int i = 0;
|
||||
double s1 ;
|
||||
double s2 ;
|
||||
double ky ;
|
||||
double kx ;
|
||||
int i ;
|
||||
int m = 0;
|
||||
int n = 0;
|
||||
if (tempPipeType == 0)
|
||||
{
|
||||
Jdccd = 0.029F;
|
||||
|
||||
Jdccd = 0.029F;}
|
||||
else if (tempPipeType == 1)
|
||||
{
|
||||
Jdccd = 0.075F;
|
||||
}
|
||||
else if (tempPipeType == 2)
|
||||
{
|
||||
Jdccd = 0.075F;
|
||||
|
||||
}
|
||||
else if (tempPipeType == 3)
|
||||
{
|
||||
Jdccd = 0.075F;
|
||||
}
|
||||
else if (tempPipeType == 4)
|
||||
{
|
||||
Jdccd = 0.1F;
|
||||
|
||||
}
|
||||
else if (tempPipeType == 5)
|
||||
{
|
||||
Jdccd = 0.15F;
|
||||
}
|
||||
else if (tempPipeType == 6)
|
||||
{
|
||||
Jdccd = 1;
|
||||
|
||||
}
|
||||
else if (tempPipeType == 7)
|
||||
{
|
||||
Jdccd = 2.1F;
|
||||
}
|
||||
else if (tempPipeType == 8)
|
||||
{
|
||||
Jdccd = 0.04F;
|
||||
|
||||
}
|
||||
else if (tempPipeType == 9)
|
||||
{
|
||||
Jdccd = 0.15F;
|
||||
}
|
||||
else if (tempPipeType == 10)
|
||||
{
|
||||
Jdccd = 0.13F;
|
||||
|
||||
}
|
||||
else if (tempPipeType == 11)
|
||||
{
|
||||
Jdccd = 0.25F;
|
||||
}
|
||||
Xdccd = tempGj / Jdccd;
|
||||
@ -976,7 +1290,7 @@ public class FlowController {
|
||||
CcdXsb[5][1] = 1;
|
||||
CcdXsb[6][1] = 1;
|
||||
CcdXsb[7][1] = 1;
|
||||
CcdXsb[8][0] = 1;
|
||||
|
||||
CcdXsb[0][2] = 1.006;
|
||||
CcdXsb[1][2] = 1.004;
|
||||
CcdXsb[2][2] = 1.002;
|
||||
@ -985,7 +1299,7 @@ public class FlowController {
|
||||
CcdXsb[5][2] = 1;
|
||||
CcdXsb[6][2] = 1;
|
||||
CcdXsb[7][2] = 1;
|
||||
CcdXsb[8][0] = 1;
|
||||
|
||||
CcdXsb[0][3] = 1.009;
|
||||
CcdXsb[1][3] = 1.006;
|
||||
CcdXsb[2][3] = 1.004;
|
||||
@ -994,7 +1308,7 @@ public class FlowController {
|
||||
CcdXsb[5][3] = 1;
|
||||
CcdXsb[6][3] = 1;
|
||||
CcdXsb[7][3] = 1;
|
||||
CcdXsb[8][0] = 1;
|
||||
|
||||
CcdXsb[0][4] = 1.014;
|
||||
CcdXsb[1][4] = 1.009;
|
||||
CcdXsb[2][4] = 1.006;
|
||||
@ -1003,7 +1317,7 @@ public class FlowController {
|
||||
CcdXsb[5][4] = 1.001;
|
||||
CcdXsb[6][4] = 1;
|
||||
CcdXsb[7][4] = 1;
|
||||
CcdXsb[8][0] = 1;
|
||||
|
||||
CcdXsb[0][5] = 1.02;
|
||||
CcdXsb[1][5] = 1.013;
|
||||
CcdXsb[2][5] = 1.009;
|
||||
@ -1012,7 +1326,7 @@ public class FlowController {
|
||||
CcdXsb[5][5] = 1.002;
|
||||
CcdXsb[6][5] = 1;
|
||||
CcdXsb[7][5] = 1;
|
||||
CcdXsb[8][0] = 1;
|
||||
|
||||
CcdXsb[0][6] = 1.024;
|
||||
CcdXsb[1][6] = 1.016;
|
||||
CcdXsb[2][6] = 1.011;
|
||||
@ -1021,7 +1335,7 @@ public class FlowController {
|
||||
CcdXsb[5][6] = 1.002;
|
||||
CcdXsb[6][6] = 1.002;
|
||||
CcdXsb[7][6] = 1;
|
||||
CcdXsb[8][0] = 1;
|
||||
|
||||
|
||||
for (i = 0; i <= 8; i++)
|
||||
{
|
||||
@ -0,0 +1,40 @@
|
||||
package com.ruoyi.ngCalTools.controller;
|
||||
|
||||
import java.text.DecimalFormat;
|
||||
import java.util.Optional;
|
||||
|
||||
public class FormatUtil {
|
||||
private static final DecimalFormat df1 = new DecimalFormat("#0.0");
|
||||
private static final DecimalFormat df2 = new DecimalFormat("#0.00");
|
||||
private static final DecimalFormat df3 = new DecimalFormat("#0.000");
|
||||
private static final DecimalFormat df4 = new DecimalFormat("#0.0000");
|
||||
private static final DecimalFormat df5 = new DecimalFormat("#0.00000");
|
||||
|
||||
public static double format(double value, Optional<Integer> weishu ) {
|
||||
double result;
|
||||
Integer weishudefault=weishu.orElse(4);
|
||||
|
||||
switch (weishudefault) {
|
||||
case 1:
|
||||
result= Double.parseDouble(df1.format(value));
|
||||
break;
|
||||
case 2:
|
||||
result= Double.parseDouble(df2.format(value));
|
||||
break;
|
||||
case 3:
|
||||
result= Double.parseDouble(df3.format(value));
|
||||
break;
|
||||
case 4:
|
||||
result= Double.parseDouble(df4.format(value));
|
||||
break;
|
||||
case 5:
|
||||
result= Double.parseDouble(df5.format(value));
|
||||
break;
|
||||
|
||||
default:
|
||||
throw new IllegalStateException("Unexpected value: " + weishu);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
}
|
||||
@ -4,4 +4,5 @@ public enum GasComponent {
|
||||
XiC1, XiN2, XiCO2, XiC2, XiC3,
|
||||
XiH2O, XiH2S, XiH2, XiCO, XiO2, XiIC4, XiNC4,
|
||||
XiIC5, XiNC5, XiNC6, XiNC7, XiNC8, XiNC9, XiNC10, XiHe, XiAr
|
||||
}
|
||||
}
|
||||
|
||||
@ -568,6 +568,17 @@ public class FlowProps {
|
||||
private double dE; // 求渐近速度系数 E
|
||||
private double dFG; // 求相对密度系数 FG
|
||||
private double dFT; // 求流动温度系数 FT
|
||||
|
||||
public double getdFpv() {
|
||||
return dFpv;
|
||||
}
|
||||
|
||||
public void setdFpv(double dFpv) {
|
||||
this.dFpv = dFpv;
|
||||
}
|
||||
|
||||
private double dFpv; // 求超压缩因子 Fpv
|
||||
|
||||
private double dDViscosity; // 求动力粘度 dlnd
|
||||
private double dDExpCoefficient; // 求可膨胀系数
|
||||
private double dRnPipe; // 管道雷诺数
|
||||
@ -1,4 +1,4 @@
|
||||
package com.ruoyi.system.controller;
|
||||
package com.ruoyi.ngtools.controller;
|
||||
|
||||
import java.util.List;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
@ -16,8 +16,8 @@ import com.ruoyi.common.annotation.Log;
|
||||
import com.ruoyi.common.core.controller.BaseController;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.common.enums.BusinessType;
|
||||
import com.ruoyi.system.domain.NgComponents;
|
||||
import com.ruoyi.system.service.INgComponentsService;
|
||||
import com.ruoyi.ngtools.domain.NgComponents;
|
||||
import com.ruoyi.ngtools.service.INgComponentsService;
|
||||
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
@ -30,7 +30,7 @@ import io.swagger.v3.oas.annotations.Operation;
|
||||
* @date 2025-03-21
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/system/components")
|
||||
@RequestMapping("/ngtools/components")
|
||||
@Tag(name = "【天然气组分】管理")
|
||||
public class NgComponentsController extends BaseController
|
||||
{
|
||||
@ -41,7 +41,7 @@ public class NgComponentsController extends BaseController
|
||||
* 查询天然气组分列表
|
||||
*/
|
||||
@Operation(summary = "查询天然气组分列表")
|
||||
@PreAuthorize("@ss.hasPermi('system:components:list')")
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:components:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(NgComponents ngComponents)
|
||||
{
|
||||
@ -54,7 +54,7 @@ public class NgComponentsController extends BaseController
|
||||
* 导出天然气组分列表
|
||||
*/
|
||||
@Operation(summary = "导出天然气组分列表")
|
||||
@PreAuthorize("@ss.hasPermi('system:components:export')")
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:components:export')")
|
||||
@Log(title = "天然气组分", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, NgComponents ngComponents)
|
||||
@ -68,7 +68,7 @@ public class NgComponentsController extends BaseController
|
||||
* 获取天然气组分详细信息
|
||||
*/
|
||||
@Operation(summary = "获取天然气组分详细信息")
|
||||
@PreAuthorize("@ss.hasPermi('system:components:query')")
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:components:query')")
|
||||
@GetMapping(value = "/{id}")
|
||||
public AjaxResult getInfo(@PathVariable("id") String id)
|
||||
{
|
||||
@ -79,7 +79,7 @@ public class NgComponentsController extends BaseController
|
||||
* 新增天然气组分
|
||||
*/
|
||||
@Operation(summary = "新增天然气组分")
|
||||
@PreAuthorize("@ss.hasPermi('system:components:add')")
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:components:add')")
|
||||
@Log(title = "天然气组分", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody NgComponents ngComponents)
|
||||
@ -91,7 +91,7 @@ public class NgComponentsController extends BaseController
|
||||
* 修改天然气组分
|
||||
*/
|
||||
@Operation(summary = "修改天然气组分")
|
||||
@PreAuthorize("@ss.hasPermi('system:components:edit')")
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:components:edit')")
|
||||
@Log(title = "天然气组分", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody NgComponents ngComponents)
|
||||
@ -103,7 +103,7 @@ public class NgComponentsController extends BaseController
|
||||
* 删除天然气组分
|
||||
*/
|
||||
@Operation(summary = "删除天然气组分")
|
||||
@PreAuthorize("@ss.hasPermi('system:components:remove')")
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:components:remove')")
|
||||
@Log(title = "天然气组分", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public AjaxResult remove(@PathVariable( name = "ids" ) String[] ids)
|
||||
@ -1,4 +1,4 @@
|
||||
package com.ruoyi.system.controller;
|
||||
package com.ruoyi.ngtools.controller;
|
||||
|
||||
import java.util.List;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
@ -16,8 +16,8 @@ import com.ruoyi.common.annotation.Log;
|
||||
import com.ruoyi.common.core.controller.BaseController;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.common.enums.BusinessType;
|
||||
import com.ruoyi.system.domain.NgMeterpar;
|
||||
import com.ruoyi.system.service.INgMeterparService;
|
||||
import com.ruoyi.ngtools.domain.NgMeterpar;
|
||||
import com.ruoyi.ngtools.service.INgMeterparService;
|
||||
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
@ -30,7 +30,7 @@ import io.swagger.v3.oas.annotations.Operation;
|
||||
* @date 2025-03-21
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/system/meterpar")
|
||||
@RequestMapping("/ngtools/meterpar")
|
||||
@Tag(name = "【流量计参数】管理")
|
||||
public class NgMeterparController extends BaseController
|
||||
{
|
||||
@ -41,7 +41,7 @@ public class NgMeterparController extends BaseController
|
||||
* 查询流量计参数列表
|
||||
*/
|
||||
@Operation(summary = "查询流量计参数列表")
|
||||
@PreAuthorize("@ss.hasPermi('system:meterpar:list')")
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:meterpar:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(NgMeterpar ngMeterpar)
|
||||
{
|
||||
@ -54,7 +54,7 @@ public class NgMeterparController extends BaseController
|
||||
* 导出流量计参数列表
|
||||
*/
|
||||
@Operation(summary = "导出流量计参数列表")
|
||||
@PreAuthorize("@ss.hasPermi('system:meterpar:export')")
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:meterpar:export')")
|
||||
@Log(title = "流量计参数", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, NgMeterpar ngMeterpar)
|
||||
@ -68,7 +68,7 @@ public class NgMeterparController extends BaseController
|
||||
* 获取流量计参数详细信息
|
||||
*/
|
||||
@Operation(summary = "获取流量计参数详细信息")
|
||||
@PreAuthorize("@ss.hasPermi('system:meterpar:query')")
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:meterpar:query')")
|
||||
@GetMapping(value = "/{id}")
|
||||
public AjaxResult getInfo(@PathVariable("id") String id)
|
||||
{
|
||||
@ -79,7 +79,7 @@ public class NgMeterparController extends BaseController
|
||||
* 新增流量计参数
|
||||
*/
|
||||
@Operation(summary = "新增流量计参数")
|
||||
@PreAuthorize("@ss.hasPermi('system:meterpar:add')")
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:meterpar:add')")
|
||||
@Log(title = "流量计参数", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody NgMeterpar ngMeterpar)
|
||||
@ -91,7 +91,7 @@ public class NgMeterparController extends BaseController
|
||||
* 修改流量计参数
|
||||
*/
|
||||
@Operation(summary = "修改流量计参数")
|
||||
@PreAuthorize("@ss.hasPermi('system:meterpar:edit')")
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:meterpar:edit')")
|
||||
@Log(title = "流量计参数", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody NgMeterpar ngMeterpar)
|
||||
@ -103,7 +103,7 @@ public class NgMeterparController extends BaseController
|
||||
* 删除流量计参数
|
||||
*/
|
||||
@Operation(summary = "删除流量计参数")
|
||||
@PreAuthorize("@ss.hasPermi('system:meterpar:remove')")
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:meterpar:remove')")
|
||||
@Log(title = "流量计参数", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public AjaxResult remove(@PathVariable( name = "ids" ) String[] ids)
|
||||
@ -1,4 +1,4 @@
|
||||
package com.ruoyi.system.controller;
|
||||
package com.ruoyi.ngtools.controller;
|
||||
|
||||
import java.util.List;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
@ -16,8 +16,8 @@ import com.ruoyi.common.annotation.Log;
|
||||
import com.ruoyi.common.core.controller.BaseController;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.common.enums.BusinessType;
|
||||
import com.ruoyi.system.domain.NgMeterresult;
|
||||
import com.ruoyi.system.service.INgMeterresultService;
|
||||
import com.ruoyi.ngtools.domain.NgMeterresult;
|
||||
import com.ruoyi.ngtools.service.INgMeterresultService;
|
||||
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
@ -30,7 +30,7 @@ import io.swagger.v3.oas.annotations.Operation;
|
||||
* @date 2025-03-21
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/system/meterresult")
|
||||
@RequestMapping("/ngtools/meterresult")
|
||||
@Tag(name = "【流量计算结果】管理")
|
||||
public class NgMeterresultController extends BaseController
|
||||
{
|
||||
@ -41,7 +41,7 @@ public class NgMeterresultController extends BaseController
|
||||
* 查询流量计算结果列表
|
||||
*/
|
||||
@Operation(summary = "查询流量计算结果列表")
|
||||
@PreAuthorize("@ss.hasPermi('system:meterresult:list')")
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:meterresult:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(NgMeterresult ngMeterresult)
|
||||
{
|
||||
@ -54,7 +54,7 @@ public class NgMeterresultController extends BaseController
|
||||
* 导出流量计算结果列表
|
||||
*/
|
||||
@Operation(summary = "导出流量计算结果列表")
|
||||
@PreAuthorize("@ss.hasPermi('system:meterresult:export')")
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:meterresult:export')")
|
||||
@Log(title = "流量计算结果", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, NgMeterresult ngMeterresult)
|
||||
@ -68,7 +68,7 @@ public class NgMeterresultController extends BaseController
|
||||
* 获取流量计算结果详细信息
|
||||
*/
|
||||
@Operation(summary = "获取流量计算结果详细信息")
|
||||
@PreAuthorize("@ss.hasPermi('system:meterresult:query')")
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:meterresult:query')")
|
||||
@GetMapping(value = "/{id}")
|
||||
public AjaxResult getInfo(@PathVariable("id") String id)
|
||||
{
|
||||
@ -79,7 +79,7 @@ public class NgMeterresultController extends BaseController
|
||||
* 新增流量计算结果
|
||||
*/
|
||||
@Operation(summary = "新增流量计算结果")
|
||||
@PreAuthorize("@ss.hasPermi('system:meterresult:add')")
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:meterresult:add')")
|
||||
@Log(title = "流量计算结果", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody NgMeterresult ngMeterresult)
|
||||
@ -91,7 +91,7 @@ public class NgMeterresultController extends BaseController
|
||||
* 修改流量计算结果
|
||||
*/
|
||||
@Operation(summary = "修改流量计算结果")
|
||||
@PreAuthorize("@ss.hasPermi('system:meterresult:edit')")
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:meterresult:edit')")
|
||||
@Log(title = "流量计算结果", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody NgMeterresult ngMeterresult)
|
||||
@ -103,7 +103,7 @@ public class NgMeterresultController extends BaseController
|
||||
* 删除流量计算结果
|
||||
*/
|
||||
@Operation(summary = "删除流量计算结果")
|
||||
@PreAuthorize("@ss.hasPermi('system:meterresult:remove')")
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:meterresult:remove')")
|
||||
@Log(title = "流量计算结果", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public AjaxResult remove(@PathVariable( name = "ids" ) String[] ids)
|
||||
@ -1,4 +1,4 @@
|
||||
package com.ruoyi.system.controller;
|
||||
package com.ruoyi.ngtools.controller;
|
||||
|
||||
import java.util.List;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
@ -16,8 +16,8 @@ import com.ruoyi.common.annotation.Log;
|
||||
import com.ruoyi.common.core.controller.BaseController;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.common.enums.BusinessType;
|
||||
import com.ruoyi.system.domain.NgNgpar;
|
||||
import com.ruoyi.system.service.INgNgparService;
|
||||
import com.ruoyi.ngtools.domain.NgNgpar;
|
||||
import com.ruoyi.ngtools.service.INgNgparService;
|
||||
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
@ -30,7 +30,7 @@ import io.swagger.v3.oas.annotations.Operation;
|
||||
* @date 2025-03-21
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/system/ngpar")
|
||||
@RequestMapping("/ngtools/ngpar")
|
||||
@Tag(name = "【天然气物性参数】管理")
|
||||
public class NgNgparController extends BaseController
|
||||
{
|
||||
@ -41,7 +41,7 @@ public class NgNgparController extends BaseController
|
||||
* 查询天然气物性参数列表
|
||||
*/
|
||||
@Operation(summary = "查询天然气物性参数列表")
|
||||
@PreAuthorize("@ss.hasPermi('system:ngpar:list')")
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:ngpar:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(NgNgpar ngNgpar)
|
||||
{
|
||||
@ -54,7 +54,7 @@ public class NgNgparController extends BaseController
|
||||
* 导出天然气物性参数列表
|
||||
*/
|
||||
@Operation(summary = "导出天然气物性参数列表")
|
||||
@PreAuthorize("@ss.hasPermi('system:ngpar:export')")
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:ngpar:export')")
|
||||
@Log(title = "天然气物性参数", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, NgNgpar ngNgpar)
|
||||
@ -68,7 +68,7 @@ public class NgNgparController extends BaseController
|
||||
* 获取天然气物性参数详细信息
|
||||
*/
|
||||
@Operation(summary = "获取天然气物性参数详细信息")
|
||||
@PreAuthorize("@ss.hasPermi('system:ngpar:query')")
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:ngpar:query')")
|
||||
@GetMapping(value = "/{id}")
|
||||
public AjaxResult getInfo(@PathVariable("id") String id)
|
||||
{
|
||||
@ -79,7 +79,7 @@ public class NgNgparController extends BaseController
|
||||
* 新增天然气物性参数
|
||||
*/
|
||||
@Operation(summary = "新增天然气物性参数")
|
||||
@PreAuthorize("@ss.hasPermi('system:ngpar:add')")
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:ngpar:add')")
|
||||
@Log(title = "天然气物性参数", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody NgNgpar ngNgpar)
|
||||
@ -91,7 +91,7 @@ public class NgNgparController extends BaseController
|
||||
* 修改天然气物性参数
|
||||
*/
|
||||
@Operation(summary = "修改天然气物性参数")
|
||||
@PreAuthorize("@ss.hasPermi('system:ngpar:edit')")
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:ngpar:edit')")
|
||||
@Log(title = "天然气物性参数", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody NgNgpar ngNgpar)
|
||||
@ -103,7 +103,7 @@ public class NgNgparController extends BaseController
|
||||
* 删除天然气物性参数
|
||||
*/
|
||||
@Operation(summary = "删除天然气物性参数")
|
||||
@PreAuthorize("@ss.hasPermi('system:ngpar:remove')")
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:ngpar:remove')")
|
||||
@Log(title = "天然气物性参数", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public AjaxResult remove(@PathVariable( name = "ids" ) String[] ids)
|
||||
@ -1,4 +1,4 @@
|
||||
package com.ruoyi.system.domain;
|
||||
package com.ruoyi.ngtools.domain;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.ruoyi.system.domain;
|
||||
package com.ruoyi.ngtools.domain;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.ruoyi.system.domain;
|
||||
package com.ruoyi.ngtools.domain;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.ruoyi.system.domain;
|
||||
package com.ruoyi.ngtools.domain;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
@ -7,7 +7,7 @@ import com.ruoyi.ngtools.domain.NgComponents;
|
||||
* 天然气组分Mapper接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-02-09
|
||||
* @date 2025-03-21
|
||||
*/
|
||||
public interface NgComponentsMapper
|
||||
{
|
||||
@ -7,7 +7,7 @@ import com.ruoyi.ngtools.domain.NgMeterpar;
|
||||
* 流量计参数Mapper接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-02-09
|
||||
* @date 2025-03-21
|
||||
*/
|
||||
public interface NgMeterparMapper
|
||||
{
|
||||
@ -7,7 +7,7 @@ import com.ruoyi.ngtools.domain.NgMeterresult;
|
||||
* 流量计算结果Mapper接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-02-09
|
||||
* @date 2025-03-21
|
||||
*/
|
||||
public interface NgMeterresultMapper
|
||||
{
|
||||
@ -7,7 +7,7 @@ import com.ruoyi.ngtools.domain.NgNgpar;
|
||||
* 天然气物性参数Mapper接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-02-09
|
||||
* @date 2025-03-21
|
||||
*/
|
||||
public interface NgNgparMapper
|
||||
{
|
||||
@ -7,7 +7,7 @@ import com.ruoyi.ngtools.domain.NgComponents;
|
||||
* 天然气组分Service接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-02-09
|
||||
* @date 2025-03-21
|
||||
*/
|
||||
public interface INgComponentsService
|
||||
{
|
||||
@ -7,7 +7,7 @@ import com.ruoyi.ngtools.domain.NgMeterpar;
|
||||
* 流量计参数Service接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-02-09
|
||||
* @date 2025-03-21
|
||||
*/
|
||||
public interface INgMeterparService
|
||||
{
|
||||
@ -7,7 +7,7 @@ import com.ruoyi.ngtools.domain.NgMeterresult;
|
||||
* 流量计算结果Service接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-02-09
|
||||
* @date 2025-03-21
|
||||
*/
|
||||
public interface INgMeterresultService
|
||||
{
|
||||
@ -7,7 +7,7 @@ import com.ruoyi.ngtools.domain.NgNgpar;
|
||||
* 天然气物性参数Service接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-02-09
|
||||
* @date 2025-03-21
|
||||
*/
|
||||
public interface INgNgparService
|
||||
{
|
||||
@ -12,7 +12,7 @@ import com.ruoyi.ngtools.service.INgComponentsService;
|
||||
* 天然气组分Service业务层处理
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-02-09
|
||||
* @date 2025-03-21
|
||||
*/
|
||||
@Service
|
||||
public class NgComponentsServiceImpl implements INgComponentsService
|
||||
@ -12,7 +12,7 @@ import com.ruoyi.ngtools.service.INgMeterparService;
|
||||
* 流量计参数Service业务层处理
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-02-09
|
||||
* @date 2025-03-21
|
||||
*/
|
||||
@Service
|
||||
public class NgMeterparServiceImpl implements INgMeterparService
|
||||
@ -12,7 +12,7 @@ import com.ruoyi.ngtools.service.INgMeterresultService;
|
||||
* 流量计算结果Service业务层处理
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-02-09
|
||||
* @date 2025-03-21
|
||||
*/
|
||||
@Service
|
||||
public class NgMeterresultServiceImpl implements INgMeterresultService
|
||||
@ -12,7 +12,7 @@ import com.ruoyi.ngtools.service.INgNgparService;
|
||||
* 天然气物性参数Service业务层处理
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-02-09
|
||||
* @date 2025-03-21
|
||||
*/
|
||||
@Service
|
||||
public class NgNgparServiceImpl implements INgNgparService
|
||||
@ -5,82 +5,118 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<mapper namespace="com.ruoyi.ngtools.mapper.NgComponentsMapper">
|
||||
|
||||
<resultMap type="NgComponents" id="NgComponentsResult">
|
||||
<result property="id" column="id" />
|
||||
<result property="createName" column="create_name" />
|
||||
<result property="createBy" column="create_by" />
|
||||
<result property="createTime" column="create_time" />
|
||||
<result property="updateName" column="update_name" />
|
||||
<result property="updateBy" column="update_by" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
<result property="ngC1" column="NG_C1" />
|
||||
<result property="ngN2" column="NG_N2" />
|
||||
<result property="ngCo2" column="NG_CO2" />
|
||||
<result property="ngC2" column="NG_C2" />
|
||||
<result property="ngC3" column="NG_C3" />
|
||||
<result property="ngH2o" column="NG_H2O" />
|
||||
<result property="ngH2s" column="NG_H2S" />
|
||||
<result property="ngH2" column="NG_H2" />
|
||||
<result property="ngCo" column="NG_CO" />
|
||||
<result property="ngO2" column="NG_O2" />
|
||||
<result property="ngIc4" column="NG_iC4" />
|
||||
<result property="ngNc4" column="NG_nC4" />
|
||||
<result property="ngIc5" column="NG_iC5" />
|
||||
<result property="ngNc5" column="NG_nC5" />
|
||||
<result property="ngC6" column="NG_C6" />
|
||||
<result property="ngC7" column="NG_C7" />
|
||||
<result property="ngC8" column="NG_C8" />
|
||||
<result property="ngC9" column="NG_C9" />
|
||||
<result property="ngC10" column="NG_C10" />
|
||||
<result property="ngHe" column="NG_He" />
|
||||
<result property="ngAr" column="NG_Ar" />
|
||||
<result property="sum" column="sum" />
|
||||
<result property="sampleno" column="sampleno" />
|
||||
<result property="meterno" column="meterno" />
|
||||
<result property="cyzf" column="cyzf" />
|
||||
<result property="id" column="id" />
|
||||
<result property="createName" column="create_name" />
|
||||
<result property="createBy" column="create_by" />
|
||||
<result property="createTime" column="create_time" />
|
||||
<result property="updateName" column="update_name" />
|
||||
<result property="updateBy" column="update_by" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
<result property="ngC1" column="NG_C1" />
|
||||
<result property="ngN2" column="NG_N2" />
|
||||
<result property="ngCo2" column="NG_CO2" />
|
||||
<result property="ngC2" column="NG_C2" />
|
||||
<result property="ngC3" column="NG_C3" />
|
||||
<result property="ngH2o" column="NG_H2O" />
|
||||
<result property="ngH2s" column="NG_H2S" />
|
||||
<result property="ngH2" column="NG_H2" />
|
||||
<result property="ngCo" column="NG_CO" />
|
||||
<result property="ngO2" column="NG_O2" />
|
||||
<result property="ngIc4" column="NG_iC4" />
|
||||
<result property="ngNc4" column="NG_nC4" />
|
||||
<result property="ngIc5" column="NG_iC5" />
|
||||
<result property="ngNc5" column="NG_nC5" />
|
||||
<result property="ngC6" column="NG_C6" />
|
||||
<result property="ngC7" column="NG_C7" />
|
||||
<result property="ngC8" column="NG_C8" />
|
||||
<result property="ngC9" column="NG_C9" />
|
||||
<result property="ngC10" column="NG_C10" />
|
||||
<result property="ngHe" column="NG_He" />
|
||||
<result property="ngAr" column="NG_Ar" />
|
||||
<result property="sum" column="sum" />
|
||||
<result property="sampleno" column="sampleno" />
|
||||
<result property="meterno" column="meterno" />
|
||||
<result property="cyzf" column="cyzf" />
|
||||
<result property="tenantId" column="tenant_id" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectNgComponentsVo">
|
||||
select id, create_name, create_by, create_time, update_name, update_by, update_time, NG_C1, NG_N2, NG_CO2, NG_C2, NG_C3, NG_H2O, NG_H2S, NG_H2, NG_CO, NG_O2, NG_iC4, NG_nC4, NG_iC5, NG_nC5, NG_C6, NG_C7, NG_C8, NG_C9, NG_C10, NG_He, NG_Ar, sum, sampleno, meterno, cyzf from ng_components
|
||||
select
|
||||
nc.id,
|
||||
nc.create_name,
|
||||
nc.create_by,
|
||||
nc.create_time,
|
||||
nc.update_name,
|
||||
nc.update_by,
|
||||
nc.update_time,
|
||||
nc.NG_C1,
|
||||
nc.NG_N2,
|
||||
nc.NG_CO2,
|
||||
nc.NG_C2,
|
||||
nc.NG_C3,
|
||||
nc.NG_H2O,
|
||||
nc.NG_H2S,
|
||||
nc.NG_H2,
|
||||
nc.NG_CO,
|
||||
nc.NG_O2,
|
||||
nc.NG_iC4,
|
||||
nc.NG_nC4,
|
||||
nc.NG_iC5,
|
||||
nc.NG_nC5,
|
||||
nc.NG_C6,
|
||||
nc.NG_C7,
|
||||
nc.NG_C8,
|
||||
nc.NG_C9,
|
||||
nc.NG_C10,
|
||||
nc.NG_He,
|
||||
nc.NG_Ar,
|
||||
nc.sum,
|
||||
nc.sampleno,
|
||||
nc.meterno,
|
||||
nc.cyzf,
|
||||
nc.tenant_id
|
||||
from ng_components nc
|
||||
</sql>
|
||||
|
||||
<select id="selectNgComponentsList" parameterType="NgComponents" resultMap="NgComponentsResult">
|
||||
<include refid="selectNgComponentsVo"/>
|
||||
<where>
|
||||
<if test="createName != null and createName != ''"> and create_name like concat('%', #{createName}, '%')</if>
|
||||
<if test="updateName != null and updateName != ''"> and update_name like concat('%', #{updateName}, '%')</if>
|
||||
<if test="ngC1 != null and ngC1 != ''"> and NG_C1 = #{ngC1}</if>
|
||||
<if test="ngN2 != null and ngN2 != ''"> and NG_N2 = #{ngN2}</if>
|
||||
<if test="ngCo2 != null and ngCo2 != ''"> and NG_CO2 = #{ngCo2}</if>
|
||||
<if test="ngC2 != null and ngC2 != ''"> and NG_C2 = #{ngC2}</if>
|
||||
<if test="ngC3 != null and ngC3 != ''"> and NG_C3 = #{ngC3}</if>
|
||||
<if test="ngH2o != null and ngH2o != ''"> and NG_H2O = #{ngH2o}</if>
|
||||
<if test="ngH2s != null and ngH2s != ''"> and NG_H2S = #{ngH2s}</if>
|
||||
<if test="ngH2 != null and ngH2 != ''"> and NG_H2 = #{ngH2}</if>
|
||||
<if test="ngCo != null and ngCo != ''"> and NG_CO = #{ngCo}</if>
|
||||
<if test="ngO2 != null and ngO2 != ''"> and NG_O2 = #{ngO2}</if>
|
||||
<if test="ngIc4 != null and ngIc4 != ''"> and NG_iC4 = #{ngIc4}</if>
|
||||
<if test="ngNc4 != null and ngNc4 != ''"> and NG_nC4 = #{ngNc4}</if>
|
||||
<if test="ngIc5 != null and ngIc5 != ''"> and NG_iC5 = #{ngIc5}</if>
|
||||
<if test="ngNc5 != null and ngNc5 != ''"> and NG_nC5 = #{ngNc5}</if>
|
||||
<if test="ngC6 != null and ngC6 != ''"> and NG_C6 = #{ngC6}</if>
|
||||
<if test="ngC7 != null and ngC7 != ''"> and NG_C7 = #{ngC7}</if>
|
||||
<if test="ngC8 != null and ngC8 != ''"> and NG_C8 = #{ngC8}</if>
|
||||
<if test="ngC9 != null and ngC9 != ''"> and NG_C9 = #{ngC9}</if>
|
||||
<if test="ngC10 != null and ngC10 != ''"> and NG_C10 = #{ngC10}</if>
|
||||
<if test="ngHe != null and ngHe != ''"> and NG_He = #{ngHe}</if>
|
||||
<if test="ngAr != null and ngAr != ''"> and NG_Ar = #{ngAr}</if>
|
||||
<if test="sum != null and sum != ''"> and sum = #{sum}</if>
|
||||
<if test="sampleno != null and sampleno != ''"> and sampleno = #{sampleno}</if>
|
||||
<if test="meterno != null and meterno != ''"> and meterno = #{meterno}</if>
|
||||
<if test="cyzf != null and cyzf != ''"> and cyzf = #{cyzf}</if>
|
||||
<where>
|
||||
<if test="createName != null and createName != ''"> and nc.create_name like concat('%', #{createName}, '%')</if>
|
||||
<if test="updateName != null and updateName != ''"> and nc.update_name like concat('%', #{updateName}, '%')</if>
|
||||
<if test="ngC1 != null and ngC1 != ''"> and nc.NG_C1 = #{ngC1}</if>
|
||||
<if test="ngN2 != null and ngN2 != ''"> and nc.NG_N2 = #{ngN2}</if>
|
||||
<if test="ngCo2 != null and ngCo2 != ''"> and nc.NG_CO2 = #{ngCo2}</if>
|
||||
<if test="ngC2 != null and ngC2 != ''"> and nc.NG_C2 = #{ngC2}</if>
|
||||
<if test="ngC3 != null and ngC3 != ''"> and nc.NG_C3 = #{ngC3}</if>
|
||||
<if test="ngH2o != null and ngH2o != ''"> and nc.NG_H2O = #{ngH2o}</if>
|
||||
<if test="ngH2s != null and ngH2s != ''"> and nc.NG_H2S = #{ngH2s}</if>
|
||||
<if test="ngH2 != null and ngH2 != ''"> and nc.NG_H2 = #{ngH2}</if>
|
||||
<if test="ngCo != null and ngCo != ''"> and nc.NG_CO = #{ngCo}</if>
|
||||
<if test="ngO2 != null and ngO2 != ''"> and nc.NG_O2 = #{ngO2}</if>
|
||||
<if test="ngIc4 != null and ngIc4 != ''"> and nc.NG_iC4 = #{ngIc4}</if>
|
||||
<if test="ngNc4 != null and ngNc4 != ''"> and nc.NG_nC4 = #{ngNc4}</if>
|
||||
<if test="ngIc5 != null and ngIc5 != ''"> and nc.NG_iC5 = #{ngIc5}</if>
|
||||
<if test="ngNc5 != null and ngNc5 != ''"> and nc.NG_nC5 = #{ngNc5}</if>
|
||||
<if test="ngC6 != null and ngC6 != ''"> and nc.NG_C6 = #{ngC6}</if>
|
||||
<if test="ngC7 != null and ngC7 != ''"> and nc.NG_C7 = #{ngC7}</if>
|
||||
<if test="ngC8 != null and ngC8 != ''"> and nc.NG_C8 = #{ngC8}</if>
|
||||
<if test="ngC9 != null and ngC9 != ''"> and nc.NG_C9 = #{ngC9}</if>
|
||||
<if test="ngC10 != null and ngC10 != ''"> and nc.NG_C10 = #{ngC10}</if>
|
||||
<if test="ngHe != null and ngHe != ''"> and nc.NG_He = #{ngHe}</if>
|
||||
<if test="ngAr != null and ngAr != ''"> and nc.NG_Ar = #{ngAr}</if>
|
||||
<if test="sum != null and sum != ''"> and nc.sum = #{sum}</if>
|
||||
<if test="sampleno != null and sampleno != ''"> and nc.sampleno = #{sampleno}</if>
|
||||
<if test="meterno != null and meterno != ''"> and nc.meterno = #{meterno}</if>
|
||||
<if test="cyzf != null and cyzf != ''"> and nc.cyzf = #{cyzf}</if>
|
||||
<if test="tenantId != null "> and nc.tenant_id = #{tenantId}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectNgComponentsById" parameterType="String" resultMap="NgComponentsResult">
|
||||
<include refid="selectNgComponentsVo"/>
|
||||
where id = #{id}
|
||||
where nc.id = #{id}
|
||||
</select>
|
||||
|
||||
|
||||
<insert id="insertNgComponents" parameterType="NgComponents">
|
||||
insert into ng_components
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
@ -116,6 +152,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="sampleno != null">sampleno,</if>
|
||||
<if test="meterno != null">meterno,</if>
|
||||
<if test="cyzf != null">cyzf,</if>
|
||||
<if test="tenantId != null">tenant_id,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null">#{id},</if>
|
||||
@ -150,6 +187,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="sampleno != null">#{sampleno},</if>
|
||||
<if test="meterno != null">#{meterno},</if>
|
||||
<if test="cyzf != null">#{cyzf},</if>
|
||||
<if test="tenantId != null">#{tenantId},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
@ -187,8 +225,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="sampleno != null">sampleno = #{sampleno},</if>
|
||||
<if test="meterno != null">meterno = #{meterno},</if>
|
||||
<if test="cyzf != null">cyzf = #{cyzf},</if>
|
||||
<if test="tenantId != null">tenant_id = #{tenantId},</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
where ng_components.id = #{id}
|
||||
</update>
|
||||
|
||||
<delete id="deleteNgComponentsById" parameterType="String">
|
||||
@ -5,142 +5,202 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<mapper namespace="com.ruoyi.ngtools.mapper.NgMeterparMapper">
|
||||
|
||||
<resultMap type="NgMeterpar" id="NgMeterparResult">
|
||||
<result property="id" column="id" />
|
||||
<result property="createName" column="create_name" />
|
||||
<result property="createBy" column="create_by" />
|
||||
<result property="createTime" column="create_time" />
|
||||
<result property="updateName" column="update_name" />
|
||||
<result property="updateBy" column="update_by" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
<result property="dFlowCalbz" column="dFlowCalbz" />
|
||||
<result property="dZcalbz" column="dZcalbz" />
|
||||
<result property="dCbtj" column="dCbtj" />
|
||||
<result property="dpbM" column="dPb_M" />
|
||||
<result property="dtbM" column="dTb_M" />
|
||||
<result property="dpbE" column="dPb_E" />
|
||||
<result property="dtbE" column="dTb_E" />
|
||||
<result property="dPatm" column="dPatm" />
|
||||
<result property="dPatmUnit" column="dPatmUnit" />
|
||||
<result property="dngCompents" column="dNG_Compents" />
|
||||
<result property="dMeterType" column="dMeterType" />
|
||||
<result property="dCoreType" column="dCoreType" />
|
||||
<result property="dPtmode" column="dPtmode" />
|
||||
<result property="dPipeType" column="dPipeType" />
|
||||
<result property="dPipeD" column="dPipeD" />
|
||||
<result property="dLenUnit" column="dLenUnit" />
|
||||
<result property="dPipeDtemp" column="dPipeDtemp" />
|
||||
<result property="dPileDtempU" column="dPileDtempU" />
|
||||
<result property="dPipeMaterial" column="dPipeMaterial" />
|
||||
<result property="dOrificeD" column="dOrificeD" />
|
||||
<result property="dOrificeUnit" column="dOrificeUnit" />
|
||||
<result property="dOrificeDtemp" column="dOrificeDtemp" />
|
||||
<result property="dOrificeDtempUnit" column="dOrificeDtempUnit" />
|
||||
<result property="dOrificeMaterial" column="dOrificeMaterial" />
|
||||
<result property="dOrificeSharpness" column="dOrificeSharpness" />
|
||||
<result property="dOrificeRk" column="dOrificeRk" />
|
||||
<result property="dOrificeRkLenU" column="dOrificeRkLenU" />
|
||||
<result property="dPf" column="dPf" />
|
||||
<result property="dPfUnit" column="dPfUnit" />
|
||||
<result property="dPfType" column="dPfType" />
|
||||
<result property="dTf" column="dTf" />
|
||||
<result property="dTfUnit" column="dTfUnit" />
|
||||
<result property="dDp" column="dDp" />
|
||||
<result property="dDpUnit" column="dDpUnit" />
|
||||
<result property="dVFlowUnit" column="dVFlowUnit" />
|
||||
<result property="dMFlowUnit" column="dMFlowUnit" />
|
||||
<result property="dEFlowUnit" column="dEFlowUnit" />
|
||||
<result property="dCd" column="dCd" />
|
||||
<result property="dCdCalMethod" column="dCdCalMethod" />
|
||||
<result property="dMeterFactor" column="dMeterFactor" />
|
||||
<result property="dPulseNum" column="dPulseNum" />
|
||||
<result property="dVFlowMax" column="dVFlowMax" />
|
||||
<result property="dVFlowMin" column="dVFlowMin" />
|
||||
<result property="dVFlowCon" column="dVFlowCon" />
|
||||
<result property="dPfRangeMin" column="dPfRangeMin" />
|
||||
<result property="dPfRangeMax" column="dPfRangeMax" />
|
||||
<result property="dDpRangeMin" column="dDpRangeMin" />
|
||||
<result property="dDpRangeMax" column="dDpRangeMax" />
|
||||
<result property="dTfRangeMin" column="dTfRangeMin" />
|
||||
<result property="dTfRangeMax" column="dTfRangeMax" />
|
||||
<result property="dVGsc" column="dVGsc" />
|
||||
<result property="sampleno" column="sampleno" />
|
||||
<result property="meterno" column="meterno" />
|
||||
<result property="id" column="id" />
|
||||
<result property="createName" column="create_name" />
|
||||
<result property="createBy" column="create_by" />
|
||||
<result property="createTime" column="create_time" />
|
||||
<result property="updateName" column="update_name" />
|
||||
<result property="updateBy" column="update_by" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
<result property="dFlowCalbz" column="dFlowCalbz" />
|
||||
<result property="dZcalbz" column="dZcalbz" />
|
||||
<result property="dCbtj" column="dCbtj" />
|
||||
<result property="dpbM" column="dPb_M" />
|
||||
<result property="dtbM" column="dTb_M" />
|
||||
<result property="dpbE" column="dPb_E" />
|
||||
<result property="dtbE" column="dTb_E" />
|
||||
<result property="dPatm" column="dPatm" />
|
||||
<result property="dPatmUnit" column="dPatmUnit" />
|
||||
<result property="dngCompents" column="dNG_Compents" />
|
||||
<result property="dMeterType" column="dMeterType" />
|
||||
<result property="dCoreType" column="dCoreType" />
|
||||
<result property="dPtmode" column="dPtmode" />
|
||||
<result property="dPipeType" column="dPipeType" />
|
||||
<result property="dPipeD" column="dPipeD" />
|
||||
<result property="dLenUnit" column="dLenUnit" />
|
||||
<result property="dPipeDtemp" column="dPipeDtemp" />
|
||||
<result property="dPileDtempU" column="dPileDtempU" />
|
||||
<result property="dPipeMaterial" column="dPipeMaterial" />
|
||||
<result property="dOrificeD" column="dOrificeD" />
|
||||
<result property="dOrificeUnit" column="dOrificeUnit" />
|
||||
<result property="dOrificeDtemp" column="dOrificeDtemp" />
|
||||
<result property="dOrificeDtempUnit" column="dOrificeDtempUnit" />
|
||||
<result property="dOrificeMaterial" column="dOrificeMaterial" />
|
||||
<result property="dOrificeSharpness" column="dOrificeSharpness" />
|
||||
<result property="dOrificeRk" column="dOrificeRk" />
|
||||
<result property="dOrificeRkLenU" column="dOrificeRkLenU" />
|
||||
<result property="dPf" column="dPf" />
|
||||
<result property="dPfUnit" column="dPfUnit" />
|
||||
<result property="dPfType" column="dPfType" />
|
||||
<result property="dTf" column="dTf" />
|
||||
<result property="dTfUnit" column="dTfUnit" />
|
||||
<result property="dDp" column="dDp" />
|
||||
<result property="dDpUnit" column="dDpUnit" />
|
||||
<result property="dVFlowUnit" column="dVFlowUnit" />
|
||||
<result property="dMFlowUnit" column="dMFlowUnit" />
|
||||
<result property="dEFlowUnit" column="dEFlowUnit" />
|
||||
<result property="dCd" column="dCd" />
|
||||
<result property="dCdCalMethod" column="dCdCalMethod" />
|
||||
<result property="dMeterFactor" column="dMeterFactor" />
|
||||
<result property="dPulseNum" column="dPulseNum" />
|
||||
<result property="dVFlowMax" column="dVFlowMax" />
|
||||
<result property="dVFlowMin" column="dVFlowMin" />
|
||||
<result property="dVFlowCon" column="dVFlowCon" />
|
||||
<result property="dPfRangeMin" column="dPfRangeMin" />
|
||||
<result property="dPfRangeMax" column="dPfRangeMax" />
|
||||
<result property="dDpRangeMin" column="dDpRangeMin" />
|
||||
<result property="dDpRangeMax" column="dDpRangeMax" />
|
||||
<result property="dTfRangeMin" column="dTfRangeMin" />
|
||||
<result property="dTfRangeMax" column="dTfRangeMax" />
|
||||
<result property="dVGsc" column="dVGsc" />
|
||||
<result property="sampleno" column="sampleno" />
|
||||
<result property="meterno" column="meterno" />
|
||||
<result property="tenantId" column="tenant_id" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectNgMeterparVo">
|
||||
select id, create_name, create_by, create_time, update_name, update_by, update_time, dFlowCalbz, dZcalbz, dCbtj, dPb_M, dTb_M, dPb_E, dTb_E, dPatm, dPatmUnit, dNG_Compents, dMeterType, dCoreType, dPtmode, dPipeType, dPipeD, dLenUnit, dPipeDtemp, dPileDtempU, dPipeMaterial, dOrificeD, dOrificeUnit, dOrificeDtemp, dOrificeDtempUnit, dOrificeMaterial, dOrificeSharpness, dOrificeRk, dOrificeRkLenU, dPf, dPfUnit, dPfType, dTf, dTfUnit, dDp, dDpUnit, dVFlowUnit, dMFlowUnit, dEFlowUnit, dCd, dCdCalMethod, dMeterFactor, dPulseNum, dVFlowMax, dVFlowMin, dVFlowCon, dPfRangeMin, dPfRangeMax, dDpRangeMin, dDpRangeMax, dTfRangeMin, dTfRangeMax, dVGsc, sampleno, meterno from ng_meterpar
|
||||
select
|
||||
nm.id,
|
||||
nm.create_name,
|
||||
nm.create_by,
|
||||
nm.create_time,
|
||||
nm.update_name,
|
||||
nm.update_by,
|
||||
nm.update_time,
|
||||
nm.dFlowCalbz,
|
||||
nm.dZcalbz,
|
||||
nm.dCbtj,
|
||||
nm.dPb_M,
|
||||
nm.dTb_M,
|
||||
nm.dPb_E,
|
||||
nm.dTb_E,
|
||||
nm.dPatm,
|
||||
nm.dPatmUnit,
|
||||
nm.dNG_Compents,
|
||||
nm.dMeterType,
|
||||
nm.dCoreType,
|
||||
nm.dPtmode,
|
||||
nm.dPipeType,
|
||||
nm.dPipeD,
|
||||
nm.dLenUnit,
|
||||
nm.dPipeDtemp,
|
||||
nm.dPileDtempU,
|
||||
nm.dPipeMaterial,
|
||||
nm.dOrificeD,
|
||||
nm.dOrificeUnit,
|
||||
nm.dOrificeDtemp,
|
||||
nm.dOrificeDtempUnit,
|
||||
nm.dOrificeMaterial,
|
||||
nm.dOrificeSharpness,
|
||||
nm.dOrificeRk,
|
||||
nm.dOrificeRkLenU,
|
||||
nm.dPf,
|
||||
nm.dPfUnit,
|
||||
nm.dPfType,
|
||||
nm.dTf,
|
||||
nm.dTfUnit,
|
||||
nm.dDp,
|
||||
nm.dDpUnit,
|
||||
nm.dVFlowUnit,
|
||||
nm.dMFlowUnit,
|
||||
nm.dEFlowUnit,
|
||||
nm.dCd,
|
||||
nm.dCdCalMethod,
|
||||
nm.dMeterFactor,
|
||||
nm.dPulseNum,
|
||||
nm.dVFlowMax,
|
||||
nm.dVFlowMin,
|
||||
nm.dVFlowCon,
|
||||
nm.dPfRangeMin,
|
||||
nm.dPfRangeMax,
|
||||
nm.dDpRangeMin,
|
||||
nm.dDpRangeMax,
|
||||
nm.dTfRangeMin,
|
||||
nm.dTfRangeMax,
|
||||
nm.dVGsc,
|
||||
nm.sampleno,
|
||||
nm.meterno,
|
||||
nm.tenant_id
|
||||
from ng_meterpar nm
|
||||
</sql>
|
||||
|
||||
<select id="selectNgMeterparList" parameterType="NgMeterpar" resultMap="NgMeterparResult">
|
||||
<include refid="selectNgMeterparVo"/>
|
||||
<where>
|
||||
<if test="createName != null and createName != ''"> and create_name like concat('%', #{createName}, '%')</if>
|
||||
<if test="createBy != null and createBy != ''"> and create_by = #{createBy}</if>
|
||||
<if test="createTime != null "> and create_time = #{createTime}</if>
|
||||
<if test="updateName != null and updateName != ''"> and update_name like concat('%', #{updateName}, '%')</if>
|
||||
<if test="updateBy != null and updateBy != ''"> and update_by = #{updateBy}</if>
|
||||
<if test="updateTime != null "> and update_time = #{updateTime}</if>
|
||||
<if test="dFlowCalbz != null and dFlowCalbz != ''"> and dFlowCalbz = #{dFlowCalbz}</if>
|
||||
<if test="dZcalbz != null and dZcalbz != ''"> and dZcalbz = #{dZcalbz}</if>
|
||||
<if test="dCbtj != null and dCbtj != ''"> and dCbtj = #{dCbtj}</if>
|
||||
<if test="dpbM != null and dpbM != ''"> and dPb_M = #{dpbM}</if>
|
||||
<if test="dtbM != null and dtbM != ''"> and dTb_M = #{dtbM}</if>
|
||||
<if test="dpbE != null and dpbE != ''"> and dPb_E = #{dpbE}</if>
|
||||
<if test="dtbE != null and dtbE != ''"> and dTb_E = #{dtbE}</if>
|
||||
<if test="dPatm != null and dPatm != ''"> and dPatm = #{dPatm}</if>
|
||||
<if test="dPatmUnit != null and dPatmUnit != ''"> and dPatmUnit = #{dPatmUnit}</if>
|
||||
<if test="dngCompents != null and dngCompents != ''"> and dNG_Compents = #{dngCompents}</if>
|
||||
<if test="dMeterType != null and dMeterType != ''"> and dMeterType = #{dMeterType}</if>
|
||||
<if test="dCoreType != null and dCoreType != ''"> and dCoreType = #{dCoreType}</if>
|
||||
<if test="dPtmode != null and dPtmode != ''"> and dPtmode = #{dPtmode}</if>
|
||||
<if test="dPipeType != null and dPipeType != ''"> and dPipeType = #{dPipeType}</if>
|
||||
<if test="dPipeD != null and dPipeD != ''"> and dPipeD = #{dPipeD}</if>
|
||||
<if test="dLenUnit != null and dLenUnit != ''"> and dLenUnit = #{dLenUnit}</if>
|
||||
<if test="dPipeDtemp != null and dPipeDtemp != ''"> and dPipeDtemp = #{dPipeDtemp}</if>
|
||||
<if test="dPileDtempU != null and dPileDtempU != ''"> and dPileDtempU = #{dPileDtempU}</if>
|
||||
<if test="dPipeMaterial != null and dPipeMaterial != ''"> and dPipeMaterial = #{dPipeMaterial}</if>
|
||||
<if test="dOrificeD != null and dOrificeD != ''"> and dOrificeD = #{dOrificeD}</if>
|
||||
<if test="dOrificeUnit != null and dOrificeUnit != ''"> and dOrificeUnit = #{dOrificeUnit}</if>
|
||||
<if test="dOrificeDtemp != null and dOrificeDtemp != ''"> and dOrificeDtemp = #{dOrificeDtemp}</if>
|
||||
<if test="dOrificeDtempUnit != null and dOrificeDtempUnit != ''"> and dOrificeDtempUnit = #{dOrificeDtempUnit}</if>
|
||||
<if test="dOrificeMaterial != null and dOrificeMaterial != ''"> and dOrificeMaterial = #{dOrificeMaterial}</if>
|
||||
<if test="dOrificeSharpness != null and dOrificeSharpness != ''"> and dOrificeSharpness = #{dOrificeSharpness}</if>
|
||||
<if test="dOrificeRk != null and dOrificeRk != ''"> and dOrificeRk = #{dOrificeRk}</if>
|
||||
<if test="dOrificeRkLenU != null and dOrificeRkLenU != ''"> and dOrificeRkLenU = #{dOrificeRkLenU}</if>
|
||||
<if test="dPf != null and dPf != ''"> and dPf = #{dPf}</if>
|
||||
<if test="dPfUnit != null and dPfUnit != ''"> and dPfUnit = #{dPfUnit}</if>
|
||||
<if test="dPfType != null and dPfType != ''"> and dPfType = #{dPfType}</if>
|
||||
<if test="dTf != null and dTf != ''"> and dTf = #{dTf}</if>
|
||||
<if test="dTfUnit != null and dTfUnit != ''"> and dTfUnit = #{dTfUnit}</if>
|
||||
<if test="dDp != null and dDp != ''"> and dDp = #{dDp}</if>
|
||||
<if test="dDpUnit != null and dDpUnit != ''"> and dDpUnit = #{dDpUnit}</if>
|
||||
<if test="dVFlowUnit != null and dVFlowUnit != ''"> and dVFlowUnit = #{dVFlowUnit}</if>
|
||||
<if test="dMFlowUnit != null and dMFlowUnit != ''"> and dMFlowUnit = #{dMFlowUnit}</if>
|
||||
<if test="dEFlowUnit != null and dEFlowUnit != ''"> and dEFlowUnit = #{dEFlowUnit}</if>
|
||||
<if test="dCd != null and dCd != ''"> and dCd = #{dCd}</if>
|
||||
<if test="dCdCalMethod != null and dCdCalMethod != ''"> and dCdCalMethod = #{dCdCalMethod}</if>
|
||||
<if test="dMeterFactor != null and dMeterFactor != ''"> and dMeterFactor = #{dMeterFactor}</if>
|
||||
<if test="dPulseNum != null and dPulseNum != ''"> and dPulseNum = #{dPulseNum}</if>
|
||||
<if test="dVFlowMax != null and dVFlowMax != ''"> and dVFlowMax = #{dVFlowMax}</if>
|
||||
<if test="dVFlowMin != null and dVFlowMin != ''"> and dVFlowMin = #{dVFlowMin}</if>
|
||||
<if test="dVFlowCon != null and dVFlowCon != ''"> and dVFlowCon = #{dVFlowCon}</if>
|
||||
<if test="dPfRangeMin != null and dPfRangeMin != ''"> and dPfRangeMin = #{dPfRangeMin}</if>
|
||||
<if test="dPfRangeMax != null and dPfRangeMax != ''"> and dPfRangeMax = #{dPfRangeMax}</if>
|
||||
<if test="dDpRangeMin != null and dDpRangeMin != ''"> and dDpRangeMin = #{dDpRangeMin}</if>
|
||||
<if test="dDpRangeMax != null and dDpRangeMax != ''"> and dDpRangeMax = #{dDpRangeMax}</if>
|
||||
<if test="dTfRangeMin != null and dTfRangeMin != ''"> and dTfRangeMin = #{dTfRangeMin}</if>
|
||||
<if test="dTfRangeMax != null and dTfRangeMax != ''"> and dTfRangeMax = #{dTfRangeMax}</if>
|
||||
<if test="dVGsc != null and dVGsc != ''"> and dVGsc = #{dVGsc}</if>
|
||||
<if test="sampleno != null and sampleno != ''"> and sampleno = #{sampleno}</if>
|
||||
<if test="meterno != null and meterno != ''"> and meterno = #{meterno}</if>
|
||||
<where>
|
||||
<if test="createName != null and createName != ''"> and nm.create_name like concat('%', #{createName}, '%')</if>
|
||||
<if test="updateName != null and updateName != ''"> and nm.update_name like concat('%', #{updateName}, '%')</if>
|
||||
<if test="dFlowCalbz != null and dFlowCalbz != ''"> and nm.dFlowCalbz = #{dFlowCalbz}</if>
|
||||
<if test="dZcalbz != null and dZcalbz != ''"> and nm.dZcalbz = #{dZcalbz}</if>
|
||||
<if test="dCbtj != null and dCbtj != ''"> and nm.dCbtj = #{dCbtj}</if>
|
||||
<if test="dpbM != null and dpbM != ''"> and nm.dPb_M = #{dpbM}</if>
|
||||
<if test="dtbM != null and dtbM != ''"> and nm.dTb_M = #{dtbM}</if>
|
||||
<if test="dpbE != null and dpbE != ''"> and nm.dPb_E = #{dpbE}</if>
|
||||
<if test="dtbE != null and dtbE != ''"> and nm.dTb_E = #{dtbE}</if>
|
||||
<if test="dPatm != null and dPatm != ''"> and nm.dPatm = #{dPatm}</if>
|
||||
<if test="dPatmUnit != null and dPatmUnit != ''"> and nm.dPatmUnit = #{dPatmUnit}</if>
|
||||
<if test="dngCompents != null and dngCompents != ''"> and nm.dNG_Compents = #{dngCompents}</if>
|
||||
<if test="dMeterType != null and dMeterType != ''"> and nm.dMeterType = #{dMeterType}</if>
|
||||
<if test="dCoreType != null and dCoreType != ''"> and nm.dCoreType = #{dCoreType}</if>
|
||||
<if test="dPtmode != null and dPtmode != ''"> and nm.dPtmode = #{dPtmode}</if>
|
||||
<if test="dPipeType != null and dPipeType != ''"> and nm.dPipeType = #{dPipeType}</if>
|
||||
<if test="dPipeD != null and dPipeD != ''"> and nm.dPipeD = #{dPipeD}</if>
|
||||
<if test="dLenUnit != null and dLenUnit != ''"> and nm.dLenUnit = #{dLenUnit}</if>
|
||||
<if test="dPipeDtemp != null and dPipeDtemp != ''"> and nm.dPipeDtemp = #{dPipeDtemp}</if>
|
||||
<if test="dPileDtempU != null and dPileDtempU != ''"> and nm.dPileDtempU = #{dPileDtempU}</if>
|
||||
<if test="dPipeMaterial != null and dPipeMaterial != ''"> and nm.dPipeMaterial = #{dPipeMaterial}</if>
|
||||
<if test="dOrificeD != null and dOrificeD != ''"> and nm.dOrificeD = #{dOrificeD}</if>
|
||||
<if test="dOrificeUnit != null and dOrificeUnit != ''"> and nm.dOrificeUnit = #{dOrificeUnit}</if>
|
||||
<if test="dOrificeDtemp != null and dOrificeDtemp != ''"> and nm.dOrificeDtemp = #{dOrificeDtemp}</if>
|
||||
<if test="dOrificeDtempUnit != null and dOrificeDtempUnit != ''"> and nm.dOrificeDtempUnit = #{dOrificeDtempUnit}</if>
|
||||
<if test="dOrificeMaterial != null and dOrificeMaterial != ''"> and nm.dOrificeMaterial = #{dOrificeMaterial}</if>
|
||||
<if test="dOrificeSharpness != null and dOrificeSharpness != ''"> and nm.dOrificeSharpness = #{dOrificeSharpness}</if>
|
||||
<if test="dOrificeRk != null and dOrificeRk != ''"> and nm.dOrificeRk = #{dOrificeRk}</if>
|
||||
<if test="dOrificeRkLenU != null and dOrificeRkLenU != ''"> and nm.dOrificeRkLenU = #{dOrificeRkLenU}</if>
|
||||
<if test="dPf != null and dPf != ''"> and nm.dPf = #{dPf}</if>
|
||||
<if test="dPfUnit != null and dPfUnit != ''"> and nm.dPfUnit = #{dPfUnit}</if>
|
||||
<if test="dPfType != null and dPfType != ''"> and nm.dPfType = #{dPfType}</if>
|
||||
<if test="dTf != null and dTf != ''"> and nm.dTf = #{dTf}</if>
|
||||
<if test="dTfUnit != null and dTfUnit != ''"> and nm.dTfUnit = #{dTfUnit}</if>
|
||||
<if test="dDp != null and dDp != ''"> and nm.dDp = #{dDp}</if>
|
||||
<if test="dDpUnit != null and dDpUnit != ''"> and nm.dDpUnit = #{dDpUnit}</if>
|
||||
<if test="dVFlowUnit != null and dVFlowUnit != ''"> and nm.dVFlowUnit = #{dVFlowUnit}</if>
|
||||
<if test="dMFlowUnit != null and dMFlowUnit != ''"> and nm.dMFlowUnit = #{dMFlowUnit}</if>
|
||||
<if test="dEFlowUnit != null and dEFlowUnit != ''"> and nm.dEFlowUnit = #{dEFlowUnit}</if>
|
||||
<if test="dCd != null and dCd != ''"> and nm.dCd = #{dCd}</if>
|
||||
<if test="dCdCalMethod != null and dCdCalMethod != ''"> and nm.dCdCalMethod = #{dCdCalMethod}</if>
|
||||
<if test="dMeterFactor != null and dMeterFactor != ''"> and nm.dMeterFactor = #{dMeterFactor}</if>
|
||||
<if test="dPulseNum != null and dPulseNum != ''"> and nm.dPulseNum = #{dPulseNum}</if>
|
||||
<if test="dVFlowMax != null and dVFlowMax != ''"> and nm.dVFlowMax = #{dVFlowMax}</if>
|
||||
<if test="dVFlowMin != null and dVFlowMin != ''"> and nm.dVFlowMin = #{dVFlowMin}</if>
|
||||
<if test="dVFlowCon != null and dVFlowCon != ''"> and nm.dVFlowCon = #{dVFlowCon}</if>
|
||||
<if test="dPfRangeMin != null and dPfRangeMin != ''"> and nm.dPfRangeMin = #{dPfRangeMin}</if>
|
||||
<if test="dPfRangeMax != null and dPfRangeMax != ''"> and nm.dPfRangeMax = #{dPfRangeMax}</if>
|
||||
<if test="dDpRangeMin != null and dDpRangeMin != ''"> and nm.dDpRangeMin = #{dDpRangeMin}</if>
|
||||
<if test="dDpRangeMax != null and dDpRangeMax != ''"> and nm.dDpRangeMax = #{dDpRangeMax}</if>
|
||||
<if test="dTfRangeMin != null and dTfRangeMin != ''"> and nm.dTfRangeMin = #{dTfRangeMin}</if>
|
||||
<if test="dTfRangeMax != null and dTfRangeMax != ''"> and nm.dTfRangeMax = #{dTfRangeMax}</if>
|
||||
<if test="dVGsc != null and dVGsc != ''"> and nm.dVGsc = #{dVGsc}</if>
|
||||
<if test="sampleno != null and sampleno != ''"> and nm.sampleno = #{sampleno}</if>
|
||||
<if test="meterno != null and meterno != ''"> and nm.meterno = #{meterno}</if>
|
||||
<if test="tenantId != null "> and nm.tenant_id = #{tenantId}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectNgMeterparById" parameterType="String" resultMap="NgMeterparResult">
|
||||
<include refid="selectNgMeterparVo"/>
|
||||
where id = #{id}
|
||||
where nm.id = #{id}
|
||||
</select>
|
||||
|
||||
|
||||
<insert id="insertNgMeterpar" parameterType="NgMeterpar">
|
||||
insert into ng_meterpar
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
@ -204,6 +264,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="dVGsc != null">dVGsc,</if>
|
||||
<if test="sampleno != null">sampleno,</if>
|
||||
<if test="meterno != null">meterno,</if>
|
||||
<if test="tenantId != null">tenant_id,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null">#{id},</if>
|
||||
@ -266,6 +327,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="dVGsc != null">#{dVGsc},</if>
|
||||
<if test="sampleno != null">#{sampleno},</if>
|
||||
<if test="meterno != null">#{meterno},</if>
|
||||
<if test="tenantId != null">#{tenantId},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
@ -331,8 +393,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="dVGsc != null">dVGsc = #{dVGsc},</if>
|
||||
<if test="sampleno != null">sampleno = #{sampleno},</if>
|
||||
<if test="meterno != null">meterno = #{meterno},</if>
|
||||
<if test="tenantId != null">tenant_id = #{tenantId},</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
where ng_meterpar.id = #{id}
|
||||
</update>
|
||||
|
||||
<delete id="deleteNgMeterparById" parameterType="String">
|
||||
@ -5,74 +5,106 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<mapper namespace="com.ruoyi.ngtools.mapper.NgMeterresultMapper">
|
||||
|
||||
<resultMap type="NgMeterresult" id="NgMeterresultResult">
|
||||
<result property="id" column="id" />
|
||||
<result property="createName" column="create_name" />
|
||||
<result property="createBy" column="create_by" />
|
||||
<result property="createTime" column="create_time" />
|
||||
<result property="updateName" column="update_name" />
|
||||
<result property="updateBy" column="update_by" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
<result property="ybbh" column="ybbh" />
|
||||
<result property="dE" column="dE" />
|
||||
<result property="dFG" column="dFG" />
|
||||
<result property="dFT" column="dFT" />
|
||||
<result property="dDViscosity" column="dDViscosity" />
|
||||
<result property="dDExpCoefficient" column="dDExpCoefficient" />
|
||||
<result property="dRnPipe" column="dRnPipe" />
|
||||
<result property="dBk" column="dBk" />
|
||||
<result property="dRoughNessPipe" column="dRoughNessPipe" />
|
||||
<result property="dCdCorrect" column="dCdCorrect" />
|
||||
<result property="dCdNozell" column="dCdNozell" />
|
||||
<result property="dVFlowb" column="dVFlowb" />
|
||||
<result property="dVFlowf" column="dVFlowf" />
|
||||
<result property="dMFlowb" column="dMFlowb" />
|
||||
<result property="dEFlowb" column="dEFlowb" />
|
||||
<result property="dVelocityFlow" column="dVelocityFlow" />
|
||||
<result property="dPressLost" column="dPressLost" />
|
||||
<result property="dBeta" column="dBeta" />
|
||||
<result property="dKappa" column="dKappa" />
|
||||
<result property="sampleno" column="sampleno" />
|
||||
<result property="meterno" column="meterno" />
|
||||
<result property="id" column="id" />
|
||||
<result property="createName" column="create_name" />
|
||||
<result property="createBy" column="create_by" />
|
||||
<result property="createTime" column="create_time" />
|
||||
<result property="updateName" column="update_name" />
|
||||
<result property="updateBy" column="update_by" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
<result property="ybbh" column="ybbh" />
|
||||
<result property="dE" column="dE" />
|
||||
<result property="dFG" column="dFG" />
|
||||
<result property="dFT" column="dFT" />
|
||||
<result property="dDViscosity" column="dDViscosity" />
|
||||
<result property="dDExpCoefficient" column="dDExpCoefficient" />
|
||||
<result property="dRnPipe" column="dRnPipe" />
|
||||
<result property="dBk" column="dBk" />
|
||||
<result property="dRoughNessPipe" column="dRoughNessPipe" />
|
||||
<result property="dCdCorrect" column="dCdCorrect" />
|
||||
<result property="dCdNozell" column="dCdNozell" />
|
||||
<result property="dVFlowb" column="dVFlowb" />
|
||||
<result property="dVFlowf" column="dVFlowf" />
|
||||
<result property="dMFlowb" column="dMFlowb" />
|
||||
<result property="dEFlowb" column="dEFlowb" />
|
||||
<result property="dVelocityFlow" column="dVelocityFlow" />
|
||||
<result property="dPressLost" column="dPressLost" />
|
||||
<result property="dBeta" column="dBeta" />
|
||||
<result property="dKappa" column="dKappa" />
|
||||
<result property="sampleno" column="sampleno" />
|
||||
<result property="meterno" column="meterno" />
|
||||
<result property="tenantId" column="tenant_id" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectNgMeterresultVo">
|
||||
select id, create_name, create_by, create_time, update_name, update_by, update_time, ybbh, dE, dFG, dFT, dDViscosity, dDExpCoefficient, dRnPipe, dBk, dRoughNessPipe, dCdCorrect, dCdNozell, dVFlowb, dVFlowf, dMFlowb, dEFlowb, dVelocityFlow, dPressLost, dBeta, dKappa, sampleno, meterno from ng_meterresult
|
||||
select
|
||||
nm.id,
|
||||
nm.create_name,
|
||||
nm.create_by,
|
||||
nm.create_time,
|
||||
nm.update_name,
|
||||
nm.update_by,
|
||||
nm.update_time,
|
||||
nm.ybbh,
|
||||
nm.dE,
|
||||
nm.dFG,
|
||||
nm.dFT,
|
||||
nm.dDViscosity,
|
||||
nm.dDExpCoefficient,
|
||||
nm.dRnPipe,
|
||||
nm.dBk,
|
||||
nm.dRoughNessPipe,
|
||||
nm.dCdCorrect,
|
||||
nm.dCdNozell,
|
||||
nm.dVFlowb,
|
||||
nm.dVFlowf,
|
||||
nm.dMFlowb,
|
||||
nm.dEFlowb,
|
||||
nm.dVelocityFlow,
|
||||
nm.dPressLost,
|
||||
nm.dBeta,
|
||||
nm.dKappa,
|
||||
nm.sampleno,
|
||||
nm.meterno,
|
||||
nm.tenant_id
|
||||
from ng_meterresult nm
|
||||
</sql>
|
||||
|
||||
<select id="selectNgMeterresultList" parameterType="NgMeterresult" resultMap="NgMeterresultResult">
|
||||
<include refid="selectNgMeterresultVo"/>
|
||||
<where>
|
||||
<if test="createName != null and createName != ''"> and create_name like concat('%', #{createName}, '%')</if>
|
||||
<if test="updateName != null and updateName != ''"> and update_name like concat('%', #{updateName}, '%')</if>
|
||||
<if test="ybbh != null and ybbh != ''"> and ybbh = #{ybbh}</if>
|
||||
<if test="dE != null and dE != ''"> and dE = #{dE}</if>
|
||||
<if test="dFG != null and dFG != ''"> and dFG = #{dFG}</if>
|
||||
<if test="dFT != null and dFT != ''"> and dFT = #{dFT}</if>
|
||||
<if test="dDViscosity != null and dDViscosity != ''"> and dDViscosity = #{dDViscosity}</if>
|
||||
<if test="dDExpCoefficient != null and dDExpCoefficient != ''"> and dDExpCoefficient = #{dDExpCoefficient}</if>
|
||||
<if test="dRnPipe != null and dRnPipe != ''"> and dRnPipe = #{dRnPipe}</if>
|
||||
<if test="dBk != null and dBk != ''"> and dBk = #{dBk}</if>
|
||||
<if test="dRoughNessPipe != null and dRoughNessPipe != ''"> and dRoughNessPipe = #{dRoughNessPipe}</if>
|
||||
<if test="dCdCorrect != null and dCdCorrect != ''"> and dCdCorrect = #{dCdCorrect}</if>
|
||||
<if test="dCdNozell != null and dCdNozell != ''"> and dCdNozell = #{dCdNozell}</if>
|
||||
<if test="dVFlowb != null and dVFlowb != ''"> and dVFlowb = #{dVFlowb}</if>
|
||||
<if test="dVFlowf != null and dVFlowf != ''"> and dVFlowf = #{dVFlowf}</if>
|
||||
<if test="dMFlowb != null and dMFlowb != ''"> and dMFlowb = #{dMFlowb}</if>
|
||||
<if test="dEFlowb != null and dEFlowb != ''"> and dEFlowb = #{dEFlowb}</if>
|
||||
<if test="dVelocityFlow != null and dVelocityFlow != ''"> and dVelocityFlow = #{dVelocityFlow}</if>
|
||||
<if test="dPressLost != null and dPressLost != ''"> and dPressLost = #{dPressLost}</if>
|
||||
<if test="dBeta != null and dBeta != ''"> and dBeta = #{dBeta}</if>
|
||||
<if test="dKappa != null and dKappa != ''"> and dKappa = #{dKappa}</if>
|
||||
<if test="sampleno != null and sampleno != ''"> and sampleno = #{sampleno}</if>
|
||||
<if test="meterno != null and meterno != ''"> and meterno = #{meterno}</if>
|
||||
<where>
|
||||
<if test="createName != null and createName != ''"> and nm.create_name like concat('%', #{createName}, '%')</if>
|
||||
<if test="updateName != null and updateName != ''"> and nm.update_name like concat('%', #{updateName}, '%')</if>
|
||||
<if test="ybbh != null and ybbh != ''"> and nm.ybbh = #{ybbh}</if>
|
||||
<if test="dE != null and dE != ''"> and nm.dE = #{dE}</if>
|
||||
<if test="dFG != null and dFG != ''"> and nm.dFG = #{dFG}</if>
|
||||
<if test="dFT != null and dFT != ''"> and nm.dFT = #{dFT}</if>
|
||||
<if test="dDViscosity != null and dDViscosity != ''"> and nm.dDViscosity = #{dDViscosity}</if>
|
||||
<if test="dDExpCoefficient != null and dDExpCoefficient != ''"> and nm.dDExpCoefficient = #{dDExpCoefficient}</if>
|
||||
<if test="dRnPipe != null and dRnPipe != ''"> and nm.dRnPipe = #{dRnPipe}</if>
|
||||
<if test="dBk != null and dBk != ''"> and nm.dBk = #{dBk}</if>
|
||||
<if test="dRoughNessPipe != null and dRoughNessPipe != ''"> and nm.dRoughNessPipe = #{dRoughNessPipe}</if>
|
||||
<if test="dCdCorrect != null and dCdCorrect != ''"> and nm.dCdCorrect = #{dCdCorrect}</if>
|
||||
<if test="dCdNozell != null and dCdNozell != ''"> and nm.dCdNozell = #{dCdNozell}</if>
|
||||
<if test="dVFlowb != null and dVFlowb != ''"> and nm.dVFlowb = #{dVFlowb}</if>
|
||||
<if test="dVFlowf != null and dVFlowf != ''"> and nm.dVFlowf = #{dVFlowf}</if>
|
||||
<if test="dMFlowb != null and dMFlowb != ''"> and nm.dMFlowb = #{dMFlowb}</if>
|
||||
<if test="dEFlowb != null and dEFlowb != ''"> and nm.dEFlowb = #{dEFlowb}</if>
|
||||
<if test="dVelocityFlow != null and dVelocityFlow != ''"> and nm.dVelocityFlow = #{dVelocityFlow}</if>
|
||||
<if test="dPressLost != null and dPressLost != ''"> and nm.dPressLost = #{dPressLost}</if>
|
||||
<if test="dBeta != null and dBeta != ''"> and nm.dBeta = #{dBeta}</if>
|
||||
<if test="dKappa != null and dKappa != ''"> and nm.dKappa = #{dKappa}</if>
|
||||
<if test="sampleno != null and sampleno != ''"> and nm.sampleno = #{sampleno}</if>
|
||||
<if test="meterno != null and meterno != ''"> and nm.meterno = #{meterno}</if>
|
||||
<if test="tenantId != null "> and nm.tenant_id = #{tenantId}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectNgMeterresultById" parameterType="String" resultMap="NgMeterresultResult">
|
||||
<include refid="selectNgMeterresultVo"/>
|
||||
where id = #{id}
|
||||
where nm.id = #{id}
|
||||
</select>
|
||||
|
||||
|
||||
<insert id="insertNgMeterresult" parameterType="NgMeterresult">
|
||||
insert into ng_meterresult
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
@ -104,6 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="dKappa != null">dKappa,</if>
|
||||
<if test="sampleno != null">sampleno,</if>
|
||||
<if test="meterno != null">meterno,</if>
|
||||
<if test="tenantId != null">tenant_id,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null">#{id},</if>
|
||||
@ -134,6 +167,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="dKappa != null">#{dKappa},</if>
|
||||
<if test="sampleno != null">#{sampleno},</if>
|
||||
<if test="meterno != null">#{meterno},</if>
|
||||
<if test="tenantId != null">#{tenantId},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
@ -167,8 +201,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="dKappa != null">dKappa = #{dKappa},</if>
|
||||
<if test="sampleno != null">sampleno = #{sampleno},</if>
|
||||
<if test="meterno != null">meterno = #{meterno},</if>
|
||||
<if test="tenantId != null">tenant_id = #{tenantId},</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
where ng_meterresult.id = #{id}
|
||||
</update>
|
||||
|
||||
<delete id="deleteNgMeterresultById" parameterType="String">
|
||||
@ -5,140 +5,208 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<mapper namespace="com.ruoyi.ngtools.mapper.NgNgparMapper">
|
||||
|
||||
<resultMap type="NgNgpar" id="NgNgparResult">
|
||||
<result property="id" column="id" />
|
||||
<result property="createName" column="create_name" />
|
||||
<result property="createBy" column="create_by" />
|
||||
<result property="createTime" column="create_time" />
|
||||
<result property="updateName" column="update_name" />
|
||||
<result property="updateBy" column="update_by" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
<result property="adMixture" column="adMixture" />
|
||||
<result property="adMixtureV" column="adMixtureV" />
|
||||
<result property="adMixtureD" column="adMixtureD" />
|
||||
<result property="dCbtj" column="dCbtj" />
|
||||
<result property="dPb" column="dPb" />
|
||||
<result property="dTb" column="dTb" />
|
||||
<result property="dPf" column="dPf" />
|
||||
<result property="dTf" column="dTf" />
|
||||
<result property="dMrx" column="dMrx" />
|
||||
<result property="dZb" column="dZb" />
|
||||
<result property="dZf" column="dZf" />
|
||||
<result property="dFpv" column="dFpv" />
|
||||
<result property="dDb" column="dDb" />
|
||||
<result property="dDf" column="dDf" />
|
||||
<result property="dRhob" column="dRhob" />
|
||||
<result property="dRhof" column="dRhof" />
|
||||
<result property="drdIdeal" column="dRD_Ideal" />
|
||||
<result property="drdReal" column="dRD_Real" />
|
||||
<result property="dHo" column="dHo" />
|
||||
<result property="dH" column="dH" />
|
||||
<result property="dS" column="dS" />
|
||||
<result property="dCpi" column="dCpi" />
|
||||
<result property="dCp" column="dCp" />
|
||||
<result property="dCv" column="dCv" />
|
||||
<result property="dk" column="dk" />
|
||||
<result property="dKappa" column="dKappa" />
|
||||
<result property="dSOS" column="dSOS" />
|
||||
<result property="dCstar" column="dCstar" />
|
||||
<result property="dHhvMol" column="dHhvMol" />
|
||||
<result property="dLhvMol" column="dLhvMol" />
|
||||
<result property="dHhvv" column="dHhvv" />
|
||||
<result property="dLhvv" column="dLhvv" />
|
||||
<result property="dHhvm" column="dHhvm" />
|
||||
<result property="dLhvm" column="dLhvm" />
|
||||
<result property="dZb11062" column="dZb11062" />
|
||||
<result property="dRhob11062" column="dRhob11062" />
|
||||
<result property="dRhof11062" column="dRhof11062" />
|
||||
<result property="drdIdeal11062" column="dRD_Ideal11062" />
|
||||
<result property="drdReal11062" column="dRD_Real11062" />
|
||||
<result property="dWobbeIndex" column="dWobbeIndex" />
|
||||
<result property="dPc" column="dPc" />
|
||||
<result property="dTC" column="dTC" />
|
||||
<result property="dBzsx" column="dBzsx" />
|
||||
<result property="dBzxx" column="dBzxx" />
|
||||
<result property="dTotalC" column="dTotalC" />
|
||||
<result property="dC2" column="dC2" />
|
||||
<result property="dC2j" column="dC2j" />
|
||||
<result property="dC3j" column="dC3j" />
|
||||
<result property="dC4j" column="dC4j" />
|
||||
<result property="dC5j" column="dC5j" />
|
||||
<result property="dC6j" column="dC6j" />
|
||||
<result property="dC3C4" column="dC3C4" />
|
||||
<result property="sampleno" column="sampleno" />
|
||||
<result property="meterno" column="meterno" />
|
||||
<result property="id" column="id" />
|
||||
<result property="createName" column="create_name" />
|
||||
<result property="createBy" column="create_by" />
|
||||
<result property="createTime" column="create_time" />
|
||||
<result property="updateName" column="update_name" />
|
||||
<result property="updateBy" column="update_by" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
<result property="adMixture" column="adMixture" />
|
||||
<result property="adMixtureV" column="adMixtureV" />
|
||||
<result property="adMixtureD" column="adMixtureD" />
|
||||
<result property="dCbtj" column="dCbtj" />
|
||||
<result property="dPb" column="dPb" />
|
||||
<result property="dTb" column="dTb" />
|
||||
<result property="dPf" column="dPf" />
|
||||
<result property="dTf" column="dTf" />
|
||||
<result property="dMrx" column="dMrx" />
|
||||
<result property="dZb" column="dZb" />
|
||||
<result property="dZf" column="dZf" />
|
||||
<result property="dFpv" column="dFpv" />
|
||||
<result property="dDb" column="dDb" />
|
||||
<result property="dDf" column="dDf" />
|
||||
<result property="dRhob" column="dRhob" />
|
||||
<result property="dRhof" column="dRhof" />
|
||||
<result property="drdIdeal" column="dRD_Ideal" />
|
||||
<result property="drdReal" column="dRD_Real" />
|
||||
<result property="dHo" column="dHo" />
|
||||
<result property="dH" column="dH" />
|
||||
<result property="dS" column="dS" />
|
||||
<result property="dCpi" column="dCpi" />
|
||||
<result property="dCp" column="dCp" />
|
||||
<result property="dCv" column="dCv" />
|
||||
<result property="dk" column="dk" />
|
||||
<result property="dKappa" column="dKappa" />
|
||||
<result property="dSOS" column="dSOS" />
|
||||
<result property="dCstar" column="dCstar" />
|
||||
<result property="dHhvMol" column="dHhvMol" />
|
||||
<result property="dLhvMol" column="dLhvMol" />
|
||||
<result property="dHhvv" column="dHhvv" />
|
||||
<result property="dLhvv" column="dLhvv" />
|
||||
<result property="dHhvm" column="dHhvm" />
|
||||
<result property="dLhvm" column="dLhvm" />
|
||||
<result property="dZb11062" column="dZb11062" />
|
||||
<result property="dRhob11062" column="dRhob11062" />
|
||||
<result property="dRhof11062" column="dRhof11062" />
|
||||
<result property="drdIdeal11062" column="dRD_Ideal11062" />
|
||||
<result property="drdReal11062" column="dRD_Real11062" />
|
||||
<result property="dWobbeIndex" column="dWobbeIndex" />
|
||||
<result property="dPc" column="dPc" />
|
||||
<result property="dTC" column="dTC" />
|
||||
<result property="dBzsx" column="dBzsx" />
|
||||
<result property="dBzxx" column="dBzxx" />
|
||||
<result property="dTotalC" column="dTotalC" />
|
||||
<result property="dC2" column="dC2" />
|
||||
<result property="dC2j" column="dC2j" />
|
||||
<result property="dC3j" column="dC3j" />
|
||||
<result property="dC4j" column="dC4j" />
|
||||
<result property="dC5j" column="dC5j" />
|
||||
<result property="dC6j" column="dC6j" />
|
||||
<result property="dC3C4" column="dC3C4" />
|
||||
<result property="sampleno" column="sampleno" />
|
||||
<result property="meterno" column="meterno" />
|
||||
<result property="dPfType" column="dPfType" />
|
||||
<result property="tenantId" column="tenant_id" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectNgNgparVo">
|
||||
select id, create_name, create_by, create_time, update_name, update_by, update_time, adMixture, adMixtureV, adMixtureD, dCbtj, dPb, dTb, dPf, dTf, dMrx, dZb, dZf, dFpv, dDb, dDf, dRhob, dRhof, dRD_Ideal, dRD_Real, dHo, dH, dS, dCpi, dCp, dCv, dk, dKappa, dSOS, dCstar, dHhvMol, dLhvMol, dHhvv, dLhvv, dHhvm, dLhvm, dZb11062, dRhob11062, dRhof11062, dRD_Ideal11062, dRD_Real11062, dWobbeIndex, dPc, dTC, dBzsx, dBzxx, dTotalC, dC2, dC2j, dC3j, dC4j, dC5j, dC6j, dC3C4, sampleno, meterno from ng_ngpar
|
||||
select
|
||||
nn.id,
|
||||
nn.create_name,
|
||||
nn.create_by,
|
||||
nn.create_time,
|
||||
nn.update_name,
|
||||
nn.update_by,
|
||||
nn.update_time,
|
||||
nn.adMixture,
|
||||
nn.adMixtureV,
|
||||
nn.adMixtureD,
|
||||
nn.dCbtj,
|
||||
nn.dPb,
|
||||
nn.dTb,
|
||||
nn.dPf,
|
||||
nn.dTf,
|
||||
nn.dMrx,
|
||||
nn.dZb,
|
||||
nn.dZf,
|
||||
nn.dFpv,
|
||||
nn.dDb,
|
||||
nn.dDf,
|
||||
nn.dRhob,
|
||||
nn.dRhof,
|
||||
nn.dRD_Ideal,
|
||||
nn.dRD_Real,
|
||||
nn.dHo,
|
||||
nn.dH,
|
||||
nn.dS,
|
||||
nn.dCpi,
|
||||
nn.dCp,
|
||||
nn.dCv,
|
||||
nn.dk,
|
||||
nn.dKappa,
|
||||
nn.dSOS,
|
||||
nn.dCstar,
|
||||
nn.dHhvMol,
|
||||
nn.dLhvMol,
|
||||
nn.dHhvv,
|
||||
nn.dLhvv,
|
||||
nn.dHhvm,
|
||||
nn.dLhvm,
|
||||
nn.dZb11062,
|
||||
nn.dRhob11062,
|
||||
nn.dRhof11062,
|
||||
nn.dRD_Ideal11062,
|
||||
nn.dRD_Real11062,
|
||||
nn.dWobbeIndex,
|
||||
nn.dPc,
|
||||
nn.dTC,
|
||||
nn.dBzsx,
|
||||
nn.dBzxx,
|
||||
nn.dTotalC,
|
||||
nn.dC2,
|
||||
nn.dC2j,
|
||||
nn.dC3j,
|
||||
nn.dC4j,
|
||||
nn.dC5j,
|
||||
nn.dC6j,
|
||||
nn.dC3C4,
|
||||
nn.sampleno,
|
||||
nn.meterno,
|
||||
nn.dPfType,
|
||||
nn.tenant_id
|
||||
from ng_ngpar nn
|
||||
</sql>
|
||||
|
||||
<select id="selectNgNgparList" parameterType="NgNgpar" resultMap="NgNgparResult">
|
||||
<include refid="selectNgNgparVo"/>
|
||||
<where>
|
||||
<if test="createName != null and createName != ''"> and create_name like concat('%', #{createName}, '%')</if>
|
||||
<if test="updateName != null and updateName != ''"> and update_name like concat('%', #{updateName}, '%')</if>
|
||||
<if test="adMixture != null and adMixture != ''"> and adMixture = #{adMixture}</if>
|
||||
<if test="adMixtureV != null and adMixtureV != ''"> and adMixtureV = #{adMixtureV}</if>
|
||||
<if test="adMixtureD != null and adMixtureD != ''"> and adMixtureD = #{adMixtureD}</if>
|
||||
<if test="dCbtj != null and dCbtj != ''"> and dCbtj = #{dCbtj}</if>
|
||||
<if test="dPb != null and dPb != ''"> and dPb = #{dPb}</if>
|
||||
<if test="dTb != null and dTb != ''"> and dTb = #{dTb}</if>
|
||||
<if test="dPf != null and dPf != ''"> and dPf = #{dPf}</if>
|
||||
<if test="dTf != null and dTf != ''"> and dTf = #{dTf}</if>
|
||||
<if test="dMrx != null and dMrx != ''"> and dMrx = #{dMrx}</if>
|
||||
<if test="dZb != null and dZb != ''"> and dZb = #{dZb}</if>
|
||||
<if test="dZf != null and dZf != ''"> and dZf = #{dZf}</if>
|
||||
<if test="dFpv != null and dFpv != ''"> and dFpv = #{dFpv}</if>
|
||||
<if test="dDb != null and dDb != ''"> and dDb = #{dDb}</if>
|
||||
<if test="dDf != null and dDf != ''"> and dDf = #{dDf}</if>
|
||||
<if test="dRhob != null and dRhob != ''"> and dRhob = #{dRhob}</if>
|
||||
<if test="dRhof != null and dRhof != ''"> and dRhof = #{dRhof}</if>
|
||||
<if test="drdIdeal != null and drdIdeal != ''"> and dRD_Ideal = #{drdIdeal}</if>
|
||||
<if test="drdReal != null and drdReal != ''"> and dRD_Real = #{drdReal}</if>
|
||||
<if test="dHo != null and dHo != ''"> and dHo = #{dHo}</if>
|
||||
<if test="dH != null and dH != ''"> and dH = #{dH}</if>
|
||||
<if test="dS != null and dS != ''"> and dS = #{dS}</if>
|
||||
<if test="dCpi != null and dCpi != ''"> and dCpi = #{dCpi}</if>
|
||||
<if test="dCp != null and dCp != ''"> and dCp = #{dCp}</if>
|
||||
<if test="dCv != null and dCv != ''"> and dCv = #{dCv}</if>
|
||||
<if test="dk != null and dk != ''"> and dk = #{dk}</if>
|
||||
<if test="dKappa != null and dKappa != ''"> and dKappa = #{dKappa}</if>
|
||||
<if test="dSOS != null and dSOS != ''"> and dSOS = #{dSOS}</if>
|
||||
<if test="dCstar != null and dCstar != ''"> and dCstar = #{dCstar}</if>
|
||||
<if test="dHhvMol != null and dHhvMol != ''"> and dHhvMol = #{dHhvMol}</if>
|
||||
<if test="dLhvMol != null and dLhvMol != ''"> and dLhvMol = #{dLhvMol}</if>
|
||||
<if test="dHhvv != null and dHhvv != ''"> and dHhvv = #{dHhvv}</if>
|
||||
<if test="dLhvv != null and dLhvv != ''"> and dLhvv = #{dLhvv}</if>
|
||||
<if test="dHhvm != null and dHhvm != ''"> and dHhvm = #{dHhvm}</if>
|
||||
<if test="dLhvm != null and dLhvm != ''"> and dLhvm = #{dLhvm}</if>
|
||||
<if test="dZb11062 != null and dZb11062 != ''"> and dZb11062 = #{dZb11062}</if>
|
||||
<if test="dRhob11062 != null and dRhob11062 != ''"> and dRhob11062 = #{dRhob11062}</if>
|
||||
<if test="dRhof11062 != null and dRhof11062 != ''"> and dRhof11062 = #{dRhof11062}</if>
|
||||
<if test="drdIdeal11062 != null and drdIdeal11062 != ''"> and dRD_Ideal11062 = #{drdIdeal11062}</if>
|
||||
<if test="drdReal11062 != null and drdReal11062 != ''"> and dRD_Real11062 = #{drdReal11062}</if>
|
||||
<if test="dWobbeIndex != null and dWobbeIndex != ''"> and dWobbeIndex = #{dWobbeIndex}</if>
|
||||
<if test="dPc != null and dPc != ''"> and dPc = #{dPc}</if>
|
||||
<if test="dTC != null and dTC != ''"> and dTC = #{dTC}</if>
|
||||
<if test="dBzsx != null and dBzsx != ''"> and dBzsx = #{dBzsx}</if>
|
||||
<if test="dBzxx != null and dBzxx != ''"> and dBzxx = #{dBzxx}</if>
|
||||
<if test="dTotalC != null and dTotalC != ''"> and dTotalC = #{dTotalC}</if>
|
||||
<if test="dC2 != null and dC2 != ''"> and dC2 = #{dC2}</if>
|
||||
<if test="dC2j != null and dC2j != ''"> and dC2j = #{dC2j}</if>
|
||||
<if test="dC3j != null and dC3j != ''"> and dC3j = #{dC3j}</if>
|
||||
<if test="dC4j != null and dC4j != ''"> and dC4j = #{dC4j}</if>
|
||||
<if test="dC5j != null and dC5j != ''"> and dC5j = #{dC5j}</if>
|
||||
<if test="dC6j != null and dC6j != ''"> and dC6j = #{dC6j}</if>
|
||||
<if test="dC3C4 != null and dC3C4 != ''"> and dC3C4 = #{dC3C4}</if>
|
||||
<if test="sampleno != null and sampleno != ''"> and sampleno = #{sampleno}</if>
|
||||
<if test="meterno != null and meterno != ''"> and meterno = #{meterno}</if>
|
||||
<where>
|
||||
<if test="createName != null and createName != ''"> and nn.create_name like concat('%', #{createName}, '%')</if>
|
||||
<if test="updateName != null and updateName != ''"> and nn.update_name like concat('%', #{updateName}, '%')</if>
|
||||
<if test="adMixture != null and adMixture != ''"> and nn.adMixture = #{adMixture}</if>
|
||||
<if test="adMixtureV != null and adMixtureV != ''"> and nn.adMixtureV = #{adMixtureV}</if>
|
||||
<if test="adMixtureD != null and adMixtureD != ''"> and nn.adMixtureD = #{adMixtureD}</if>
|
||||
<if test="dCbtj != null and dCbtj != ''"> and nn.dCbtj = #{dCbtj}</if>
|
||||
<if test="dPb != null and dPb != ''"> and nn.dPb = #{dPb}</if>
|
||||
<if test="dTb != null and dTb != ''"> and nn.dTb = #{dTb}</if>
|
||||
<if test="dPf != null and dPf != ''"> and nn.dPf = #{dPf}</if>
|
||||
<if test="dTf != null and dTf != ''"> and nn.dTf = #{dTf}</if>
|
||||
<if test="dMrx != null and dMrx != ''"> and nn.dMrx = #{dMrx}</if>
|
||||
<if test="dZb != null and dZb != ''"> and nn.dZb = #{dZb}</if>
|
||||
<if test="dZf != null and dZf != ''"> and nn.dZf = #{dZf}</if>
|
||||
<if test="dFpv != null and dFpv != ''"> and nn.dFpv = #{dFpv}</if>
|
||||
<if test="dDb != null and dDb != ''"> and nn.dDb = #{dDb}</if>
|
||||
<if test="dDf != null and dDf != ''"> and nn.dDf = #{dDf}</if>
|
||||
<if test="dRhob != null and dRhob != ''"> and nn.dRhob = #{dRhob}</if>
|
||||
<if test="dRhof != null and dRhof != ''"> and nn.dRhof = #{dRhof}</if>
|
||||
<if test="drdIdeal != null and drdIdeal != ''"> and nn.dRD_Ideal = #{drdIdeal}</if>
|
||||
<if test="drdReal != null and drdReal != ''"> and nn.dRD_Real = #{drdReal}</if>
|
||||
<if test="dHo != null and dHo != ''"> and nn.dHo = #{dHo}</if>
|
||||
<if test="dH != null and dH != ''"> and nn.dH = #{dH}</if>
|
||||
<if test="dS != null and dS != ''"> and nn.dS = #{dS}</if>
|
||||
<if test="dCpi != null and dCpi != ''"> and nn.dCpi = #{dCpi}</if>
|
||||
<if test="dCp != null and dCp != ''"> and nn.dCp = #{dCp}</if>
|
||||
<if test="dCv != null and dCv != ''"> and nn.dCv = #{dCv}</if>
|
||||
<if test="dk != null and dk != ''"> and nn.dk = #{dk}</if>
|
||||
<if test="dKappa != null and dKappa != ''"> and nn.dKappa = #{dKappa}</if>
|
||||
<if test="dSOS != null and dSOS != ''"> and nn.dSOS = #{dSOS}</if>
|
||||
<if test="dCstar != null and dCstar != ''"> and nn.dCstar = #{dCstar}</if>
|
||||
<if test="dHhvMol != null and dHhvMol != ''"> and nn.dHhvMol = #{dHhvMol}</if>
|
||||
<if test="dLhvMol != null and dLhvMol != ''"> and nn.dLhvMol = #{dLhvMol}</if>
|
||||
<if test="dHhvv != null and dHhvv != ''"> and nn.dHhvv = #{dHhvv}</if>
|
||||
<if test="dLhvv != null and dLhvv != ''"> and nn.dLhvv = #{dLhvv}</if>
|
||||
<if test="dHhvm != null and dHhvm != ''"> and nn.dHhvm = #{dHhvm}</if>
|
||||
<if test="dLhvm != null and dLhvm != ''"> and nn.dLhvm = #{dLhvm}</if>
|
||||
<if test="dZb11062 != null and dZb11062 != ''"> and nn.dZb11062 = #{dZb11062}</if>
|
||||
<if test="dRhob11062 != null and dRhob11062 != ''"> and nn.dRhob11062 = #{dRhob11062}</if>
|
||||
<if test="dRhof11062 != null and dRhof11062 != ''"> and nn.dRhof11062 = #{dRhof11062}</if>
|
||||
<if test="drdIdeal11062 != null and drdIdeal11062 != ''"> and nn.dRD_Ideal11062 = #{drdIdeal11062}</if>
|
||||
<if test="drdReal11062 != null and drdReal11062 != ''"> and nn.dRD_Real11062 = #{drdReal11062}</if>
|
||||
<if test="dWobbeIndex != null and dWobbeIndex != ''"> and nn.dWobbeIndex = #{dWobbeIndex}</if>
|
||||
<if test="dPc != null and dPc != ''"> and nn.dPc = #{dPc}</if>
|
||||
<if test="dTC != null and dTC != ''"> and nn.dTC = #{dTC}</if>
|
||||
<if test="dBzsx != null and dBzsx != ''"> and nn.dBzsx = #{dBzsx}</if>
|
||||
<if test="dBzxx != null and dBzxx != ''"> and nn.dBzxx = #{dBzxx}</if>
|
||||
<if test="dTotalC != null and dTotalC != ''"> and nn.dTotalC = #{dTotalC}</if>
|
||||
<if test="dC2 != null and dC2 != ''"> and nn.dC2 = #{dC2}</if>
|
||||
<if test="dC2j != null and dC2j != ''"> and nn.dC2j = #{dC2j}</if>
|
||||
<if test="dC3j != null and dC3j != ''"> and nn.dC3j = #{dC3j}</if>
|
||||
<if test="dC4j != null and dC4j != ''"> and nn.dC4j = #{dC4j}</if>
|
||||
<if test="dC5j != null and dC5j != ''"> and nn.dC5j = #{dC5j}</if>
|
||||
<if test="dC6j != null and dC6j != ''"> and nn.dC6j = #{dC6j}</if>
|
||||
<if test="dC3C4 != null and dC3C4 != ''"> and nn.dC3C4 = #{dC3C4}</if>
|
||||
<if test="sampleno != null and sampleno != ''"> and nn.sampleno = #{sampleno}</if>
|
||||
<if test="meterno != null and meterno != ''"> and nn.meterno = #{meterno}</if>
|
||||
<if test="dPfType != null and dPfType != ''"> and nn.dPfType = #{dPfType}</if>
|
||||
<if test="tenantId != null "> and nn.tenant_id = #{tenantId}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectNgNgparById" parameterType="String" resultMap="NgNgparResult">
|
||||
<include refid="selectNgNgparVo"/>
|
||||
where id = #{id}
|
||||
where nn.id = #{id}
|
||||
</select>
|
||||
|
||||
|
||||
<insert id="insertNgNgpar" parameterType="NgNgpar">
|
||||
insert into ng_ngpar
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
@ -203,6 +271,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="dC3C4 != null">dC3C4,</if>
|
||||
<if test="sampleno != null">sampleno,</if>
|
||||
<if test="meterno != null">meterno,</if>
|
||||
<if test="dPfType != null">dPfType,</if>
|
||||
<if test="tenantId != null">tenant_id,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null">#{id},</if>
|
||||
@ -266,6 +336,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="dC3C4 != null">#{dC3C4},</if>
|
||||
<if test="sampleno != null">#{sampleno},</if>
|
||||
<if test="meterno != null">#{meterno},</if>
|
||||
<if test="dPfType != null">#{dPfType},</if>
|
||||
<if test="tenantId != null">#{tenantId},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
@ -332,8 +404,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="dC3C4 != null">dC3C4 = #{dC3C4},</if>
|
||||
<if test="sampleno != null">sampleno = #{sampleno},</if>
|
||||
<if test="meterno != null">meterno = #{meterno},</if>
|
||||
<if test="dPfType != null">dPfType = #{dPfType},</if>
|
||||
<if test="tenantId != null">tenant_id = #{tenantId},</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
where ng_ngpar.id = #{id}
|
||||
</update>
|
||||
|
||||
<delete id="deleteNgNgparById" parameterType="String">
|
||||
@ -1,104 +0,0 @@
|
||||
package com.ruoyi.ngtools.controller;
|
||||
|
||||
import java.util.List;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.PutMapping;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import com.ruoyi.common.annotation.Log;
|
||||
import com.ruoyi.common.core.controller.BaseController;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.common.enums.BusinessType;
|
||||
import com.ruoyi.ngtools.domain.NgComponents;
|
||||
import com.ruoyi.ngtools.service.INgComponentsService;
|
||||
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 天然气组分Controller
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-02-09
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/ngtools/components")
|
||||
public class NgComponentsController extends BaseController
|
||||
{
|
||||
@Autowired
|
||||
private INgComponentsService ngComponentsService;
|
||||
|
||||
/**
|
||||
* 查询天然气组分列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:components:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(NgComponents ngComponents)
|
||||
{
|
||||
startPage();
|
||||
List<NgComponents> list = ngComponentsService.selectNgComponentsList(ngComponents);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出天然气组分列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:components:export')")
|
||||
@Log(title = "天然气组分", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, NgComponents ngComponents)
|
||||
{
|
||||
List<NgComponents> list = ngComponentsService.selectNgComponentsList(ngComponents);
|
||||
ExcelUtil<NgComponents> util = new ExcelUtil<NgComponents>(NgComponents.class);
|
||||
util.exportExcel(response, list, "天然气组分数据");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取天然气组分详细信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:components:query')")
|
||||
@GetMapping(value = "/{id}")
|
||||
public AjaxResult getInfo(@PathVariable("id") String id)
|
||||
{
|
||||
return success(ngComponentsService.selectNgComponentsById(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增天然气组分
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:components:add')")
|
||||
@Log(title = "天然气组分", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody NgComponents ngComponents)
|
||||
{
|
||||
return toAjax(ngComponentsService.insertNgComponents(ngComponents));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改天然气组分
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:components:edit')")
|
||||
@Log(title = "天然气组分", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody NgComponents ngComponents)
|
||||
{
|
||||
return toAjax(ngComponentsService.updateNgComponents(ngComponents));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除天然气组分
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:components:remove')")
|
||||
@Log(title = "天然气组分", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public AjaxResult remove(@PathVariable String[] ids)
|
||||
{
|
||||
return toAjax(ngComponentsService.deleteNgComponentsByIds(ids));
|
||||
}
|
||||
}
|
||||
@ -1,104 +0,0 @@
|
||||
package com.ruoyi.ngtools.controller;
|
||||
|
||||
import java.util.List;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.PutMapping;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import com.ruoyi.common.annotation.Log;
|
||||
import com.ruoyi.common.core.controller.BaseController;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.common.enums.BusinessType;
|
||||
import com.ruoyi.ngtools.domain.NgMeterpar;
|
||||
import com.ruoyi.ngtools.service.INgMeterparService;
|
||||
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 流量计参数Controller
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-02-09
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/ngtools/meterpar")
|
||||
public class NgMeterparController extends BaseController
|
||||
{
|
||||
@Autowired
|
||||
private INgMeterparService ngMeterparService;
|
||||
|
||||
/**
|
||||
* 查询流量计参数列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:meterpar:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(NgMeterpar ngMeterpar)
|
||||
{
|
||||
startPage();
|
||||
List<NgMeterpar> list = ngMeterparService.selectNgMeterparList(ngMeterpar);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出流量计参数列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:meterpar:export')")
|
||||
@Log(title = "流量计参数", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, NgMeterpar ngMeterpar)
|
||||
{
|
||||
List<NgMeterpar> list = ngMeterparService.selectNgMeterparList(ngMeterpar);
|
||||
ExcelUtil<NgMeterpar> util = new ExcelUtil<NgMeterpar>(NgMeterpar.class);
|
||||
util.exportExcel(response, list, "流量计参数数据");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取流量计参数详细信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:meterpar:query')")
|
||||
@GetMapping(value = "/{id}")
|
||||
public AjaxResult getInfo(@PathVariable("id") String id)
|
||||
{
|
||||
return success(ngMeterparService.selectNgMeterparById(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增流量计参数
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:meterpar:add')")
|
||||
@Log(title = "流量计参数", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody NgMeterpar ngMeterpar)
|
||||
{
|
||||
return toAjax(ngMeterparService.insertNgMeterpar(ngMeterpar));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改流量计参数
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:meterpar:edit')")
|
||||
@Log(title = "流量计参数", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody NgMeterpar ngMeterpar)
|
||||
{
|
||||
return toAjax(ngMeterparService.updateNgMeterpar(ngMeterpar));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除流量计参数
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:meterpar:remove')")
|
||||
@Log(title = "流量计参数", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public AjaxResult remove(@PathVariable String[] ids)
|
||||
{
|
||||
return toAjax(ngMeterparService.deleteNgMeterparByIds(ids));
|
||||
}
|
||||
}
|
||||
@ -1,104 +0,0 @@
|
||||
package com.ruoyi.ngtools.controller;
|
||||
|
||||
import java.util.List;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.PutMapping;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import com.ruoyi.common.annotation.Log;
|
||||
import com.ruoyi.common.core.controller.BaseController;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.common.enums.BusinessType;
|
||||
import com.ruoyi.ngtools.domain.NgMeterresult;
|
||||
import com.ruoyi.ngtools.service.INgMeterresultService;
|
||||
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 流量计算结果Controller
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-02-09
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/ngtools/meterresult")
|
||||
public class NgMeterresultController extends BaseController
|
||||
{
|
||||
@Autowired
|
||||
private INgMeterresultService ngMeterresultService;
|
||||
|
||||
/**
|
||||
* 查询流量计算结果列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:meterresult:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(NgMeterresult ngMeterresult)
|
||||
{
|
||||
startPage();
|
||||
List<NgMeterresult> list = ngMeterresultService.selectNgMeterresultList(ngMeterresult);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出流量计算结果列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:meterresult:export')")
|
||||
@Log(title = "流量计算结果", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, NgMeterresult ngMeterresult)
|
||||
{
|
||||
List<NgMeterresult> list = ngMeterresultService.selectNgMeterresultList(ngMeterresult);
|
||||
ExcelUtil<NgMeterresult> util = new ExcelUtil<NgMeterresult>(NgMeterresult.class);
|
||||
util.exportExcel(response, list, "流量计算结果数据");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取流量计算结果详细信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:meterresult:query')")
|
||||
@GetMapping(value = "/{id}")
|
||||
public AjaxResult getInfo(@PathVariable("id") String id)
|
||||
{
|
||||
return success(ngMeterresultService.selectNgMeterresultById(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增流量计算结果
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:meterresult:add')")
|
||||
@Log(title = "流量计算结果", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody NgMeterresult ngMeterresult)
|
||||
{
|
||||
return toAjax(ngMeterresultService.insertNgMeterresult(ngMeterresult));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改流量计算结果
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:meterresult:edit')")
|
||||
@Log(title = "流量计算结果", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody NgMeterresult ngMeterresult)
|
||||
{
|
||||
return toAjax(ngMeterresultService.updateNgMeterresult(ngMeterresult));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除流量计算结果
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:meterresult:remove')")
|
||||
@Log(title = "流量计算结果", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public AjaxResult remove(@PathVariable String[] ids)
|
||||
{
|
||||
return toAjax(ngMeterresultService.deleteNgMeterresultByIds(ids));
|
||||
}
|
||||
}
|
||||
@ -1,104 +0,0 @@
|
||||
package com.ruoyi.ngtools.controller;
|
||||
|
||||
import java.util.List;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.PutMapping;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import com.ruoyi.common.annotation.Log;
|
||||
import com.ruoyi.common.core.controller.BaseController;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.common.enums.BusinessType;
|
||||
import com.ruoyi.ngtools.domain.NgNgpar;
|
||||
import com.ruoyi.ngtools.service.INgNgparService;
|
||||
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 天然气物性参数Controller
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-02-09
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/ngtools/ngpar")
|
||||
public class NgNgparController extends BaseController
|
||||
{
|
||||
@Autowired
|
||||
private INgNgparService ngNgparService;
|
||||
|
||||
/**
|
||||
* 查询天然气物性参数列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:ngpar:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(NgNgpar ngNgpar)
|
||||
{
|
||||
startPage();
|
||||
List<NgNgpar> list = ngNgparService.selectNgNgparList(ngNgpar);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出天然气物性参数列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:ngpar:export')")
|
||||
@Log(title = "天然气物性参数", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, NgNgpar ngNgpar)
|
||||
{
|
||||
List<NgNgpar> list = ngNgparService.selectNgNgparList(ngNgpar);
|
||||
ExcelUtil<NgNgpar> util = new ExcelUtil<NgNgpar>(NgNgpar.class);
|
||||
util.exportExcel(response, list, "天然气物性参数数据");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取天然气物性参数详细信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:ngpar:query')")
|
||||
@GetMapping(value = "/{id}")
|
||||
public AjaxResult getInfo(@PathVariable("id") String id)
|
||||
{
|
||||
return success(ngNgparService.selectNgNgparById(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增天然气物性参数
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:ngpar:add')")
|
||||
@Log(title = "天然气物性参数", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody NgNgpar ngNgpar)
|
||||
{
|
||||
return toAjax(ngNgparService.insertNgNgpar(ngNgpar));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改天然气物性参数
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:ngpar:edit')")
|
||||
@Log(title = "天然气物性参数", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody NgNgpar ngNgpar)
|
||||
{
|
||||
return toAjax(ngNgparService.updateNgNgpar(ngNgpar));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除天然气物性参数
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('ngtools:ngpar:remove')")
|
||||
@Log(title = "天然气物性参数", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public AjaxResult remove(@PathVariable String[] ids)
|
||||
{
|
||||
return toAjax(ngNgparService.deleteNgNgparByIds(ids));
|
||||
}
|
||||
}
|
||||
@ -1,419 +0,0 @@
|
||||
package com.ruoyi.ngtools.domain;
|
||||
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
import com.ruoyi.common.annotation.Excel;
|
||||
import com.ruoyi.common.core.domain.BaseEntity;
|
||||
|
||||
/**
|
||||
* 天然气组分对象 ng_components
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-02-09
|
||||
*/
|
||||
public class NgComponents extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** ID */
|
||||
private String id;
|
||||
|
||||
/** 创建人名称 */
|
||||
@Excel(name = " 创建人名称 ")
|
||||
private String createName;
|
||||
|
||||
/** 更新人名称 */
|
||||
@Excel(name = " 更新人名称 ")
|
||||
private String updateName;
|
||||
|
||||
/** 甲烷C1 */
|
||||
@Excel(name = " 甲烷C1 ")
|
||||
private String ngC1;
|
||||
|
||||
/** 氮气N2 */
|
||||
@Excel(name = " 氮气N2 ")
|
||||
private String ngN2;
|
||||
|
||||
/** 二氧化碳CO2 */
|
||||
@Excel(name = " 二氧化碳CO2 ")
|
||||
private String ngCo2;
|
||||
|
||||
/** 乙烷C2 */
|
||||
@Excel(name = " 乙烷C2 ")
|
||||
private String ngC2;
|
||||
|
||||
/** 丙烷C3 */
|
||||
@Excel(name = " 丙烷C3 ")
|
||||
private String ngC3;
|
||||
|
||||
/** 水H2O */
|
||||
@Excel(name = " 水H2O ")
|
||||
private String ngH2o;
|
||||
|
||||
/** 硫化氢H2S */
|
||||
@Excel(name = " 硫化氢H2S ")
|
||||
private String ngH2s;
|
||||
|
||||
/** 氢气H2 */
|
||||
@Excel(name = " 氢气H2 ")
|
||||
private String ngH2;
|
||||
|
||||
/** 一氧化碳CO */
|
||||
@Excel(name = " 一氧化碳CO ")
|
||||
private String ngCo;
|
||||
|
||||
/** 氧气O2 */
|
||||
@Excel(name = " 氧气O2 ")
|
||||
private String ngO2;
|
||||
|
||||
/** 异丁烷iC4 */
|
||||
@Excel(name = " 异丁烷iC4 ")
|
||||
private String ngIc4;
|
||||
|
||||
/** 正丁烷nC4 */
|
||||
@Excel(name = " 正丁烷nC4 ")
|
||||
private String ngNc4;
|
||||
|
||||
/** 异戊烷iC5 */
|
||||
@Excel(name = " 异戊烷iC5 ")
|
||||
private String ngIc5;
|
||||
|
||||
/** 正戊烷nC5 */
|
||||
@Excel(name = " 正戊烷nC5 ")
|
||||
private String ngNc5;
|
||||
|
||||
/** 己烷C6 */
|
||||
@Excel(name = " 己烷C6 ")
|
||||
private String ngC6;
|
||||
|
||||
/** 庚烷C7 */
|
||||
@Excel(name = " 庚烷C7 ")
|
||||
private String ngC7;
|
||||
|
||||
/** 辛烷C8 */
|
||||
@Excel(name = " 辛烷C8 ")
|
||||
private String ngC8;
|
||||
|
||||
/** 壬烷C9 */
|
||||
@Excel(name = " 壬烷C9 ")
|
||||
private String ngC9;
|
||||
|
||||
/** 癸烷C10 */
|
||||
@Excel(name = " 癸烷C10 ")
|
||||
private String ngC10;
|
||||
|
||||
/** 氦气He */
|
||||
@Excel(name = " 氦气He ")
|
||||
private String ngHe;
|
||||
|
||||
/** 氩气Ar */
|
||||
@Excel(name = " 氩气Ar ")
|
||||
private String ngAr;
|
||||
|
||||
/** 合计 */
|
||||
@Excel(name = "合计")
|
||||
private String sum;
|
||||
|
||||
/** 取样编号 */
|
||||
@Excel(name = "取样编号")
|
||||
private String sampleno;
|
||||
|
||||
/** 仪表编号 */
|
||||
@Excel(name = "仪表编号")
|
||||
private String meterno;
|
||||
|
||||
/** 常用组分 */
|
||||
@Excel(name = "常用组分")
|
||||
private String cyzf;
|
||||
|
||||
public void setId(String id)
|
||||
{
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getId()
|
||||
{
|
||||
return id;
|
||||
}
|
||||
public void setCreateName(String createName)
|
||||
{
|
||||
this.createName = createName;
|
||||
}
|
||||
|
||||
public String getCreateName()
|
||||
{
|
||||
return createName;
|
||||
}
|
||||
public void setUpdateName(String updateName)
|
||||
{
|
||||
this.updateName = updateName;
|
||||
}
|
||||
|
||||
public String getUpdateName()
|
||||
{
|
||||
return updateName;
|
||||
}
|
||||
public void setNgC1(String ngC1)
|
||||
{
|
||||
this.ngC1 = ngC1;
|
||||
}
|
||||
|
||||
public String getNgC1()
|
||||
{
|
||||
return ngC1;
|
||||
}
|
||||
public void setNgN2(String ngN2)
|
||||
{
|
||||
this.ngN2 = ngN2;
|
||||
}
|
||||
|
||||
public String getNgN2()
|
||||
{
|
||||
return ngN2;
|
||||
}
|
||||
public void setNgCo2(String ngCo2)
|
||||
{
|
||||
this.ngCo2 = ngCo2;
|
||||
}
|
||||
|
||||
public String getNgCo2()
|
||||
{
|
||||
return ngCo2;
|
||||
}
|
||||
public void setNgC2(String ngC2)
|
||||
{
|
||||
this.ngC2 = ngC2;
|
||||
}
|
||||
|
||||
public String getNgC2()
|
||||
{
|
||||
return ngC2;
|
||||
}
|
||||
public void setNgC3(String ngC3)
|
||||
{
|
||||
this.ngC3 = ngC3;
|
||||
}
|
||||
|
||||
public String getNgC3()
|
||||
{
|
||||
return ngC3;
|
||||
}
|
||||
public void setNgH2o(String ngH2o)
|
||||
{
|
||||
this.ngH2o = ngH2o;
|
||||
}
|
||||
|
||||
public String getNgH2o()
|
||||
{
|
||||
return ngH2o;
|
||||
}
|
||||
public void setNgH2s(String ngH2s)
|
||||
{
|
||||
this.ngH2s = ngH2s;
|
||||
}
|
||||
|
||||
public String getNgH2s()
|
||||
{
|
||||
return ngH2s;
|
||||
}
|
||||
public void setNgH2(String ngH2)
|
||||
{
|
||||
this.ngH2 = ngH2;
|
||||
}
|
||||
|
||||
public String getNgH2()
|
||||
{
|
||||
return ngH2;
|
||||
}
|
||||
public void setNgCo(String ngCo)
|
||||
{
|
||||
this.ngCo = ngCo;
|
||||
}
|
||||
|
||||
public String getNgCo()
|
||||
{
|
||||
return ngCo;
|
||||
}
|
||||
public void setNgO2(String ngO2)
|
||||
{
|
||||
this.ngO2 = ngO2;
|
||||
}
|
||||
|
||||
public String getNgO2()
|
||||
{
|
||||
return ngO2;
|
||||
}
|
||||
public void setNgIc4(String ngIc4)
|
||||
{
|
||||
this.ngIc4 = ngIc4;
|
||||
}
|
||||
|
||||
public String getNgIc4()
|
||||
{
|
||||
return ngIc4;
|
||||
}
|
||||
public void setNgNc4(String ngNc4)
|
||||
{
|
||||
this.ngNc4 = ngNc4;
|
||||
}
|
||||
|
||||
public String getNgNc4()
|
||||
{
|
||||
return ngNc4;
|
||||
}
|
||||
public void setNgIc5(String ngIc5)
|
||||
{
|
||||
this.ngIc5 = ngIc5;
|
||||
}
|
||||
|
||||
public String getNgIc5()
|
||||
{
|
||||
return ngIc5;
|
||||
}
|
||||
public void setNgNc5(String ngNc5)
|
||||
{
|
||||
this.ngNc5 = ngNc5;
|
||||
}
|
||||
|
||||
public String getNgNc5()
|
||||
{
|
||||
return ngNc5;
|
||||
}
|
||||
public void setNgC6(String ngC6)
|
||||
{
|
||||
this.ngC6 = ngC6;
|
||||
}
|
||||
|
||||
public String getNgC6()
|
||||
{
|
||||
return ngC6;
|
||||
}
|
||||
public void setNgC7(String ngC7)
|
||||
{
|
||||
this.ngC7 = ngC7;
|
||||
}
|
||||
|
||||
public String getNgC7()
|
||||
{
|
||||
return ngC7;
|
||||
}
|
||||
public void setNgC8(String ngC8)
|
||||
{
|
||||
this.ngC8 = ngC8;
|
||||
}
|
||||
|
||||
public String getNgC8()
|
||||
{
|
||||
return ngC8;
|
||||
}
|
||||
public void setNgC9(String ngC9)
|
||||
{
|
||||
this.ngC9 = ngC9;
|
||||
}
|
||||
|
||||
public String getNgC9()
|
||||
{
|
||||
return ngC9;
|
||||
}
|
||||
public void setNgC10(String ngC10)
|
||||
{
|
||||
this.ngC10 = ngC10;
|
||||
}
|
||||
|
||||
public String getNgC10()
|
||||
{
|
||||
return ngC10;
|
||||
}
|
||||
public void setNgHe(String ngHe)
|
||||
{
|
||||
this.ngHe = ngHe;
|
||||
}
|
||||
|
||||
public String getNgHe()
|
||||
{
|
||||
return ngHe;
|
||||
}
|
||||
public void setNgAr(String ngAr)
|
||||
{
|
||||
this.ngAr = ngAr;
|
||||
}
|
||||
|
||||
public String getNgAr()
|
||||
{
|
||||
return ngAr;
|
||||
}
|
||||
public void setSum(String sum)
|
||||
{
|
||||
this.sum = sum;
|
||||
}
|
||||
|
||||
public String getSum()
|
||||
{
|
||||
return sum;
|
||||
}
|
||||
public void setSampleno(String sampleno)
|
||||
{
|
||||
this.sampleno = sampleno;
|
||||
}
|
||||
|
||||
public String getSampleno()
|
||||
{
|
||||
return sampleno;
|
||||
}
|
||||
public void setMeterno(String meterno)
|
||||
{
|
||||
this.meterno = meterno;
|
||||
}
|
||||
|
||||
public String getMeterno()
|
||||
{
|
||||
return meterno;
|
||||
}
|
||||
public void setCyzf(String cyzf)
|
||||
{
|
||||
this.cyzf = cyzf;
|
||||
}
|
||||
|
||||
public String getCyzf()
|
||||
{
|
||||
return cyzf;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("id", getId())
|
||||
.append("createName", getCreateName())
|
||||
.append("createBy", getCreateBy())
|
||||
.append("createTime", getCreateTime())
|
||||
.append("updateName", getUpdateName())
|
||||
.append("updateBy", getUpdateBy())
|
||||
.append("updateTime", getUpdateTime())
|
||||
.append("ngC1", getNgC1())
|
||||
.append("ngN2", getNgN2())
|
||||
.append("ngCo2", getNgCo2())
|
||||
.append("ngC2", getNgC2())
|
||||
.append("ngC3", getNgC3())
|
||||
.append("ngH2o", getNgH2o())
|
||||
.append("ngH2s", getNgH2s())
|
||||
.append("ngH2", getNgH2())
|
||||
.append("ngCo", getNgCo())
|
||||
.append("ngO2", getNgO2())
|
||||
.append("ngIc4", getNgIc4())
|
||||
.append("ngNc4", getNgNc4())
|
||||
.append("ngIc5", getNgIc5())
|
||||
.append("ngNc5", getNgNc5())
|
||||
.append("ngC6", getNgC6())
|
||||
.append("ngC7", getNgC7())
|
||||
.append("ngC8", getNgC8())
|
||||
.append("ngC9", getNgC9())
|
||||
.append("ngC10", getNgC10())
|
||||
.append("ngHe", getNgHe())
|
||||
.append("ngAr", getNgAr())
|
||||
.append("sum", getSum())
|
||||
.append("sampleno", getSampleno())
|
||||
.append("meterno", getMeterno())
|
||||
.append("cyzf", getCyzf())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
@ -1,811 +0,0 @@
|
||||
package com.ruoyi.ngtools.domain;
|
||||
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
import com.ruoyi.common.annotation.Excel;
|
||||
import com.ruoyi.common.core.domain.BaseEntity;
|
||||
|
||||
/**
|
||||
* 流量计参数对象 ng_meterpar
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-02-09
|
||||
*/
|
||||
public class NgMeterpar extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** ID */
|
||||
private String id;
|
||||
|
||||
/** 创建人名称 */
|
||||
@Excel(name = "创建人名称 ")
|
||||
private String createName;
|
||||
|
||||
/** 更新人名称 */
|
||||
@Excel(name = "更新人名称 ")
|
||||
private String updateName;
|
||||
|
||||
/** 流量计算标准 */
|
||||
@Excel(name = "流量计算标准 ")
|
||||
private String dFlowCalbz;
|
||||
|
||||
/** 压缩因子计算标准 */
|
||||
@Excel(name = "压缩因子计算标准 ")
|
||||
private String dZcalbz;
|
||||
|
||||
/** 计量参比条件压力 */
|
||||
@Excel(name = "计量参比条件压力 ")
|
||||
private String dCbtj;
|
||||
|
||||
/** 计量参比条件压力 */
|
||||
@Excel(name = "计量参比条件压力 ")
|
||||
private String dpbM;
|
||||
|
||||
/** 计量参比条件温度 */
|
||||
@Excel(name = "计量参比条件温度 ")
|
||||
private String dtbM;
|
||||
|
||||
/** 燃烧参比条件压力 */
|
||||
@Excel(name = "燃烧参比条件压力 ")
|
||||
private String dpbE;
|
||||
|
||||
/** 燃烧参比条件温度 */
|
||||
@Excel(name = "燃烧参比条件温度 ")
|
||||
private String dtbE;
|
||||
|
||||
/** 当地大气压 */
|
||||
@Excel(name = "当地大气压 ")
|
||||
private String dPatm;
|
||||
|
||||
/** 当地大气压单位 */
|
||||
@Excel(name = "当地大气压单位 ")
|
||||
private String dPatmUnit;
|
||||
|
||||
/** 天然气组分 */
|
||||
@Excel(name = "天然气组分 ")
|
||||
private String dngCompents;
|
||||
|
||||
/** 流量计类别 */
|
||||
@Excel(name = "流量计类别 ")
|
||||
private String dMeterType;
|
||||
|
||||
/** 节流装置类型 */
|
||||
@Excel(name = "节流装置类型 ")
|
||||
private String dCoreType;
|
||||
|
||||
/** 取压方式 */
|
||||
@Excel(name = "取压方式 ")
|
||||
private String dPtmode;
|
||||
|
||||
/** 管道类型 */
|
||||
@Excel(name = "管道类型 ")
|
||||
private String dPipeType;
|
||||
|
||||
/** 管道内径 */
|
||||
@Excel(name = "管道内径 ")
|
||||
private String dPipeD;
|
||||
|
||||
/** 长度单位 */
|
||||
@Excel(name = "长度单位 ")
|
||||
private String dLenUnit;
|
||||
|
||||
/** 管道内径参考温度 */
|
||||
@Excel(name = "管道内径参考温度 ")
|
||||
private String dPipeDtemp;
|
||||
|
||||
/** 温度单位 */
|
||||
@Excel(name = "温度单位 ")
|
||||
private String dPileDtempU;
|
||||
|
||||
/** 管道材料 */
|
||||
@Excel(name = "管道材料 ")
|
||||
private String dPipeMaterial;
|
||||
|
||||
/** 孔板孔径 */
|
||||
@Excel(name = "孔板孔径 ")
|
||||
private String dOrificeD;
|
||||
|
||||
/** 长度单位 */
|
||||
@Excel(name = "长度单位 ")
|
||||
private String dOrificeUnit;
|
||||
|
||||
/** 孔板内径参考温度 */
|
||||
@Excel(name = "孔板内径参考温度 ")
|
||||
private String dOrificeDtemp;
|
||||
|
||||
/** 温度单位 */
|
||||
@Excel(name = "温度单位 ")
|
||||
private String dOrificeDtempUnit;
|
||||
|
||||
/** 孔板材料 */
|
||||
@Excel(name = "孔板材料 ")
|
||||
private String dOrificeMaterial;
|
||||
|
||||
/** 锐利度系数计算方法 */
|
||||
@Excel(name = "锐利度系数计算方法 ")
|
||||
private String dOrificeSharpness;
|
||||
|
||||
/** 孔板入口圆弧半径 */
|
||||
@Excel(name = "孔板入口圆弧半径 ")
|
||||
private String dOrificeRk;
|
||||
|
||||
/** 长度单位 */
|
||||
@Excel(name = "长度单位 ")
|
||||
private String dOrificeRkLenU;
|
||||
|
||||
/** 输入压力 */
|
||||
@Excel(name = "输入压力 ")
|
||||
private String dPf;
|
||||
|
||||
/** 压力单位 */
|
||||
@Excel(name = "压力单位 ")
|
||||
private String dPfUnit;
|
||||
|
||||
/** 压力类型 */
|
||||
@Excel(name = "压力类型 ")
|
||||
private String dPfType;
|
||||
|
||||
/** 输入温度 */
|
||||
@Excel(name = "输入温度 ")
|
||||
private String dTf;
|
||||
|
||||
/** 温度单位 */
|
||||
@Excel(name = "温度单位 ")
|
||||
private String dTfUnit;
|
||||
|
||||
/** 输入差压 */
|
||||
@Excel(name = "输入差压 ")
|
||||
private String dDp;
|
||||
|
||||
/** 压力单位 */
|
||||
@Excel(name = "压力单位 ")
|
||||
private String dDpUnit;
|
||||
|
||||
/** 体积流量单位 */
|
||||
@Excel(name = "体积流量单位 ")
|
||||
private String dVFlowUnit;
|
||||
|
||||
/** 质量流量单位 */
|
||||
@Excel(name = "质量流量单位 ")
|
||||
private String dMFlowUnit;
|
||||
|
||||
/** 能量流量单位 */
|
||||
@Excel(name = "能量流量单位 ")
|
||||
private String dEFlowUnit;
|
||||
|
||||
/** 流出系数 */
|
||||
@Excel(name = "流出系数 ")
|
||||
private String dCd;
|
||||
|
||||
/** 流出系数计算方法 */
|
||||
@Excel(name = "流出系数计算方法 ")
|
||||
private String dCdCalMethod;
|
||||
|
||||
/** 仪表系数 */
|
||||
@Excel(name = "仪表系数 ")
|
||||
private String dMeterFactor;
|
||||
|
||||
/** 脉冲数 */
|
||||
@Excel(name = "脉冲数 ")
|
||||
private String dPulseNum;
|
||||
|
||||
/** 最大体积流量 */
|
||||
@Excel(name = "最大体积流量 ")
|
||||
private String dVFlowMax;
|
||||
|
||||
/** 最小体积流量 */
|
||||
@Excel(name = "最小体积流量 ")
|
||||
private String dVFlowMin;
|
||||
|
||||
/** 常用流量 */
|
||||
@Excel(name = "常用流量 ")
|
||||
private String dVFlowCon;
|
||||
|
||||
/** 压力量程下限 */
|
||||
@Excel(name = "压力量程下限 ")
|
||||
private String dPfRangeMin;
|
||||
|
||||
/** 压力量程上限 */
|
||||
@Excel(name = "压力量程上限 ")
|
||||
private String dPfRangeMax;
|
||||
|
||||
/** 差压量程下限 */
|
||||
@Excel(name = "差压量程下限 ")
|
||||
private String dDpRangeMin;
|
||||
|
||||
/** 差压量程上限 */
|
||||
@Excel(name = "差压量程上限 ")
|
||||
private String dDpRangeMax;
|
||||
|
||||
/** 温度计量程下限 */
|
||||
@Excel(name = "温度计量程下限 ")
|
||||
private String dTfRangeMin;
|
||||
|
||||
/** 温度计量程上限 */
|
||||
@Excel(name = "温度计量程上限 ")
|
||||
private String dTfRangeMax;
|
||||
|
||||
/** 管束车容积 */
|
||||
@Excel(name = "管束车容积 ")
|
||||
private String dVGsc;
|
||||
|
||||
/** 取样编号 */
|
||||
@Excel(name = "取样编号")
|
||||
private String sampleno;
|
||||
|
||||
/** 仪表编号 */
|
||||
@Excel(name = "仪表编号")
|
||||
private String meterno;
|
||||
|
||||
public void setId(String id)
|
||||
{
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getId()
|
||||
{
|
||||
return id;
|
||||
}
|
||||
public void setCreateName(String createName)
|
||||
{
|
||||
this.createName = createName;
|
||||
}
|
||||
|
||||
public String getCreateName()
|
||||
{
|
||||
return createName;
|
||||
}
|
||||
public void setUpdateName(String updateName)
|
||||
{
|
||||
this.updateName = updateName;
|
||||
}
|
||||
|
||||
public String getUpdateName()
|
||||
{
|
||||
return updateName;
|
||||
}
|
||||
public void setdFlowCalbz(String dFlowCalbz)
|
||||
{
|
||||
this.dFlowCalbz = dFlowCalbz;
|
||||
}
|
||||
|
||||
public String getdFlowCalbz()
|
||||
{
|
||||
return dFlowCalbz;
|
||||
}
|
||||
public void setdZcalbz(String dZcalbz)
|
||||
{
|
||||
this.dZcalbz = dZcalbz;
|
||||
}
|
||||
|
||||
public String getdZcalbz()
|
||||
{
|
||||
return dZcalbz;
|
||||
}
|
||||
public void setdCbtj(String dCbtj)
|
||||
{
|
||||
this.dCbtj = dCbtj;
|
||||
}
|
||||
|
||||
public String getdCbtj()
|
||||
{
|
||||
return dCbtj;
|
||||
}
|
||||
public void setDpbM(String dpbM)
|
||||
{
|
||||
this.dpbM = dpbM;
|
||||
}
|
||||
|
||||
public String getDpbM()
|
||||
{
|
||||
return dpbM;
|
||||
}
|
||||
public void setDtbM(String dtbM)
|
||||
{
|
||||
this.dtbM = dtbM;
|
||||
}
|
||||
|
||||
public String getDtbM()
|
||||
{
|
||||
return dtbM;
|
||||
}
|
||||
public void setDpbE(String dpbE)
|
||||
{
|
||||
this.dpbE = dpbE;
|
||||
}
|
||||
|
||||
public String getDpbE()
|
||||
{
|
||||
return dpbE;
|
||||
}
|
||||
public void setDtbE(String dtbE)
|
||||
{
|
||||
this.dtbE = dtbE;
|
||||
}
|
||||
|
||||
public String getDtbE()
|
||||
{
|
||||
return dtbE;
|
||||
}
|
||||
public void setdPatm(String dPatm)
|
||||
{
|
||||
this.dPatm = dPatm;
|
||||
}
|
||||
|
||||
public String getdPatm()
|
||||
{
|
||||
return dPatm;
|
||||
}
|
||||
public void setdPatmUnit(String dPatmUnit)
|
||||
{
|
||||
this.dPatmUnit = dPatmUnit;
|
||||
}
|
||||
|
||||
public String getdPatmUnit()
|
||||
{
|
||||
return dPatmUnit;
|
||||
}
|
||||
public void setDngCompents(String dngCompents)
|
||||
{
|
||||
this.dngCompents = dngCompents;
|
||||
}
|
||||
|
||||
public String getDngCompents()
|
||||
{
|
||||
return dngCompents;
|
||||
}
|
||||
public void setdMeterType(String dMeterType)
|
||||
{
|
||||
this.dMeterType = dMeterType;
|
||||
}
|
||||
|
||||
public String getdMeterType()
|
||||
{
|
||||
return dMeterType;
|
||||
}
|
||||
public void setdCoreType(String dCoreType)
|
||||
{
|
||||
this.dCoreType = dCoreType;
|
||||
}
|
||||
|
||||
public String getdCoreType()
|
||||
{
|
||||
return dCoreType;
|
||||
}
|
||||
public void setdPtmode(String dPtmode)
|
||||
{
|
||||
this.dPtmode = dPtmode;
|
||||
}
|
||||
|
||||
public String getdPtmode()
|
||||
{
|
||||
return dPtmode;
|
||||
}
|
||||
public void setdPipeType(String dPipeType)
|
||||
{
|
||||
this.dPipeType = dPipeType;
|
||||
}
|
||||
|
||||
public String getdPipeType()
|
||||
{
|
||||
return dPipeType;
|
||||
}
|
||||
public void setdPipeD(String dPipeD)
|
||||
{
|
||||
this.dPipeD = dPipeD;
|
||||
}
|
||||
|
||||
public String getdPipeD()
|
||||
{
|
||||
return dPipeD;
|
||||
}
|
||||
public void setdLenUnit(String dLenUnit)
|
||||
{
|
||||
this.dLenUnit = dLenUnit;
|
||||
}
|
||||
|
||||
public String getdLenUnit()
|
||||
{
|
||||
return dLenUnit;
|
||||
}
|
||||
public void setdPipeDtemp(String dPipeDtemp)
|
||||
{
|
||||
this.dPipeDtemp = dPipeDtemp;
|
||||
}
|
||||
|
||||
public String getdPipeDtemp()
|
||||
{
|
||||
return dPipeDtemp;
|
||||
}
|
||||
public void setdPileDtempU(String dPileDtempU)
|
||||
{
|
||||
this.dPileDtempU = dPileDtempU;
|
||||
}
|
||||
|
||||
public String getdPileDtempU()
|
||||
{
|
||||
return dPileDtempU;
|
||||
}
|
||||
public void setdPipeMaterial(String dPipeMaterial)
|
||||
{
|
||||
this.dPipeMaterial = dPipeMaterial;
|
||||
}
|
||||
|
||||
public String getdPipeMaterial()
|
||||
{
|
||||
return dPipeMaterial;
|
||||
}
|
||||
public void setdOrificeD(String dOrificeD)
|
||||
{
|
||||
this.dOrificeD = dOrificeD;
|
||||
}
|
||||
|
||||
public String getdOrificeD()
|
||||
{
|
||||
return dOrificeD;
|
||||
}
|
||||
public void setdOrificeUnit(String dOrificeUnit)
|
||||
{
|
||||
this.dOrificeUnit = dOrificeUnit;
|
||||
}
|
||||
|
||||
public String getdOrificeUnit()
|
||||
{
|
||||
return dOrificeUnit;
|
||||
}
|
||||
public void setdOrificeDtemp(String dOrificeDtemp)
|
||||
{
|
||||
this.dOrificeDtemp = dOrificeDtemp;
|
||||
}
|
||||
|
||||
public String getdOrificeDtemp()
|
||||
{
|
||||
return dOrificeDtemp;
|
||||
}
|
||||
public void setdOrificeDtempUnit(String dOrificeDtempUnit)
|
||||
{
|
||||
this.dOrificeDtempUnit = dOrificeDtempUnit;
|
||||
}
|
||||
|
||||
public String getdOrificeDtempUnit()
|
||||
{
|
||||
return dOrificeDtempUnit;
|
||||
}
|
||||
public void setdOrificeMaterial(String dOrificeMaterial)
|
||||
{
|
||||
this.dOrificeMaterial = dOrificeMaterial;
|
||||
}
|
||||
|
||||
public String getdOrificeMaterial()
|
||||
{
|
||||
return dOrificeMaterial;
|
||||
}
|
||||
public void setdOrificeSharpness(String dOrificeSharpness)
|
||||
{
|
||||
this.dOrificeSharpness = dOrificeSharpness;
|
||||
}
|
||||
|
||||
public String getdOrificeSharpness()
|
||||
{
|
||||
return dOrificeSharpness;
|
||||
}
|
||||
public void setdOrificeRk(String dOrificeRk)
|
||||
{
|
||||
this.dOrificeRk = dOrificeRk;
|
||||
}
|
||||
|
||||
public String getdOrificeRk()
|
||||
{
|
||||
return dOrificeRk;
|
||||
}
|
||||
public void setdOrificeRkLenU(String dOrificeRkLenU)
|
||||
{
|
||||
this.dOrificeRkLenU = dOrificeRkLenU;
|
||||
}
|
||||
|
||||
public String getdOrificeRkLenU()
|
||||
{
|
||||
return dOrificeRkLenU;
|
||||
}
|
||||
public void setdPf(String dPf)
|
||||
{
|
||||
this.dPf = dPf;
|
||||
}
|
||||
|
||||
public String getdPf()
|
||||
{
|
||||
return dPf;
|
||||
}
|
||||
public void setdPfUnit(String dPfUnit)
|
||||
{
|
||||
this.dPfUnit = dPfUnit;
|
||||
}
|
||||
|
||||
public String getdPfUnit()
|
||||
{
|
||||
return dPfUnit;
|
||||
}
|
||||
public void setdPfType(String dPfType)
|
||||
{
|
||||
this.dPfType = dPfType;
|
||||
}
|
||||
|
||||
public String getdPfType()
|
||||
{
|
||||
return dPfType;
|
||||
}
|
||||
public void setdTf(String dTf)
|
||||
{
|
||||
this.dTf = dTf;
|
||||
}
|
||||
|
||||
public String getdTf()
|
||||
{
|
||||
return dTf;
|
||||
}
|
||||
public void setdTfUnit(String dTfUnit)
|
||||
{
|
||||
this.dTfUnit = dTfUnit;
|
||||
}
|
||||
|
||||
public String getdTfUnit()
|
||||
{
|
||||
return dTfUnit;
|
||||
}
|
||||
public void setdDp(String dDp)
|
||||
{
|
||||
this.dDp = dDp;
|
||||
}
|
||||
|
||||
public String getdDp()
|
||||
{
|
||||
return dDp;
|
||||
}
|
||||
public void setdDpUnit(String dDpUnit)
|
||||
{
|
||||
this.dDpUnit = dDpUnit;
|
||||
}
|
||||
|
||||
public String getdDpUnit()
|
||||
{
|
||||
return dDpUnit;
|
||||
}
|
||||
public void setdVFlowUnit(String dVFlowUnit)
|
||||
{
|
||||
this.dVFlowUnit = dVFlowUnit;
|
||||
}
|
||||
|
||||
public String getdVFlowUnit()
|
||||
{
|
||||
return dVFlowUnit;
|
||||
}
|
||||
public void setdMFlowUnit(String dMFlowUnit)
|
||||
{
|
||||
this.dMFlowUnit = dMFlowUnit;
|
||||
}
|
||||
|
||||
public String getdMFlowUnit()
|
||||
{
|
||||
return dMFlowUnit;
|
||||
}
|
||||
public void setdEFlowUnit(String dEFlowUnit)
|
||||
{
|
||||
this.dEFlowUnit = dEFlowUnit;
|
||||
}
|
||||
|
||||
public String getdEFlowUnit()
|
||||
{
|
||||
return dEFlowUnit;
|
||||
}
|
||||
public void setdCd(String dCd)
|
||||
{
|
||||
this.dCd = dCd;
|
||||
}
|
||||
|
||||
public String getdCd()
|
||||
{
|
||||
return dCd;
|
||||
}
|
||||
public void setdCdCalMethod(String dCdCalMethod)
|
||||
{
|
||||
this.dCdCalMethod = dCdCalMethod;
|
||||
}
|
||||
|
||||
public String getdCdCalMethod()
|
||||
{
|
||||
return dCdCalMethod;
|
||||
}
|
||||
public void setdMeterFactor(String dMeterFactor)
|
||||
{
|
||||
this.dMeterFactor = dMeterFactor;
|
||||
}
|
||||
|
||||
public String getdMeterFactor()
|
||||
{
|
||||
return dMeterFactor;
|
||||
}
|
||||
public void setdPulseNum(String dPulseNum)
|
||||
{
|
||||
this.dPulseNum = dPulseNum;
|
||||
}
|
||||
|
||||
public String getdPulseNum()
|
||||
{
|
||||
return dPulseNum;
|
||||
}
|
||||
public void setdVFlowMax(String dVFlowMax)
|
||||
{
|
||||
this.dVFlowMax = dVFlowMax;
|
||||
}
|
||||
|
||||
public String getdVFlowMax()
|
||||
{
|
||||
return dVFlowMax;
|
||||
}
|
||||
public void setdVFlowMin(String dVFlowMin)
|
||||
{
|
||||
this.dVFlowMin = dVFlowMin;
|
||||
}
|
||||
|
||||
public String getdVFlowMin()
|
||||
{
|
||||
return dVFlowMin;
|
||||
}
|
||||
public void setdVFlowCon(String dVFlowCon)
|
||||
{
|
||||
this.dVFlowCon = dVFlowCon;
|
||||
}
|
||||
|
||||
public String getdVFlowCon()
|
||||
{
|
||||
return dVFlowCon;
|
||||
}
|
||||
public void setdPfRangeMin(String dPfRangeMin)
|
||||
{
|
||||
this.dPfRangeMin = dPfRangeMin;
|
||||
}
|
||||
|
||||
public String getdPfRangeMin()
|
||||
{
|
||||
return dPfRangeMin;
|
||||
}
|
||||
public void setdPfRangeMax(String dPfRangeMax)
|
||||
{
|
||||
this.dPfRangeMax = dPfRangeMax;
|
||||
}
|
||||
|
||||
public String getdPfRangeMax()
|
||||
{
|
||||
return dPfRangeMax;
|
||||
}
|
||||
public void setdDpRangeMin(String dDpRangeMin)
|
||||
{
|
||||
this.dDpRangeMin = dDpRangeMin;
|
||||
}
|
||||
|
||||
public String getdDpRangeMin()
|
||||
{
|
||||
return dDpRangeMin;
|
||||
}
|
||||
public void setdDpRangeMax(String dDpRangeMax)
|
||||
{
|
||||
this.dDpRangeMax = dDpRangeMax;
|
||||
}
|
||||
|
||||
public String getdDpRangeMax()
|
||||
{
|
||||
return dDpRangeMax;
|
||||
}
|
||||
public void setdTfRangeMin(String dTfRangeMin)
|
||||
{
|
||||
this.dTfRangeMin = dTfRangeMin;
|
||||
}
|
||||
|
||||
public String getdTfRangeMin()
|
||||
{
|
||||
return dTfRangeMin;
|
||||
}
|
||||
public void setdTfRangeMax(String dTfRangeMax)
|
||||
{
|
||||
this.dTfRangeMax = dTfRangeMax;
|
||||
}
|
||||
|
||||
public String getdTfRangeMax()
|
||||
{
|
||||
return dTfRangeMax;
|
||||
}
|
||||
public void setdVGsc(String dVGsc)
|
||||
{
|
||||
this.dVGsc = dVGsc;
|
||||
}
|
||||
|
||||
public String getdVGsc()
|
||||
{
|
||||
return dVGsc;
|
||||
}
|
||||
public void setSampleno(String sampleno)
|
||||
{
|
||||
this.sampleno = sampleno;
|
||||
}
|
||||
|
||||
public String getSampleno()
|
||||
{
|
||||
return sampleno;
|
||||
}
|
||||
public void setMeterno(String meterno)
|
||||
{
|
||||
this.meterno = meterno;
|
||||
}
|
||||
|
||||
public String getMeterno()
|
||||
{
|
||||
return meterno;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("id", getId())
|
||||
.append("createName", getCreateName())
|
||||
.append("createBy", getCreateBy())
|
||||
.append("createTime", getCreateTime())
|
||||
.append("updateName", getUpdateName())
|
||||
.append("updateBy", getUpdateBy())
|
||||
.append("updateTime", getUpdateTime())
|
||||
.append("dFlowCalbz", getdFlowCalbz())
|
||||
.append("dZcalbz", getdZcalbz())
|
||||
.append("dCbtj", getdCbtj())
|
||||
.append("dpbM", getDpbM())
|
||||
.append("dtbM", getDtbM())
|
||||
.append("dpbE", getDpbE())
|
||||
.append("dtbE", getDtbE())
|
||||
.append("dPatm", getdPatm())
|
||||
.append("dPatmUnit", getdPatmUnit())
|
||||
.append("dngCompents", getDngCompents())
|
||||
.append("dMeterType", getdMeterType())
|
||||
.append("dCoreType", getdCoreType())
|
||||
.append("dPtmode", getdPtmode())
|
||||
.append("dPipeType", getdPipeType())
|
||||
.append("dPipeD", getdPipeD())
|
||||
.append("dLenUnit", getdLenUnit())
|
||||
.append("dPipeDtemp", getdPipeDtemp())
|
||||
.append("dPileDtempU", getdPileDtempU())
|
||||
.append("dPipeMaterial", getdPipeMaterial())
|
||||
.append("dOrificeD", getdOrificeD())
|
||||
.append("dOrificeUnit", getdOrificeUnit())
|
||||
.append("dOrificeDtemp", getdOrificeDtemp())
|
||||
.append("dOrificeDtempUnit", getdOrificeDtempUnit())
|
||||
.append("dOrificeMaterial", getdOrificeMaterial())
|
||||
.append("dOrificeSharpness", getdOrificeSharpness())
|
||||
.append("dOrificeRk", getdOrificeRk())
|
||||
.append("dOrificeRkLenU", getdOrificeRkLenU())
|
||||
.append("dPf", getdPf())
|
||||
.append("dPfUnit", getdPfUnit())
|
||||
.append("dPfType", getdPfType())
|
||||
.append("dTf", getdTf())
|
||||
.append("dTfUnit", getdTfUnit())
|
||||
.append("dDp", getdDp())
|
||||
.append("dDpUnit", getdDpUnit())
|
||||
.append("dVFlowUnit", getdVFlowUnit())
|
||||
.append("dMFlowUnit", getdMFlowUnit())
|
||||
.append("dEFlowUnit", getdEFlowUnit())
|
||||
.append("dCd", getdCd())
|
||||
.append("dCdCalMethod", getdCdCalMethod())
|
||||
.append("dMeterFactor", getdMeterFactor())
|
||||
.append("dPulseNum", getdPulseNum())
|
||||
.append("dVFlowMax", getdVFlowMax())
|
||||
.append("dVFlowMin", getdVFlowMin())
|
||||
.append("dVFlowCon", getdVFlowCon())
|
||||
.append("dPfRangeMin", getdPfRangeMin())
|
||||
.append("dPfRangeMax", getdPfRangeMax())
|
||||
.append("dDpRangeMin", getdDpRangeMin())
|
||||
.append("dDpRangeMax", getdDpRangeMax())
|
||||
.append("dTfRangeMin", getdTfRangeMin())
|
||||
.append("dTfRangeMax", getdTfRangeMax())
|
||||
.append("dVGsc", getdVGsc())
|
||||
.append("sampleno", getSampleno())
|
||||
.append("meterno", getMeterno())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
@ -1,363 +0,0 @@
|
||||
package com.ruoyi.ngtools.domain;
|
||||
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
import com.ruoyi.common.annotation.Excel;
|
||||
import com.ruoyi.common.core.domain.BaseEntity;
|
||||
|
||||
/**
|
||||
* 流量计算结果对象 ng_meterresult
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-02-09
|
||||
*/
|
||||
public class NgMeterresult extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** ID */
|
||||
private String id;
|
||||
|
||||
/** 创建人名称 */
|
||||
@Excel(name = "创建人名称")
|
||||
private String createName;
|
||||
|
||||
/** 更新人名称 */
|
||||
@Excel(name = "更新人名称")
|
||||
private String updateName;
|
||||
|
||||
/** 流量计编号 */
|
||||
@Excel(name = "流量计编号")
|
||||
private String ybbh;
|
||||
|
||||
/** 求渐近速度系数 E */
|
||||
@Excel(name = "求渐近速度系数 E")
|
||||
private String dE;
|
||||
|
||||
/** 求相对密度系数 FG */
|
||||
@Excel(name = "求相对密度系数 FG")
|
||||
private String dFG;
|
||||
|
||||
/** 求流动温度系数 FT */
|
||||
@Excel(name = "求流动温度系数 FT")
|
||||
private String dFT;
|
||||
|
||||
/** 求动力粘度dlnd */
|
||||
@Excel(name = "求动力粘度dlnd")
|
||||
private String dDViscosity;
|
||||
|
||||
/** 求可膨胀系数 */
|
||||
@Excel(name = "求可膨胀系数")
|
||||
private String dDExpCoefficient;
|
||||
|
||||
/** 管道雷诺数 */
|
||||
@Excel(name = "管道雷诺数")
|
||||
private String dRnPipe;
|
||||
|
||||
/** 孔板锐利度系数Bk */
|
||||
@Excel(name = "孔板锐利度系数Bk")
|
||||
private String dBk;
|
||||
|
||||
/** 管道粗糙度系数 Gme */
|
||||
@Excel(name = "管道粗糙度系数 Gme")
|
||||
private String dRoughNessPipe;
|
||||
|
||||
/** 修正后的流出系数 */
|
||||
@Excel(name = "修正后的流出系数")
|
||||
private String dCdCorrect;
|
||||
|
||||
/** 喷嘴的流出系数 */
|
||||
@Excel(name = "喷嘴的流出系数")
|
||||
private String dCdNozell;
|
||||
|
||||
/** 标况体积流量m³/s */
|
||||
@Excel(name = "标况体积流量m³/s")
|
||||
private String dVFlowb;
|
||||
|
||||
/** 工况体积流量 */
|
||||
@Excel(name = "工况体积流量")
|
||||
private String dVFlowf;
|
||||
|
||||
/** 标况质量流量 */
|
||||
@Excel(name = "标况质量流量")
|
||||
private String dMFlowb;
|
||||
|
||||
/** 标况能量流量 */
|
||||
@Excel(name = "标况能量流量")
|
||||
private String dEFlowb;
|
||||
|
||||
/** 管道内天然气流速 */
|
||||
@Excel(name = "管道内天然气流速")
|
||||
private String dVelocityFlow;
|
||||
|
||||
/** 压力损失 */
|
||||
@Excel(name = "压力损失")
|
||||
private String dPressLost;
|
||||
|
||||
/** 直径比 */
|
||||
@Excel(name = "直径比")
|
||||
private String dBeta;
|
||||
|
||||
/** 等熵指数 */
|
||||
@Excel(name = "等熵指数")
|
||||
private String dKappa;
|
||||
|
||||
/** 取样编号 */
|
||||
@Excel(name = "取样编号")
|
||||
private String sampleno;
|
||||
|
||||
/** 仪表编号 */
|
||||
@Excel(name = "仪表编号")
|
||||
private String meterno;
|
||||
|
||||
public void setId(String id)
|
||||
{
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getId()
|
||||
{
|
||||
return id;
|
||||
}
|
||||
public void setCreateName(String createName)
|
||||
{
|
||||
this.createName = createName;
|
||||
}
|
||||
|
||||
public String getCreateName()
|
||||
{
|
||||
return createName;
|
||||
}
|
||||
public void setUpdateName(String updateName)
|
||||
{
|
||||
this.updateName = updateName;
|
||||
}
|
||||
|
||||
public String getUpdateName()
|
||||
{
|
||||
return updateName;
|
||||
}
|
||||
public void setYbbh(String ybbh)
|
||||
{
|
||||
this.ybbh = ybbh;
|
||||
}
|
||||
|
||||
public String getYbbh()
|
||||
{
|
||||
return ybbh;
|
||||
}
|
||||
public void setDE(String dE)
|
||||
{
|
||||
this.dE = dE;
|
||||
}
|
||||
|
||||
public String getDE()
|
||||
{
|
||||
return dE;
|
||||
}
|
||||
public void setdFG(String dFG)
|
||||
{
|
||||
this.dFG = dFG;
|
||||
}
|
||||
|
||||
public String getdFG()
|
||||
{
|
||||
return dFG;
|
||||
}
|
||||
public void setdFT(String dFT)
|
||||
{
|
||||
this.dFT = dFT;
|
||||
}
|
||||
|
||||
public String getdFT()
|
||||
{
|
||||
return dFT;
|
||||
}
|
||||
public void setdDViscosity(String dDViscosity)
|
||||
{
|
||||
this.dDViscosity = dDViscosity;
|
||||
}
|
||||
|
||||
public String getdDViscosity()
|
||||
{
|
||||
return dDViscosity;
|
||||
}
|
||||
public void setdDExpCoefficient(String dDExpCoefficient)
|
||||
{
|
||||
this.dDExpCoefficient = dDExpCoefficient;
|
||||
}
|
||||
|
||||
public String getdDExpCoefficient()
|
||||
{
|
||||
return dDExpCoefficient;
|
||||
}
|
||||
public void setdRnPipe(String dRnPipe)
|
||||
{
|
||||
this.dRnPipe = dRnPipe;
|
||||
}
|
||||
|
||||
public String getdRnPipe()
|
||||
{
|
||||
return dRnPipe;
|
||||
}
|
||||
public void setdBk(String dBk)
|
||||
{
|
||||
this.dBk = dBk;
|
||||
}
|
||||
|
||||
public String getdBk()
|
||||
{
|
||||
return dBk;
|
||||
}
|
||||
public void setdRoughNessPipe(String dRoughNessPipe)
|
||||
{
|
||||
this.dRoughNessPipe = dRoughNessPipe;
|
||||
}
|
||||
|
||||
public String getdRoughNessPipe()
|
||||
{
|
||||
return dRoughNessPipe;
|
||||
}
|
||||
public void setdCdCorrect(String dCdCorrect)
|
||||
{
|
||||
this.dCdCorrect = dCdCorrect;
|
||||
}
|
||||
|
||||
public String getdCdCorrect()
|
||||
{
|
||||
return dCdCorrect;
|
||||
}
|
||||
public void setdCdNozell(String dCdNozell)
|
||||
{
|
||||
this.dCdNozell = dCdNozell;
|
||||
}
|
||||
|
||||
public String getdCdNozell()
|
||||
{
|
||||
return dCdNozell;
|
||||
}
|
||||
public void setdVFlowb(String dVFlowb)
|
||||
{
|
||||
this.dVFlowb = dVFlowb;
|
||||
}
|
||||
|
||||
public String getdVFlowb()
|
||||
{
|
||||
return dVFlowb;
|
||||
}
|
||||
public void setdVFlowf(String dVFlowf)
|
||||
{
|
||||
this.dVFlowf = dVFlowf;
|
||||
}
|
||||
|
||||
public String getdVFlowf()
|
||||
{
|
||||
return dVFlowf;
|
||||
}
|
||||
public void setdMFlowb(String dMFlowb)
|
||||
{
|
||||
this.dMFlowb = dMFlowb;
|
||||
}
|
||||
|
||||
public String getdMFlowb()
|
||||
{
|
||||
return dMFlowb;
|
||||
}
|
||||
public void setdEFlowb(String dEFlowb)
|
||||
{
|
||||
this.dEFlowb = dEFlowb;
|
||||
}
|
||||
|
||||
public String getdEFlowb()
|
||||
{
|
||||
return dEFlowb;
|
||||
}
|
||||
public void setdVelocityFlow(String dVelocityFlow)
|
||||
{
|
||||
this.dVelocityFlow = dVelocityFlow;
|
||||
}
|
||||
|
||||
public String getdVelocityFlow()
|
||||
{
|
||||
return dVelocityFlow;
|
||||
}
|
||||
public void setdPressLost(String dPressLost)
|
||||
{
|
||||
this.dPressLost = dPressLost;
|
||||
}
|
||||
|
||||
public String getdPressLost()
|
||||
{
|
||||
return dPressLost;
|
||||
}
|
||||
public void setdBeta(String dBeta)
|
||||
{
|
||||
this.dBeta = dBeta;
|
||||
}
|
||||
|
||||
public String getdBeta()
|
||||
{
|
||||
return dBeta;
|
||||
}
|
||||
public void setdKappa(String dKappa)
|
||||
{
|
||||
this.dKappa = dKappa;
|
||||
}
|
||||
|
||||
public String getdKappa()
|
||||
{
|
||||
return dKappa;
|
||||
}
|
||||
public void setSampleno(String sampleno)
|
||||
{
|
||||
this.sampleno = sampleno;
|
||||
}
|
||||
|
||||
public String getSampleno()
|
||||
{
|
||||
return sampleno;
|
||||
}
|
||||
public void setMeterno(String meterno)
|
||||
{
|
||||
this.meterno = meterno;
|
||||
}
|
||||
|
||||
public String getMeterno()
|
||||
{
|
||||
return meterno;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("id", getId())
|
||||
.append("createName", getCreateName())
|
||||
.append("createBy", getCreateBy())
|
||||
.append("createTime", getCreateTime())
|
||||
.append("updateName", getUpdateName())
|
||||
.append("updateBy", getUpdateBy())
|
||||
.append("updateTime", getUpdateTime())
|
||||
.append("ybbh", getYbbh())
|
||||
.append("dE", getDE())
|
||||
.append("dFG", getdFG())
|
||||
.append("dFT", getdFT())
|
||||
.append("dDViscosity", getdDViscosity())
|
||||
.append("dDExpCoefficient", getdDExpCoefficient())
|
||||
.append("dRnPipe", getdRnPipe())
|
||||
.append("dBk", getdBk())
|
||||
.append("dRoughNessPipe", getdRoughNessPipe())
|
||||
.append("dCdCorrect", getdCdCorrect())
|
||||
.append("dCdNozell", getdCdNozell())
|
||||
.append("dVFlowb", getdVFlowb())
|
||||
.append("dVFlowf", getdVFlowf())
|
||||
.append("dMFlowb", getdMFlowb())
|
||||
.append("dEFlowb", getdEFlowb())
|
||||
.append("dVelocityFlow", getdVelocityFlow())
|
||||
.append("dPressLost", getdPressLost())
|
||||
.append("dBeta", getdBeta())
|
||||
.append("dKappa", getdKappa())
|
||||
.append("sampleno", getSampleno())
|
||||
.append("meterno", getMeterno())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
@ -1,825 +0,0 @@
|
||||
package com.ruoyi.ngtools.domain;
|
||||
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
import com.ruoyi.common.annotation.Excel;
|
||||
import com.ruoyi.common.core.domain.BaseEntity;
|
||||
|
||||
/**
|
||||
* 天然气物性参数对象 ng_ngpar
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-02-09
|
||||
*/
|
||||
public class NgNgpar extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** ID */
|
||||
private String id;
|
||||
|
||||
/** 创建人名称 */
|
||||
@Excel(name = "创建人名称")
|
||||
private String createName;
|
||||
|
||||
/** 更新人名称 */
|
||||
@Excel(name = "更新人名称")
|
||||
private String updateName;
|
||||
|
||||
/** 气体摩尔组成 */
|
||||
@Excel(name = "气体摩尔组成")
|
||||
private String adMixture;
|
||||
|
||||
/** 气体体积组成 */
|
||||
@Excel(name = "气体体积组成")
|
||||
private String adMixtureV;
|
||||
|
||||
/** 气体质量组成 */
|
||||
@Excel(name = "气体质量组成")
|
||||
private String adMixtureD;
|
||||
|
||||
/** 参比条件 */
|
||||
@Excel(name = "参比条件")
|
||||
private String dCbtj;
|
||||
|
||||
/** 参比压力 */
|
||||
@Excel(name = "参比压力")
|
||||
private String dPb;
|
||||
|
||||
/** 参比温度 */
|
||||
@Excel(name = "参比温度")
|
||||
private String dTb;
|
||||
|
||||
/** 绝对压力 */
|
||||
@Excel(name = "绝对压力")
|
||||
private String dPf;
|
||||
|
||||
/** 工况温度 */
|
||||
@Excel(name = "工况温度")
|
||||
private String dTf;
|
||||
|
||||
/** 分子量 */
|
||||
@Excel(name = "分子量")
|
||||
private String dMrx;
|
||||
|
||||
/** 标况压缩因子 */
|
||||
@Excel(name = "标况压缩因子")
|
||||
private String dZb;
|
||||
|
||||
/** 工况压缩因子 */
|
||||
@Excel(name = "工况压缩因子")
|
||||
private String dZf;
|
||||
|
||||
/** 超压缩系数 */
|
||||
@Excel(name = "超压缩系数")
|
||||
private String dFpv;
|
||||
|
||||
/** 标况摩尔密度 */
|
||||
@Excel(name = "标况摩尔密度")
|
||||
private String dDb;
|
||||
|
||||
/** 工况摩尔密度 */
|
||||
@Excel(name = "工况摩尔密度")
|
||||
private String dDf;
|
||||
|
||||
/** 标况质量密度 */
|
||||
@Excel(name = "标况质量密度")
|
||||
private String dRhob;
|
||||
|
||||
/** 工况质量密度 */
|
||||
@Excel(name = "工况质量密度")
|
||||
private String dRhof;
|
||||
|
||||
/** 理想气体的相对密度 */
|
||||
@Excel(name = "理想气体的相对密度")
|
||||
private String drdIdeal;
|
||||
|
||||
/** 真实气体的相对密度 */
|
||||
@Excel(name = "真实气体的相对密度")
|
||||
private String drdReal;
|
||||
|
||||
/** 理想气体的比焓 */
|
||||
@Excel(name = "理想气体的比焓")
|
||||
private String dHo;
|
||||
|
||||
/** 真实气体的焓 */
|
||||
@Excel(name = "真实气体的焓")
|
||||
private String dH;
|
||||
|
||||
/** 真实气体的熵 */
|
||||
@Excel(name = "真实气体的熵")
|
||||
private String dS;
|
||||
|
||||
/** 理想气体定压热容 */
|
||||
@Excel(name = "理想气体定压热容")
|
||||
private String dCpi;
|
||||
|
||||
/** 定压热容 */
|
||||
@Excel(name = "定压热容")
|
||||
private String dCp;
|
||||
|
||||
/** 定容积热容 */
|
||||
@Excel(name = "定容积热容")
|
||||
private String dCv;
|
||||
|
||||
/** 比热比 */
|
||||
@Excel(name = "比热比")
|
||||
private String dk;
|
||||
|
||||
/** 等熵指数 */
|
||||
@Excel(name = "等熵指数")
|
||||
private String dKappa;
|
||||
|
||||
/** 声速 */
|
||||
@Excel(name = "声速")
|
||||
private String dSOS;
|
||||
|
||||
/** 临界流函数 */
|
||||
@Excel(name = "临界流函数")
|
||||
private String dCstar;
|
||||
|
||||
/** 摩尔高位发热量 */
|
||||
@Excel(name = "摩尔高位发热量")
|
||||
private String dHhvMol;
|
||||
|
||||
/** 摩尔低位发热量 */
|
||||
@Excel(name = "摩尔低位发热量")
|
||||
private String dLhvMol;
|
||||
|
||||
/** 体积高位发热量 */
|
||||
@Excel(name = "体积高位发热量")
|
||||
private String dHhvv;
|
||||
|
||||
/** 体积低位发热量 */
|
||||
@Excel(name = "体积低位发热量")
|
||||
private String dLhvv;
|
||||
|
||||
/** 质量高位发热量 */
|
||||
@Excel(name = "质量高位发热量")
|
||||
private String dHhvm;
|
||||
|
||||
/** 质量地位发热量 */
|
||||
@Excel(name = "质量地位发热量")
|
||||
private String dLhvm;
|
||||
|
||||
/** 标况压缩因子 */
|
||||
@Excel(name = "标况压缩因子")
|
||||
private String dZb11062;
|
||||
|
||||
/** 标况质量密度 */
|
||||
@Excel(name = "标况质量密度")
|
||||
private String dRhob11062;
|
||||
|
||||
/** 工况质量密度 */
|
||||
@Excel(name = "工况质量密度")
|
||||
private String dRhof11062;
|
||||
|
||||
/** 理想气体的相对密度 */
|
||||
@Excel(name = "理想气体的相对密度")
|
||||
private String drdIdeal11062;
|
||||
|
||||
/** 真实气体的相对密度 */
|
||||
@Excel(name = "真实气体的相对密度")
|
||||
private String drdReal11062;
|
||||
|
||||
/** 真实气体的沃泊指数 */
|
||||
@Excel(name = "真实气体的沃泊指数")
|
||||
private String dWobbeIndex;
|
||||
|
||||
/** 临界压力 */
|
||||
@Excel(name = "临界压力")
|
||||
private String dPc;
|
||||
|
||||
/** 临界温度 */
|
||||
@Excel(name = "临界温度")
|
||||
private String dTC;
|
||||
|
||||
/** 爆炸上限 */
|
||||
@Excel(name = "爆炸上限")
|
||||
private String dBzsx;
|
||||
|
||||
/** 爆炸下限 */
|
||||
@Excel(name = "爆炸下限")
|
||||
private String dBzxx;
|
||||
|
||||
/** 总炭含量(kg/m3) */
|
||||
@Excel(name = "总炭含量(kg/m3)")
|
||||
private String dTotalC;
|
||||
|
||||
/** C2组分含量(kg/m3) */
|
||||
@Excel(name = "C2组分含量(kg/m3)")
|
||||
private String dC2;
|
||||
|
||||
/** C2以上组分含量(kg/m3) */
|
||||
@Excel(name = "C2以上组分含量(kg/m3)")
|
||||
private String dC2j;
|
||||
|
||||
/** C3以上组分含量(kg/m3) */
|
||||
@Excel(name = "C3以上组分含量(kg/m3)")
|
||||
private String dC3j;
|
||||
|
||||
/** C4以上组分含量(kg/m3) */
|
||||
@Excel(name = "C4以上组分含量(kg/m3)")
|
||||
private String dC4j;
|
||||
|
||||
/** C5以上组分含量(kg/m3) */
|
||||
@Excel(name = "C5以上组分含量(kg/m3)")
|
||||
private String dC5j;
|
||||
|
||||
/** C6以上组分含量(kg/m3) */
|
||||
@Excel(name = "C6以上组分含量(kg/m3)")
|
||||
private String dC6j;
|
||||
|
||||
/** C3C4组分含量(kg/m3) */
|
||||
@Excel(name = "C3C4组分含量(kg/m3)")
|
||||
private String dC3C4;
|
||||
|
||||
/** 取样编号 */
|
||||
@Excel(name = "取样编号")
|
||||
private String sampleno;
|
||||
|
||||
/** 仪表编号 */
|
||||
@Excel(name = "仪表编号")
|
||||
private String meterno;
|
||||
|
||||
public void setId(String id)
|
||||
{
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getId()
|
||||
{
|
||||
return id;
|
||||
}
|
||||
public void setCreateName(String createName)
|
||||
{
|
||||
this.createName = createName;
|
||||
}
|
||||
|
||||
public String getCreateName()
|
||||
{
|
||||
return createName;
|
||||
}
|
||||
public void setUpdateName(String updateName)
|
||||
{
|
||||
this.updateName = updateName;
|
||||
}
|
||||
|
||||
public String getUpdateName()
|
||||
{
|
||||
return updateName;
|
||||
}
|
||||
public void setAdMixture(String adMixture)
|
||||
{
|
||||
this.adMixture = adMixture;
|
||||
}
|
||||
|
||||
public String getAdMixture()
|
||||
{
|
||||
return adMixture;
|
||||
}
|
||||
public void setAdMixtureV(String adMixtureV)
|
||||
{
|
||||
this.adMixtureV = adMixtureV;
|
||||
}
|
||||
|
||||
public String getAdMixtureV()
|
||||
{
|
||||
return adMixtureV;
|
||||
}
|
||||
public void setAdMixtureD(String adMixtureD)
|
||||
{
|
||||
this.adMixtureD = adMixtureD;
|
||||
}
|
||||
|
||||
public String getAdMixtureD()
|
||||
{
|
||||
return adMixtureD;
|
||||
}
|
||||
public void setdCbtj(String dCbtj)
|
||||
{
|
||||
this.dCbtj = dCbtj;
|
||||
}
|
||||
|
||||
public String getdCbtj()
|
||||
{
|
||||
return dCbtj;
|
||||
}
|
||||
public void setdPb(String dPb)
|
||||
{
|
||||
this.dPb = dPb;
|
||||
}
|
||||
|
||||
public String getdPb()
|
||||
{
|
||||
return dPb;
|
||||
}
|
||||
public void setdTb(String dTb)
|
||||
{
|
||||
this.dTb = dTb;
|
||||
}
|
||||
|
||||
public String getdTb()
|
||||
{
|
||||
return dTb;
|
||||
}
|
||||
public void setdPf(String dPf)
|
||||
{
|
||||
this.dPf = dPf;
|
||||
}
|
||||
|
||||
public String getdPf()
|
||||
{
|
||||
return dPf;
|
||||
}
|
||||
public void setdTf(String dTf)
|
||||
{
|
||||
this.dTf = dTf;
|
||||
}
|
||||
|
||||
public String getdTf()
|
||||
{
|
||||
return dTf;
|
||||
}
|
||||
public void setdMrx(String dMrx)
|
||||
{
|
||||
this.dMrx = dMrx;
|
||||
}
|
||||
|
||||
public String getdMrx()
|
||||
{
|
||||
return dMrx;
|
||||
}
|
||||
public void setdZb(String dZb)
|
||||
{
|
||||
this.dZb = dZb;
|
||||
}
|
||||
|
||||
public String getdZb()
|
||||
{
|
||||
return dZb;
|
||||
}
|
||||
public void setdZf(String dZf)
|
||||
{
|
||||
this.dZf = dZf;
|
||||
}
|
||||
|
||||
public String getdZf()
|
||||
{
|
||||
return dZf;
|
||||
}
|
||||
public void setdFpv(String dFpv)
|
||||
{
|
||||
this.dFpv = dFpv;
|
||||
}
|
||||
|
||||
public String getdFpv()
|
||||
{
|
||||
return dFpv;
|
||||
}
|
||||
public void setdDb(String dDb)
|
||||
{
|
||||
this.dDb = dDb;
|
||||
}
|
||||
|
||||
public String getdDb()
|
||||
{
|
||||
return dDb;
|
||||
}
|
||||
public void setdDf(String dDf)
|
||||
{
|
||||
this.dDf = dDf;
|
||||
}
|
||||
|
||||
public String getdDf()
|
||||
{
|
||||
return dDf;
|
||||
}
|
||||
public void setdRhob(String dRhob)
|
||||
{
|
||||
this.dRhob = dRhob;
|
||||
}
|
||||
|
||||
public String getdRhob()
|
||||
{
|
||||
return dRhob;
|
||||
}
|
||||
public void setdRhof(String dRhof)
|
||||
{
|
||||
this.dRhof = dRhof;
|
||||
}
|
||||
|
||||
public String getdRhof()
|
||||
{
|
||||
return dRhof;
|
||||
}
|
||||
public void setDrdIdeal(String drdIdeal)
|
||||
{
|
||||
this.drdIdeal = drdIdeal;
|
||||
}
|
||||
|
||||
public String getDrdIdeal()
|
||||
{
|
||||
return drdIdeal;
|
||||
}
|
||||
public void setDrdReal(String drdReal)
|
||||
{
|
||||
this.drdReal = drdReal;
|
||||
}
|
||||
|
||||
public String getDrdReal()
|
||||
{
|
||||
return drdReal;
|
||||
}
|
||||
public void setdHo(String dHo)
|
||||
{
|
||||
this.dHo = dHo;
|
||||
}
|
||||
|
||||
public String getdHo()
|
||||
{
|
||||
return dHo;
|
||||
}
|
||||
public void setDH(String dH)
|
||||
{
|
||||
this.dH = dH;
|
||||
}
|
||||
|
||||
public String getDH()
|
||||
{
|
||||
return dH;
|
||||
}
|
||||
public void setDS(String dS)
|
||||
{
|
||||
this.dS = dS;
|
||||
}
|
||||
|
||||
public String getDS()
|
||||
{
|
||||
return dS;
|
||||
}
|
||||
public void setdCpi(String dCpi)
|
||||
{
|
||||
this.dCpi = dCpi;
|
||||
}
|
||||
|
||||
public String getdCpi()
|
||||
{
|
||||
return dCpi;
|
||||
}
|
||||
public void setdCp(String dCp)
|
||||
{
|
||||
this.dCp = dCp;
|
||||
}
|
||||
|
||||
public String getdCp()
|
||||
{
|
||||
return dCp;
|
||||
}
|
||||
public void setdCv(String dCv)
|
||||
{
|
||||
this.dCv = dCv;
|
||||
}
|
||||
|
||||
public String getdCv()
|
||||
{
|
||||
return dCv;
|
||||
}
|
||||
public void setDk(String dk)
|
||||
{
|
||||
this.dk = dk;
|
||||
}
|
||||
|
||||
public String getDk()
|
||||
{
|
||||
return dk;
|
||||
}
|
||||
public void setdKappa(String dKappa)
|
||||
{
|
||||
this.dKappa = dKappa;
|
||||
}
|
||||
|
||||
public String getdKappa()
|
||||
{
|
||||
return dKappa;
|
||||
}
|
||||
public void setdSOS(String dSOS)
|
||||
{
|
||||
this.dSOS = dSOS;
|
||||
}
|
||||
|
||||
public String getdSOS()
|
||||
{
|
||||
return dSOS;
|
||||
}
|
||||
public void setdCstar(String dCstar)
|
||||
{
|
||||
this.dCstar = dCstar;
|
||||
}
|
||||
|
||||
public String getdCstar()
|
||||
{
|
||||
return dCstar;
|
||||
}
|
||||
public void setdHhvMol(String dHhvMol)
|
||||
{
|
||||
this.dHhvMol = dHhvMol;
|
||||
}
|
||||
|
||||
public String getdHhvMol()
|
||||
{
|
||||
return dHhvMol;
|
||||
}
|
||||
public void setdLhvMol(String dLhvMol)
|
||||
{
|
||||
this.dLhvMol = dLhvMol;
|
||||
}
|
||||
|
||||
public String getdLhvMol()
|
||||
{
|
||||
return dLhvMol;
|
||||
}
|
||||
public void setdHhvv(String dHhvv)
|
||||
{
|
||||
this.dHhvv = dHhvv;
|
||||
}
|
||||
|
||||
public String getdHhvv()
|
||||
{
|
||||
return dHhvv;
|
||||
}
|
||||
public void setdLhvv(String dLhvv)
|
||||
{
|
||||
this.dLhvv = dLhvv;
|
||||
}
|
||||
|
||||
public String getdLhvv()
|
||||
{
|
||||
return dLhvv;
|
||||
}
|
||||
public void setdHhvm(String dHhvm)
|
||||
{
|
||||
this.dHhvm = dHhvm;
|
||||
}
|
||||
|
||||
public String getdHhvm()
|
||||
{
|
||||
return dHhvm;
|
||||
}
|
||||
public void setdLhvm(String dLhvm)
|
||||
{
|
||||
this.dLhvm = dLhvm;
|
||||
}
|
||||
|
||||
public String getdLhvm()
|
||||
{
|
||||
return dLhvm;
|
||||
}
|
||||
public void setdZb11062(String dZb11062)
|
||||
{
|
||||
this.dZb11062 = dZb11062;
|
||||
}
|
||||
|
||||
public String getdZb11062()
|
||||
{
|
||||
return dZb11062;
|
||||
}
|
||||
public void setdRhob11062(String dRhob11062)
|
||||
{
|
||||
this.dRhob11062 = dRhob11062;
|
||||
}
|
||||
|
||||
public String getdRhob11062()
|
||||
{
|
||||
return dRhob11062;
|
||||
}
|
||||
public void setdRhof11062(String dRhof11062)
|
||||
{
|
||||
this.dRhof11062 = dRhof11062;
|
||||
}
|
||||
|
||||
public String getdRhof11062()
|
||||
{
|
||||
return dRhof11062;
|
||||
}
|
||||
public void setDrdIdeal11062(String drdIdeal11062)
|
||||
{
|
||||
this.drdIdeal11062 = drdIdeal11062;
|
||||
}
|
||||
|
||||
public String getDrdIdeal11062()
|
||||
{
|
||||
return drdIdeal11062;
|
||||
}
|
||||
public void setDrdReal11062(String drdReal11062)
|
||||
{
|
||||
this.drdReal11062 = drdReal11062;
|
||||
}
|
||||
|
||||
public String getDrdReal11062()
|
||||
{
|
||||
return drdReal11062;
|
||||
}
|
||||
public void setdWobbeIndex(String dWobbeIndex)
|
||||
{
|
||||
this.dWobbeIndex = dWobbeIndex;
|
||||
}
|
||||
|
||||
public String getdWobbeIndex()
|
||||
{
|
||||
return dWobbeIndex;
|
||||
}
|
||||
public void setdPc(String dPc)
|
||||
{
|
||||
this.dPc = dPc;
|
||||
}
|
||||
|
||||
public String getdPc()
|
||||
{
|
||||
return dPc;
|
||||
}
|
||||
public void setdTC(String dTC)
|
||||
{
|
||||
this.dTC = dTC;
|
||||
}
|
||||
|
||||
public String getdTC()
|
||||
{
|
||||
return dTC;
|
||||
}
|
||||
public void setdBzsx(String dBzsx)
|
||||
{
|
||||
this.dBzsx = dBzsx;
|
||||
}
|
||||
|
||||
public String getdBzsx()
|
||||
{
|
||||
return dBzsx;
|
||||
}
|
||||
public void setdBzxx(String dBzxx)
|
||||
{
|
||||
this.dBzxx = dBzxx;
|
||||
}
|
||||
|
||||
public String getdBzxx()
|
||||
{
|
||||
return dBzxx;
|
||||
}
|
||||
public void setdTotalC(String dTotalC)
|
||||
{
|
||||
this.dTotalC = dTotalC;
|
||||
}
|
||||
|
||||
public String getdTotalC()
|
||||
{
|
||||
return dTotalC;
|
||||
}
|
||||
public void setdC2(String dC2)
|
||||
{
|
||||
this.dC2 = dC2;
|
||||
}
|
||||
|
||||
public String getdC2()
|
||||
{
|
||||
return dC2;
|
||||
}
|
||||
public void setdC2j(String dC2j)
|
||||
{
|
||||
this.dC2j = dC2j;
|
||||
}
|
||||
|
||||
public String getdC2j()
|
||||
{
|
||||
return dC2j;
|
||||
}
|
||||
public void setdC3j(String dC3j)
|
||||
{
|
||||
this.dC3j = dC3j;
|
||||
}
|
||||
|
||||
public String getdC3j()
|
||||
{
|
||||
return dC3j;
|
||||
}
|
||||
public void setdC4j(String dC4j)
|
||||
{
|
||||
this.dC4j = dC4j;
|
||||
}
|
||||
|
||||
public String getdC4j()
|
||||
{
|
||||
return dC4j;
|
||||
}
|
||||
public void setdC5j(String dC5j)
|
||||
{
|
||||
this.dC5j = dC5j;
|
||||
}
|
||||
|
||||
public String getdC5j()
|
||||
{
|
||||
return dC5j;
|
||||
}
|
||||
public void setdC6j(String dC6j)
|
||||
{
|
||||
this.dC6j = dC6j;
|
||||
}
|
||||
|
||||
public String getdC6j()
|
||||
{
|
||||
return dC6j;
|
||||
}
|
||||
public void setdC3C4(String dC3C4)
|
||||
{
|
||||
this.dC3C4 = dC3C4;
|
||||
}
|
||||
|
||||
public String getdC3C4()
|
||||
{
|
||||
return dC3C4;
|
||||
}
|
||||
public void setSampleno(String sampleno)
|
||||
{
|
||||
this.sampleno = sampleno;
|
||||
}
|
||||
|
||||
public String getSampleno()
|
||||
{
|
||||
return sampleno;
|
||||
}
|
||||
public void setMeterno(String meterno)
|
||||
{
|
||||
this.meterno = meterno;
|
||||
}
|
||||
|
||||
public String getMeterno()
|
||||
{
|
||||
return meterno;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("id", getId())
|
||||
.append("createName", getCreateName())
|
||||
.append("createBy", getCreateBy())
|
||||
.append("createTime", getCreateTime())
|
||||
.append("updateName", getUpdateName())
|
||||
.append("updateBy", getUpdateBy())
|
||||
.append("updateTime", getUpdateTime())
|
||||
.append("adMixture", getAdMixture())
|
||||
.append("adMixtureV", getAdMixtureV())
|
||||
.append("adMixtureD", getAdMixtureD())
|
||||
.append("dCbtj", getdCbtj())
|
||||
.append("dPb", getdPb())
|
||||
.append("dTb", getdTb())
|
||||
.append("dPf", getdPf())
|
||||
.append("dTf", getdTf())
|
||||
.append("dMrx", getdMrx())
|
||||
.append("dZb", getdZb())
|
||||
.append("dZf", getdZf())
|
||||
.append("dFpv", getdFpv())
|
||||
.append("dDb", getdDb())
|
||||
.append("dDf", getdDf())
|
||||
.append("dRhob", getdRhob())
|
||||
.append("dRhof", getdRhof())
|
||||
.append("drdIdeal", getDrdIdeal())
|
||||
.append("drdReal", getDrdReal())
|
||||
.append("dHo", getdHo())
|
||||
.append("dH", getDH())
|
||||
.append("dS", getDS())
|
||||
.append("dCpi", getdCpi())
|
||||
.append("dCp", getdCp())
|
||||
.append("dCv", getdCv())
|
||||
.append("dk", getDk())
|
||||
.append("dKappa", getdKappa())
|
||||
.append("dSOS", getdSOS())
|
||||
.append("dCstar", getdCstar())
|
||||
.append("dHhvMol", getdHhvMol())
|
||||
.append("dLhvMol", getdLhvMol())
|
||||
.append("dHhvv", getdHhvv())
|
||||
.append("dLhvv", getdLhvv())
|
||||
.append("dHhvm", getdHhvm())
|
||||
.append("dLhvm", getdLhvm())
|
||||
.append("dZb11062", getdZb11062())
|
||||
.append("dRhob11062", getdRhob11062())
|
||||
.append("dRhof11062", getdRhof11062())
|
||||
.append("drdIdeal11062", getDrdIdeal11062())
|
||||
.append("drdReal11062", getDrdReal11062())
|
||||
.append("dWobbeIndex", getdWobbeIndex())
|
||||
.append("dPc", getdPc())
|
||||
.append("dTC", getdTC())
|
||||
.append("dBzsx", getdBzsx())
|
||||
.append("dBzxx", getdBzxx())
|
||||
.append("dTotalC", getdTotalC())
|
||||
.append("dC2", getdC2())
|
||||
.append("dC2j", getdC2j())
|
||||
.append("dC3j", getdC3j())
|
||||
.append("dC4j", getdC4j())
|
||||
.append("dC5j", getdC5j())
|
||||
.append("dC6j", getdC6j())
|
||||
.append("dC3C4", getdC3C4())
|
||||
.append("sampleno", getSampleno())
|
||||
.append("meterno", getMeterno())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
@ -1,61 +0,0 @@
|
||||
package com.ruoyi.system.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.system.domain.NgComponents;
|
||||
|
||||
/**
|
||||
* 天然气组分Mapper接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-03-21
|
||||
*/
|
||||
public interface NgComponentsMapper
|
||||
{
|
||||
/**
|
||||
* 查询天然气组分
|
||||
*
|
||||
* @param id 天然气组分主键
|
||||
* @return 天然气组分
|
||||
*/
|
||||
public NgComponents selectNgComponentsById(String id);
|
||||
|
||||
/**
|
||||
* 查询天然气组分列表
|
||||
*
|
||||
* @param ngComponents 天然气组分
|
||||
* @return 天然气组分集合
|
||||
*/
|
||||
public List<NgComponents> selectNgComponentsList(NgComponents ngComponents);
|
||||
|
||||
/**
|
||||
* 新增天然气组分
|
||||
*
|
||||
* @param ngComponents 天然气组分
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertNgComponents(NgComponents ngComponents);
|
||||
|
||||
/**
|
||||
* 修改天然气组分
|
||||
*
|
||||
* @param ngComponents 天然气组分
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateNgComponents(NgComponents ngComponents);
|
||||
|
||||
/**
|
||||
* 删除天然气组分
|
||||
*
|
||||
* @param id 天然气组分主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteNgComponentsById(String id);
|
||||
|
||||
/**
|
||||
* 批量删除天然气组分
|
||||
*
|
||||
* @param ids 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteNgComponentsByIds(String[] ids);
|
||||
}
|
||||
@ -1,61 +0,0 @@
|
||||
package com.ruoyi.system.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.system.domain.NgMeterpar;
|
||||
|
||||
/**
|
||||
* 流量计参数Mapper接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-03-21
|
||||
*/
|
||||
public interface NgMeterparMapper
|
||||
{
|
||||
/**
|
||||
* 查询流量计参数
|
||||
*
|
||||
* @param id 流量计参数主键
|
||||
* @return 流量计参数
|
||||
*/
|
||||
public NgMeterpar selectNgMeterparById(String id);
|
||||
|
||||
/**
|
||||
* 查询流量计参数列表
|
||||
*
|
||||
* @param ngMeterpar 流量计参数
|
||||
* @return 流量计参数集合
|
||||
*/
|
||||
public List<NgMeterpar> selectNgMeterparList(NgMeterpar ngMeterpar);
|
||||
|
||||
/**
|
||||
* 新增流量计参数
|
||||
*
|
||||
* @param ngMeterpar 流量计参数
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertNgMeterpar(NgMeterpar ngMeterpar);
|
||||
|
||||
/**
|
||||
* 修改流量计参数
|
||||
*
|
||||
* @param ngMeterpar 流量计参数
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateNgMeterpar(NgMeterpar ngMeterpar);
|
||||
|
||||
/**
|
||||
* 删除流量计参数
|
||||
*
|
||||
* @param id 流量计参数主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteNgMeterparById(String id);
|
||||
|
||||
/**
|
||||
* 批量删除流量计参数
|
||||
*
|
||||
* @param ids 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteNgMeterparByIds(String[] ids);
|
||||
}
|
||||
@ -1,61 +0,0 @@
|
||||
package com.ruoyi.system.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.system.domain.NgMeterresult;
|
||||
|
||||
/**
|
||||
* 流量计算结果Mapper接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-03-21
|
||||
*/
|
||||
public interface NgMeterresultMapper
|
||||
{
|
||||
/**
|
||||
* 查询流量计算结果
|
||||
*
|
||||
* @param id 流量计算结果主键
|
||||
* @return 流量计算结果
|
||||
*/
|
||||
public NgMeterresult selectNgMeterresultById(String id);
|
||||
|
||||
/**
|
||||
* 查询流量计算结果列表
|
||||
*
|
||||
* @param ngMeterresult 流量计算结果
|
||||
* @return 流量计算结果集合
|
||||
*/
|
||||
public List<NgMeterresult> selectNgMeterresultList(NgMeterresult ngMeterresult);
|
||||
|
||||
/**
|
||||
* 新增流量计算结果
|
||||
*
|
||||
* @param ngMeterresult 流量计算结果
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertNgMeterresult(NgMeterresult ngMeterresult);
|
||||
|
||||
/**
|
||||
* 修改流量计算结果
|
||||
*
|
||||
* @param ngMeterresult 流量计算结果
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateNgMeterresult(NgMeterresult ngMeterresult);
|
||||
|
||||
/**
|
||||
* 删除流量计算结果
|
||||
*
|
||||
* @param id 流量计算结果主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteNgMeterresultById(String id);
|
||||
|
||||
/**
|
||||
* 批量删除流量计算结果
|
||||
*
|
||||
* @param ids 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteNgMeterresultByIds(String[] ids);
|
||||
}
|
||||
@ -1,61 +0,0 @@
|
||||
package com.ruoyi.system.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.system.domain.NgNgpar;
|
||||
|
||||
/**
|
||||
* 天然气物性参数Mapper接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-03-21
|
||||
*/
|
||||
public interface NgNgparMapper
|
||||
{
|
||||
/**
|
||||
* 查询天然气物性参数
|
||||
*
|
||||
* @param id 天然气物性参数主键
|
||||
* @return 天然气物性参数
|
||||
*/
|
||||
public NgNgpar selectNgNgparById(String id);
|
||||
|
||||
/**
|
||||
* 查询天然气物性参数列表
|
||||
*
|
||||
* @param ngNgpar 天然气物性参数
|
||||
* @return 天然气物性参数集合
|
||||
*/
|
||||
public List<NgNgpar> selectNgNgparList(NgNgpar ngNgpar);
|
||||
|
||||
/**
|
||||
* 新增天然气物性参数
|
||||
*
|
||||
* @param ngNgpar 天然气物性参数
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertNgNgpar(NgNgpar ngNgpar);
|
||||
|
||||
/**
|
||||
* 修改天然气物性参数
|
||||
*
|
||||
* @param ngNgpar 天然气物性参数
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateNgNgpar(NgNgpar ngNgpar);
|
||||
|
||||
/**
|
||||
* 删除天然气物性参数
|
||||
*
|
||||
* @param id 天然气物性参数主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteNgNgparById(String id);
|
||||
|
||||
/**
|
||||
* 批量删除天然气物性参数
|
||||
*
|
||||
* @param ids 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteNgNgparByIds(String[] ids);
|
||||
}
|
||||
@ -1,61 +0,0 @@
|
||||
package com.ruoyi.system.service;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.system.domain.NgComponents;
|
||||
|
||||
/**
|
||||
* 天然气组分Service接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-03-21
|
||||
*/
|
||||
public interface INgComponentsService
|
||||
{
|
||||
/**
|
||||
* 查询天然气组分
|
||||
*
|
||||
* @param id 天然气组分主键
|
||||
* @return 天然气组分
|
||||
*/
|
||||
public NgComponents selectNgComponentsById(String id);
|
||||
|
||||
/**
|
||||
* 查询天然气组分列表
|
||||
*
|
||||
* @param ngComponents 天然气组分
|
||||
* @return 天然气组分集合
|
||||
*/
|
||||
public List<NgComponents> selectNgComponentsList(NgComponents ngComponents);
|
||||
|
||||
/**
|
||||
* 新增天然气组分
|
||||
*
|
||||
* @param ngComponents 天然气组分
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertNgComponents(NgComponents ngComponents);
|
||||
|
||||
/**
|
||||
* 修改天然气组分
|
||||
*
|
||||
* @param ngComponents 天然气组分
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateNgComponents(NgComponents ngComponents);
|
||||
|
||||
/**
|
||||
* 批量删除天然气组分
|
||||
*
|
||||
* @param ids 需要删除的天然气组分主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteNgComponentsByIds(String[] ids);
|
||||
|
||||
/**
|
||||
* 删除天然气组分信息
|
||||
*
|
||||
* @param id 天然气组分主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteNgComponentsById(String id);
|
||||
}
|
||||
@ -1,61 +0,0 @@
|
||||
package com.ruoyi.system.service;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.system.domain.NgMeterpar;
|
||||
|
||||
/**
|
||||
* 流量计参数Service接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-03-21
|
||||
*/
|
||||
public interface INgMeterparService
|
||||
{
|
||||
/**
|
||||
* 查询流量计参数
|
||||
*
|
||||
* @param id 流量计参数主键
|
||||
* @return 流量计参数
|
||||
*/
|
||||
public NgMeterpar selectNgMeterparById(String id);
|
||||
|
||||
/**
|
||||
* 查询流量计参数列表
|
||||
*
|
||||
* @param ngMeterpar 流量计参数
|
||||
* @return 流量计参数集合
|
||||
*/
|
||||
public List<NgMeterpar> selectNgMeterparList(NgMeterpar ngMeterpar);
|
||||
|
||||
/**
|
||||
* 新增流量计参数
|
||||
*
|
||||
* @param ngMeterpar 流量计参数
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertNgMeterpar(NgMeterpar ngMeterpar);
|
||||
|
||||
/**
|
||||
* 修改流量计参数
|
||||
*
|
||||
* @param ngMeterpar 流量计参数
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateNgMeterpar(NgMeterpar ngMeterpar);
|
||||
|
||||
/**
|
||||
* 批量删除流量计参数
|
||||
*
|
||||
* @param ids 需要删除的流量计参数主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteNgMeterparByIds(String[] ids);
|
||||
|
||||
/**
|
||||
* 删除流量计参数信息
|
||||
*
|
||||
* @param id 流量计参数主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteNgMeterparById(String id);
|
||||
}
|
||||
@ -1,61 +0,0 @@
|
||||
package com.ruoyi.system.service;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.system.domain.NgMeterresult;
|
||||
|
||||
/**
|
||||
* 流量计算结果Service接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-03-21
|
||||
*/
|
||||
public interface INgMeterresultService
|
||||
{
|
||||
/**
|
||||
* 查询流量计算结果
|
||||
*
|
||||
* @param id 流量计算结果主键
|
||||
* @return 流量计算结果
|
||||
*/
|
||||
public NgMeterresult selectNgMeterresultById(String id);
|
||||
|
||||
/**
|
||||
* 查询流量计算结果列表
|
||||
*
|
||||
* @param ngMeterresult 流量计算结果
|
||||
* @return 流量计算结果集合
|
||||
*/
|
||||
public List<NgMeterresult> selectNgMeterresultList(NgMeterresult ngMeterresult);
|
||||
|
||||
/**
|
||||
* 新增流量计算结果
|
||||
*
|
||||
* @param ngMeterresult 流量计算结果
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertNgMeterresult(NgMeterresult ngMeterresult);
|
||||
|
||||
/**
|
||||
* 修改流量计算结果
|
||||
*
|
||||
* @param ngMeterresult 流量计算结果
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateNgMeterresult(NgMeterresult ngMeterresult);
|
||||
|
||||
/**
|
||||
* 批量删除流量计算结果
|
||||
*
|
||||
* @param ids 需要删除的流量计算结果主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteNgMeterresultByIds(String[] ids);
|
||||
|
||||
/**
|
||||
* 删除流量计算结果信息
|
||||
*
|
||||
* @param id 流量计算结果主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteNgMeterresultById(String id);
|
||||
}
|
||||
@ -1,61 +0,0 @@
|
||||
package com.ruoyi.system.service;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.system.domain.NgNgpar;
|
||||
|
||||
/**
|
||||
* 天然气物性参数Service接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-03-21
|
||||
*/
|
||||
public interface INgNgparService
|
||||
{
|
||||
/**
|
||||
* 查询天然气物性参数
|
||||
*
|
||||
* @param id 天然气物性参数主键
|
||||
* @return 天然气物性参数
|
||||
*/
|
||||
public NgNgpar selectNgNgparById(String id);
|
||||
|
||||
/**
|
||||
* 查询天然气物性参数列表
|
||||
*
|
||||
* @param ngNgpar 天然气物性参数
|
||||
* @return 天然气物性参数集合
|
||||
*/
|
||||
public List<NgNgpar> selectNgNgparList(NgNgpar ngNgpar);
|
||||
|
||||
/**
|
||||
* 新增天然气物性参数
|
||||
*
|
||||
* @param ngNgpar 天然气物性参数
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertNgNgpar(NgNgpar ngNgpar);
|
||||
|
||||
/**
|
||||
* 修改天然气物性参数
|
||||
*
|
||||
* @param ngNgpar 天然气物性参数
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateNgNgpar(NgNgpar ngNgpar);
|
||||
|
||||
/**
|
||||
* 批量删除天然气物性参数
|
||||
*
|
||||
* @param ids 需要删除的天然气物性参数主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteNgNgparByIds(String[] ids);
|
||||
|
||||
/**
|
||||
* 删除天然气物性参数信息
|
||||
*
|
||||
* @param id 天然气物性参数主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteNgNgparById(String id);
|
||||
}
|
||||
@ -1,96 +0,0 @@
|
||||
package com.ruoyi.system.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.common.utils.DateUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.ruoyi.system.mapper.NgComponentsMapper;
|
||||
import com.ruoyi.system.domain.NgComponents;
|
||||
import com.ruoyi.system.service.INgComponentsService;
|
||||
|
||||
/**
|
||||
* 天然气组分Service业务层处理
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-03-21
|
||||
*/
|
||||
@Service
|
||||
public class NgComponentsServiceImpl implements INgComponentsService
|
||||
{
|
||||
@Autowired
|
||||
private NgComponentsMapper ngComponentsMapper;
|
||||
|
||||
/**
|
||||
* 查询天然气组分
|
||||
*
|
||||
* @param id 天然气组分主键
|
||||
* @return 天然气组分
|
||||
*/
|
||||
@Override
|
||||
public NgComponents selectNgComponentsById(String id)
|
||||
{
|
||||
return ngComponentsMapper.selectNgComponentsById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询天然气组分列表
|
||||
*
|
||||
* @param ngComponents 天然气组分
|
||||
* @return 天然气组分
|
||||
*/
|
||||
@Override
|
||||
public List<NgComponents> selectNgComponentsList(NgComponents ngComponents)
|
||||
{
|
||||
return ngComponentsMapper.selectNgComponentsList(ngComponents);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增天然气组分
|
||||
*
|
||||
* @param ngComponents 天然气组分
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertNgComponents(NgComponents ngComponents)
|
||||
{
|
||||
ngComponents.setCreateTime(DateUtils.getNowDate());
|
||||
return ngComponentsMapper.insertNgComponents(ngComponents);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改天然气组分
|
||||
*
|
||||
* @param ngComponents 天然气组分
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updateNgComponents(NgComponents ngComponents)
|
||||
{
|
||||
ngComponents.setUpdateTime(DateUtils.getNowDate());
|
||||
return ngComponentsMapper.updateNgComponents(ngComponents);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除天然气组分
|
||||
*
|
||||
* @param ids 需要删除的天然气组分主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteNgComponentsByIds(String[] ids)
|
||||
{
|
||||
return ngComponentsMapper.deleteNgComponentsByIds(ids);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除天然气组分信息
|
||||
*
|
||||
* @param id 天然气组分主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteNgComponentsById(String id)
|
||||
{
|
||||
return ngComponentsMapper.deleteNgComponentsById(id);
|
||||
}
|
||||
}
|
||||
@ -1,96 +0,0 @@
|
||||
package com.ruoyi.system.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.common.utils.DateUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.ruoyi.system.mapper.NgMeterparMapper;
|
||||
import com.ruoyi.system.domain.NgMeterpar;
|
||||
import com.ruoyi.system.service.INgMeterparService;
|
||||
|
||||
/**
|
||||
* 流量计参数Service业务层处理
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-03-21
|
||||
*/
|
||||
@Service
|
||||
public class NgMeterparServiceImpl implements INgMeterparService
|
||||
{
|
||||
@Autowired
|
||||
private NgMeterparMapper ngMeterparMapper;
|
||||
|
||||
/**
|
||||
* 查询流量计参数
|
||||
*
|
||||
* @param id 流量计参数主键
|
||||
* @return 流量计参数
|
||||
*/
|
||||
@Override
|
||||
public NgMeterpar selectNgMeterparById(String id)
|
||||
{
|
||||
return ngMeterparMapper.selectNgMeterparById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询流量计参数列表
|
||||
*
|
||||
* @param ngMeterpar 流量计参数
|
||||
* @return 流量计参数
|
||||
*/
|
||||
@Override
|
||||
public List<NgMeterpar> selectNgMeterparList(NgMeterpar ngMeterpar)
|
||||
{
|
||||
return ngMeterparMapper.selectNgMeterparList(ngMeterpar);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增流量计参数
|
||||
*
|
||||
* @param ngMeterpar 流量计参数
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertNgMeterpar(NgMeterpar ngMeterpar)
|
||||
{
|
||||
ngMeterpar.setCreateTime(DateUtils.getNowDate());
|
||||
return ngMeterparMapper.insertNgMeterpar(ngMeterpar);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改流量计参数
|
||||
*
|
||||
* @param ngMeterpar 流量计参数
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updateNgMeterpar(NgMeterpar ngMeterpar)
|
||||
{
|
||||
ngMeterpar.setUpdateTime(DateUtils.getNowDate());
|
||||
return ngMeterparMapper.updateNgMeterpar(ngMeterpar);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除流量计参数
|
||||
*
|
||||
* @param ids 需要删除的流量计参数主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteNgMeterparByIds(String[] ids)
|
||||
{
|
||||
return ngMeterparMapper.deleteNgMeterparByIds(ids);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除流量计参数信息
|
||||
*
|
||||
* @param id 流量计参数主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteNgMeterparById(String id)
|
||||
{
|
||||
return ngMeterparMapper.deleteNgMeterparById(id);
|
||||
}
|
||||
}
|
||||
@ -1,96 +0,0 @@
|
||||
package com.ruoyi.system.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.common.utils.DateUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.ruoyi.system.mapper.NgMeterresultMapper;
|
||||
import com.ruoyi.system.domain.NgMeterresult;
|
||||
import com.ruoyi.system.service.INgMeterresultService;
|
||||
|
||||
/**
|
||||
* 流量计算结果Service业务层处理
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-03-21
|
||||
*/
|
||||
@Service
|
||||
public class NgMeterresultServiceImpl implements INgMeterresultService
|
||||
{
|
||||
@Autowired
|
||||
private NgMeterresultMapper ngMeterresultMapper;
|
||||
|
||||
/**
|
||||
* 查询流量计算结果
|
||||
*
|
||||
* @param id 流量计算结果主键
|
||||
* @return 流量计算结果
|
||||
*/
|
||||
@Override
|
||||
public NgMeterresult selectNgMeterresultById(String id)
|
||||
{
|
||||
return ngMeterresultMapper.selectNgMeterresultById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询流量计算结果列表
|
||||
*
|
||||
* @param ngMeterresult 流量计算结果
|
||||
* @return 流量计算结果
|
||||
*/
|
||||
@Override
|
||||
public List<NgMeterresult> selectNgMeterresultList(NgMeterresult ngMeterresult)
|
||||
{
|
||||
return ngMeterresultMapper.selectNgMeterresultList(ngMeterresult);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增流量计算结果
|
||||
*
|
||||
* @param ngMeterresult 流量计算结果
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertNgMeterresult(NgMeterresult ngMeterresult)
|
||||
{
|
||||
ngMeterresult.setCreateTime(DateUtils.getNowDate());
|
||||
return ngMeterresultMapper.insertNgMeterresult(ngMeterresult);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改流量计算结果
|
||||
*
|
||||
* @param ngMeterresult 流量计算结果
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updateNgMeterresult(NgMeterresult ngMeterresult)
|
||||
{
|
||||
ngMeterresult.setUpdateTime(DateUtils.getNowDate());
|
||||
return ngMeterresultMapper.updateNgMeterresult(ngMeterresult);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除流量计算结果
|
||||
*
|
||||
* @param ids 需要删除的流量计算结果主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteNgMeterresultByIds(String[] ids)
|
||||
{
|
||||
return ngMeterresultMapper.deleteNgMeterresultByIds(ids);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除流量计算结果信息
|
||||
*
|
||||
* @param id 流量计算结果主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteNgMeterresultById(String id)
|
||||
{
|
||||
return ngMeterresultMapper.deleteNgMeterresultById(id);
|
||||
}
|
||||
}
|
||||
@ -1,96 +0,0 @@
|
||||
package com.ruoyi.system.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.common.utils.DateUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.ruoyi.system.mapper.NgNgparMapper;
|
||||
import com.ruoyi.system.domain.NgNgpar;
|
||||
import com.ruoyi.system.service.INgNgparService;
|
||||
|
||||
/**
|
||||
* 天然气物性参数Service业务层处理
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-03-21
|
||||
*/
|
||||
@Service
|
||||
public class NgNgparServiceImpl implements INgNgparService
|
||||
{
|
||||
@Autowired
|
||||
private NgNgparMapper ngNgparMapper;
|
||||
|
||||
/**
|
||||
* 查询天然气物性参数
|
||||
*
|
||||
* @param id 天然气物性参数主键
|
||||
* @return 天然气物性参数
|
||||
*/
|
||||
@Override
|
||||
public NgNgpar selectNgNgparById(String id)
|
||||
{
|
||||
return ngNgparMapper.selectNgNgparById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询天然气物性参数列表
|
||||
*
|
||||
* @param ngNgpar 天然气物性参数
|
||||
* @return 天然气物性参数
|
||||
*/
|
||||
@Override
|
||||
public List<NgNgpar> selectNgNgparList(NgNgpar ngNgpar)
|
||||
{
|
||||
return ngNgparMapper.selectNgNgparList(ngNgpar);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增天然气物性参数
|
||||
*
|
||||
* @param ngNgpar 天然气物性参数
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertNgNgpar(NgNgpar ngNgpar)
|
||||
{
|
||||
ngNgpar.setCreateTime(DateUtils.getNowDate());
|
||||
return ngNgparMapper.insertNgNgpar(ngNgpar);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改天然气物性参数
|
||||
*
|
||||
* @param ngNgpar 天然气物性参数
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updateNgNgpar(NgNgpar ngNgpar)
|
||||
{
|
||||
ngNgpar.setUpdateTime(DateUtils.getNowDate());
|
||||
return ngNgparMapper.updateNgNgpar(ngNgpar);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除天然气物性参数
|
||||
*
|
||||
* @param ids 需要删除的天然气物性参数主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteNgNgparByIds(String[] ids)
|
||||
{
|
||||
return ngNgparMapper.deleteNgNgparByIds(ids);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除天然气物性参数信息
|
||||
*
|
||||
* @param id 天然气物性参数主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteNgNgparById(String id)
|
||||
{
|
||||
return ngNgparMapper.deleteNgNgparById(id);
|
||||
}
|
||||
}
|
||||
@ -27,7 +27,7 @@ import io.swagger.v3.oas.annotations.Operation;
|
||||
* 单位转换Controller
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-03-20
|
||||
* @date 2025-03-22
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/system/SysUnitConvert")
|
||||
|
||||
@ -11,7 +11,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
|
||||
* 单位转换对象 sys_unit_convert
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-03-20
|
||||
* @date 2025-03-22
|
||||
*/
|
||||
@Schema(description = "单位转换对象")
|
||||
public class SysUnitConvert extends BaseEntity
|
||||
@ -19,8 +19,8 @@ public class SysUnitConvert extends BaseEntity
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
|
||||
/** $column.columnComment */
|
||||
@Schema(title = "$column.columnComment")
|
||||
/** 序号 */
|
||||
@Schema(title = "序号")
|
||||
private Long id;
|
||||
|
||||
/** 单位类型 */
|
||||
|
||||
@ -7,7 +7,7 @@ import com.ruoyi.system.domain.SysUnitConvert;
|
||||
* 单位转换Mapper接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-03-20
|
||||
* @date 2025-03-22
|
||||
*/
|
||||
public interface SysUnitConvertMapper
|
||||
{
|
||||
@ -50,15 +50,6 @@ public interface SysUnitConvertMapper
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteSysUnitConvertById(Long id);
|
||||
|
||||
/**
|
||||
* 批量删除单位转换
|
||||
*
|
||||
* @param ids 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteSysUnitConvertByIds(Long[] ids);
|
||||
|
||||
/**
|
||||
* 查询单位换算
|
||||
*
|
||||
@ -68,7 +59,11 @@ public interface SysUnitConvertMapper
|
||||
public SysUnitConvert selectSysUnitConvertUnitByTypeOrder(SysUnitConvert sysUnitConvert);
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 批量删除单位转换
|
||||
*
|
||||
* @param ids 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteSysUnitConvertByIds(Long[] ids);
|
||||
}
|
||||
|
||||
@ -7,7 +7,7 @@ import com.ruoyi.system.domain.SysUnitConvert;
|
||||
* 单位转换Service接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-03-20
|
||||
* @date 2025-03-22
|
||||
*/
|
||||
public interface ISysUnitConvertService
|
||||
{
|
||||
@ -34,6 +34,8 @@ public interface ISysUnitConvertService
|
||||
*/
|
||||
public SysUnitConvert selectSysUnitConvertUnitByTypeOrder(SysUnitConvert sysUnitConvert);
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 新增单位转换
|
||||
*
|
||||
|
||||
@ -11,17 +11,17 @@ import com.ruoyi.system.service.ISysUnitConvertService;
|
||||
* 单位转换Service业务层处理
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-03-20
|
||||
* @date 2025-03-21
|
||||
*/
|
||||
@Service
|
||||
public class SysUnitConvertServiceImpl implements ISysUnitConvertService
|
||||
public class SysUnitConvertServiceImpl implements ISysUnitConvertService
|
||||
{
|
||||
@Autowired
|
||||
private SysUnitConvertMapper sysUnitConvertMapper;
|
||||
|
||||
/**
|
||||
* 查询单位转换
|
||||
*
|
||||
*
|
||||
* @param id 单位转换主键
|
||||
* @return 单位转换
|
||||
*/
|
||||
@ -31,18 +31,6 @@ public class SysUnitConvertServiceImpl implements ISysUnitConvertService
|
||||
return sysUnitConvertMapper.selectSysUnitConvertById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询单位转换列表
|
||||
*
|
||||
* @param sysUnitConvert 单位转换
|
||||
* @return 单位转换
|
||||
*/
|
||||
@Override
|
||||
public List<SysUnitConvert> selectSysUnitConvertList(SysUnitConvert sysUnitConvert)
|
||||
{
|
||||
return sysUnitConvertMapper.selectSysUnitConvertList(sysUnitConvert);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询单位换算
|
||||
*
|
||||
@ -55,9 +43,21 @@ public class SysUnitConvertServiceImpl implements ISysUnitConvertService
|
||||
return sysUnitConvertMapper.selectSysUnitConvertUnitByTypeOrder(sysUnitConvert);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询单位转换列表
|
||||
*
|
||||
* @param sysUnitConvert 单位转换
|
||||
* @return 单位转换
|
||||
*/
|
||||
@Override
|
||||
public List<SysUnitConvert> selectSysUnitConvertList(SysUnitConvert sysUnitConvert)
|
||||
{
|
||||
return sysUnitConvertMapper.selectSysUnitConvertList(sysUnitConvert);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增单位转换
|
||||
*
|
||||
*
|
||||
* @param sysUnitConvert 单位转换
|
||||
* @return 结果
|
||||
*/
|
||||
@ -69,7 +69,7 @@ public class SysUnitConvertServiceImpl implements ISysUnitConvertService
|
||||
|
||||
/**
|
||||
* 修改单位转换
|
||||
*
|
||||
*
|
||||
* @param sysUnitConvert 单位转换
|
||||
* @return 结果
|
||||
*/
|
||||
@ -81,7 +81,7 @@ public class SysUnitConvertServiceImpl implements ISysUnitConvertService
|
||||
|
||||
/**
|
||||
* 批量删除单位转换
|
||||
*
|
||||
*
|
||||
* @param ids 需要删除的单位转换主键
|
||||
* @return 结果
|
||||
*/
|
||||
@ -93,7 +93,7 @@ public class SysUnitConvertServiceImpl implements ISysUnitConvertService
|
||||
|
||||
/**
|
||||
* 删除单位转换信息
|
||||
*
|
||||
*
|
||||
* @param id 单位转换主键
|
||||
* @return 结果
|
||||
*/
|
||||
@ -102,4 +102,9 @@ public class SysUnitConvertServiceImpl implements ISysUnitConvertService
|
||||
{
|
||||
return sysUnitConvertMapper.deleteSysUnitConvertById(id);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -41,28 +41,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<include refid="selectSysUnitConvertVo"/>
|
||||
where suc.id = #{id}
|
||||
</select>
|
||||
|
||||
<insert id="insertSysUnitConvert" parameterType="SysUnitConvert" useGeneratedKeys="true" keyProperty="id">
|
||||
insert into sys_unit_convert
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="unitType != null and unitType != ''">unit_type,</if>
|
||||
<if test="unitName != null and unitName != ''">unit_name,</if>
|
||||
<if test="baseUnit != null">base_unit,</if>
|
||||
<if test="conversionFactor != null">conversion_factor,</if>
|
||||
<if test="unitTypeName != null and unitTypeName != ''">unit_type_name,</if>
|
||||
<if test="status != null">status,</if>
|
||||
<if test="unitOrder != null">unit_order,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="unitType != null and unitType != ''">#{unitType},</if>
|
||||
<if test="unitName != null and unitName != ''">#{unitName},</if>
|
||||
<if test="baseUnit != null">#{baseUnit},</if>
|
||||
<if test="conversionFactor != null">#{conversionFactor},</if>
|
||||
<if test="unitTypeName != null and unitTypeName != ''">#{unitTypeName},</if>
|
||||
<if test="status != null">#{status},</if>
|
||||
<if test="unitOrder != null">#{unitOrder},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
<select id="selectSysUnitConvertUnitByTypeOrder" parameterType="SysUnitConvert"
|
||||
resultMap="SysUnitConvertResult">
|
||||
<!-- 这里编写具体的 SQL 查询语句 -->
|
||||
@ -74,12 +52,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
|
||||
</where>
|
||||
</select>
|
||||
<insert id="insertSysUnitConvert" parameterType="SysUnitConvert" useGeneratedKeys="true" keyProperty="id">
|
||||
insert into sys_unit_convert
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="unitType != null and unitType != ''">unit_type,</if>
|
||||
<if test="unitName != null and unitName != ''">unit_name,</if>
|
||||
<if test="baseUnit != null and baseUnit != ''">base_unit,</if>
|
||||
<if test="conversionFactor != null">conversion_factor,</if>
|
||||
<if test="unitTypeName != null and unitTypeName != ''">unit_type_name,</if>
|
||||
<if test="status != null">status,</if>
|
||||
<if test="unitOrder != null">unit_order,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="unitType != null and unitType != ''">#{unitType},</if>
|
||||
<if test="unitName != null and unitName != ''">#{unitName},</if>
|
||||
<if test="baseUnit != null and baseUnit != ''">#{baseUnit},</if>
|
||||
<if test="conversionFactor != null">#{conversionFactor},</if>
|
||||
<if test="unitTypeName != null and unitTypeName != ''">#{unitTypeName},</if>
|
||||
<if test="status != null">#{status},</if>
|
||||
<if test="unitOrder != null">#{unitOrder},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateSysUnitConvert" parameterType="SysUnitConvert">
|
||||
update sys_unit_convert
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="unitType != null and unitType != ''">unit_type = #{unitType},</if>
|
||||
<if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
|
||||
<if test="baseUnit != null">base_unit = #{baseUnit},</if>
|
||||
<if test="baseUnit != null and baseUnit != ''">base_unit = #{baseUnit},</if>
|
||||
<if test="conversionFactor != null">conversion_factor = #{conversionFactor},</if>
|
||||
<if test="unitTypeName != null and unitTypeName != ''">unit_type_name = #{unitTypeName},</if>
|
||||
<if test="status != null">status = #{status},</if>
|
||||
|
||||
@ -1,22 +1,22 @@
|
||||
-- 菜单 SQL
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('天然气组分', '2053', '1', 'components', 'system/components/index', 1, 0, 'C', '0', '0', 'system:components:list', '#', 'admin', sysdate(), '', null, '天然气组分菜单');
|
||||
values('天然气组分', '2053', '1', 'components', 'ngtools/components/index', 1, 0, 'C', '0', '0', 'ngtools:components:list', '#', 'admin', sysdate(), '', null, '天然气组分菜单');
|
||||
|
||||
-- 按钮父菜单ID
|
||||
SELECT @parentId := LAST_INSERT_ID();
|
||||
|
||||
-- 按钮 SQL
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('天然气组分查询', @parentId, '1', '#', '', 1, 0, 'F', '0', '0', 'system:components:query', '#', 'admin', sysdate(), '', null, '');
|
||||
values('天然气组分查询', @parentId, '1', '#', '', 1, 0, 'F', '0', '0', 'ngtools:components:query', '#', 'admin', sysdate(), '', null, '');
|
||||
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('天然气组分新增', @parentId, '2', '#', '', 1, 0, 'F', '0', '0', 'system:components:add', '#', 'admin', sysdate(), '', null, '');
|
||||
values('天然气组分新增', @parentId, '2', '#', '', 1, 0, 'F', '0', '0', 'ngtools:components:add', '#', 'admin', sysdate(), '', null, '');
|
||||
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('天然气组分修改', @parentId, '3', '#', '', 1, 0, 'F', '0', '0', 'system:components:edit', '#', 'admin', sysdate(), '', null, '');
|
||||
values('天然气组分修改', @parentId, '3', '#', '', 1, 0, 'F', '0', '0', 'ngtools:components:edit', '#', 'admin', sysdate(), '', null, '');
|
||||
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('天然气组分删除', @parentId, '4', '#', '', 1, 0, 'F', '0', '0', 'system:components:remove', '#', 'admin', sysdate(), '', null, '');
|
||||
values('天然气组分删除', @parentId, '4', '#', '', 1, 0, 'F', '0', '0', 'ngtools:components:remove', '#', 'admin', sysdate(), '', null, '');
|
||||
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('天然气组分导出', @parentId, '5', '#', '', 1, 0, 'F', '0', '0', 'system:components:export', '#', 'admin', sysdate(), '', null, '');
|
||||
values('天然气组分导出', @parentId, '5', '#', '', 1, 0, 'F', '0', '0', 'ngtools:components:export', '#', 'admin', sysdate(), '', null, '');
|
||||
@ -1,22 +1,22 @@
|
||||
-- 菜单 SQL
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('流量计参数', '2053', '1', 'meterpar', 'system/meterpar/index', 1, 0, 'C', '0', '0', 'system:meterpar:list', '#', 'admin', sysdate(), '', null, '流量计参数菜单');
|
||||
values('流量计参数', '2053', '1', 'meterpar', 'ngtools/meterpar/index', 1, 0, 'C', '0', '0', 'ngtools:meterpar:list', '#', 'admin', sysdate(), '', null, '流量计参数菜单');
|
||||
|
||||
-- 按钮父菜单ID
|
||||
SELECT @parentId := LAST_INSERT_ID();
|
||||
|
||||
-- 按钮 SQL
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('流量计参数查询', @parentId, '1', '#', '', 1, 0, 'F', '0', '0', 'system:meterpar:query', '#', 'admin', sysdate(), '', null, '');
|
||||
values('流量计参数查询', @parentId, '1', '#', '', 1, 0, 'F', '0', '0', 'ngtools:meterpar:query', '#', 'admin', sysdate(), '', null, '');
|
||||
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('流量计参数新增', @parentId, '2', '#', '', 1, 0, 'F', '0', '0', 'system:meterpar:add', '#', 'admin', sysdate(), '', null, '');
|
||||
values('流量计参数新增', @parentId, '2', '#', '', 1, 0, 'F', '0', '0', 'ngtools:meterpar:add', '#', 'admin', sysdate(), '', null, '');
|
||||
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('流量计参数修改', @parentId, '3', '#', '', 1, 0, 'F', '0', '0', 'system:meterpar:edit', '#', 'admin', sysdate(), '', null, '');
|
||||
values('流量计参数修改', @parentId, '3', '#', '', 1, 0, 'F', '0', '0', 'ngtools:meterpar:edit', '#', 'admin', sysdate(), '', null, '');
|
||||
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('流量计参数删除', @parentId, '4', '#', '', 1, 0, 'F', '0', '0', 'system:meterpar:remove', '#', 'admin', sysdate(), '', null, '');
|
||||
values('流量计参数删除', @parentId, '4', '#', '', 1, 0, 'F', '0', '0', 'ngtools:meterpar:remove', '#', 'admin', sysdate(), '', null, '');
|
||||
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('流量计参数导出', @parentId, '5', '#', '', 1, 0, 'F', '0', '0', 'system:meterpar:export', '#', 'admin', sysdate(), '', null, '');
|
||||
values('流量计参数导出', @parentId, '5', '#', '', 1, 0, 'F', '0', '0', 'ngtools:meterpar:export', '#', 'admin', sysdate(), '', null, '');
|
||||
@ -1,22 +1,22 @@
|
||||
-- 菜单 SQL
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('流量计算结果', '2053', '1', 'meterresult', 'system/meterresult/index', 1, 0, 'C', '0', '0', 'system:meterresult:list', '#', 'admin', sysdate(), '', null, '流量计算结果菜单');
|
||||
values('流量计算结果', '2053', '1', 'meterresult', 'ngtools/meterresult/index', 1, 0, 'C', '0', '0', 'ngtools:meterresult:list', '#', 'admin', sysdate(), '', null, '流量计算结果菜单');
|
||||
|
||||
-- 按钮父菜单ID
|
||||
SELECT @parentId := LAST_INSERT_ID();
|
||||
|
||||
-- 按钮 SQL
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('流量计算结果查询', @parentId, '1', '#', '', 1, 0, 'F', '0', '0', 'system:meterresult:query', '#', 'admin', sysdate(), '', null, '');
|
||||
values('流量计算结果查询', @parentId, '1', '#', '', 1, 0, 'F', '0', '0', 'ngtools:meterresult:query', '#', 'admin', sysdate(), '', null, '');
|
||||
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('流量计算结果新增', @parentId, '2', '#', '', 1, 0, 'F', '0', '0', 'system:meterresult:add', '#', 'admin', sysdate(), '', null, '');
|
||||
values('流量计算结果新增', @parentId, '2', '#', '', 1, 0, 'F', '0', '0', 'ngtools:meterresult:add', '#', 'admin', sysdate(), '', null, '');
|
||||
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('流量计算结果修改', @parentId, '3', '#', '', 1, 0, 'F', '0', '0', 'system:meterresult:edit', '#', 'admin', sysdate(), '', null, '');
|
||||
values('流量计算结果修改', @parentId, '3', '#', '', 1, 0, 'F', '0', '0', 'ngtools:meterresult:edit', '#', 'admin', sysdate(), '', null, '');
|
||||
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('流量计算结果删除', @parentId, '4', '#', '', 1, 0, 'F', '0', '0', 'system:meterresult:remove', '#', 'admin', sysdate(), '', null, '');
|
||||
values('流量计算结果删除', @parentId, '4', '#', '', 1, 0, 'F', '0', '0', 'ngtools:meterresult:remove', '#', 'admin', sysdate(), '', null, '');
|
||||
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('流量计算结果导出', @parentId, '5', '#', '', 1, 0, 'F', '0', '0', 'system:meterresult:export', '#', 'admin', sysdate(), '', null, '');
|
||||
values('流量计算结果导出', @parentId, '5', '#', '', 1, 0, 'F', '0', '0', 'ngtools:meterresult:export', '#', 'admin', sysdate(), '', null, '');
|
||||
22
sql/musicFilesMenu.sql
Normal file
22
sql/musicFilesMenu.sql
Normal file
@ -0,0 +1,22 @@
|
||||
-- 菜单 SQL
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('musiclist', '2125', '1', 'musicFiles', 'music/musicFiles/index', 1, 0, 'C', '0', '0', 'music:musicFiles:list', '#', 'admin', sysdate(), '', null, 'musiclist菜单');
|
||||
|
||||
-- 按钮父菜单ID
|
||||
SELECT @parentId := LAST_INSERT_ID();
|
||||
|
||||
-- 按钮 SQL
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('musiclist查询', @parentId, '1', '#', '', 1, 0, 'F', '0', '0', 'music:musicFiles:query', '#', 'admin', sysdate(), '', null, '');
|
||||
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('musiclist新增', @parentId, '2', '#', '', 1, 0, 'F', '0', '0', 'music:musicFiles:add', '#', 'admin', sysdate(), '', null, '');
|
||||
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('musiclist修改', @parentId, '3', '#', '', 1, 0, 'F', '0', '0', 'music:musicFiles:edit', '#', 'admin', sysdate(), '', null, '');
|
||||
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('musiclist删除', @parentId, '4', '#', '', 1, 0, 'F', '0', '0', 'music:musicFiles:remove', '#', 'admin', sysdate(), '', null, '');
|
||||
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('musiclist导出', @parentId, '5', '#', '', 1, 0, 'F', '0', '0', 'music:musicFiles:export', '#', 'admin', sysdate(), '', null, '');
|
||||
@ -1,22 +1,22 @@
|
||||
-- 菜单 SQL
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('天然气物性参数', '2053', '1', 'ngpar', 'system/ngpar/index', 1, 0, 'C', '0', '0', 'system:ngpar:list', '#', 'admin', sysdate(), '', null, '天然气物性参数菜单');
|
||||
values('天然气物性参数', '2053', '1', 'ngpar', 'ngtools/ngpar/index', 1, 0, 'C', '0', '0', 'ngtools:ngpar:list', '#', 'admin', sysdate(), '', null, '天然气物性参数菜单');
|
||||
|
||||
-- 按钮父菜单ID
|
||||
SELECT @parentId := LAST_INSERT_ID();
|
||||
|
||||
-- 按钮 SQL
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('天然气物性参数查询', @parentId, '1', '#', '', 1, 0, 'F', '0', '0', 'system:ngpar:query', '#', 'admin', sysdate(), '', null, '');
|
||||
values('天然气物性参数查询', @parentId, '1', '#', '', 1, 0, 'F', '0', '0', 'ngtools:ngpar:query', '#', 'admin', sysdate(), '', null, '');
|
||||
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('天然气物性参数新增', @parentId, '2', '#', '', 1, 0, 'F', '0', '0', 'system:ngpar:add', '#', 'admin', sysdate(), '', null, '');
|
||||
values('天然气物性参数新增', @parentId, '2', '#', '', 1, 0, 'F', '0', '0', 'ngtools:ngpar:add', '#', 'admin', sysdate(), '', null, '');
|
||||
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('天然气物性参数修改', @parentId, '3', '#', '', 1, 0, 'F', '0', '0', 'system:ngpar:edit', '#', 'admin', sysdate(), '', null, '');
|
||||
values('天然气物性参数修改', @parentId, '3', '#', '', 1, 0, 'F', '0', '0', 'ngtools:ngpar:edit', '#', 'admin', sysdate(), '', null, '');
|
||||
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('天然气物性参数删除', @parentId, '4', '#', '', 1, 0, 'F', '0', '0', 'system:ngpar:remove', '#', 'admin', sysdate(), '', null, '');
|
||||
values('天然气物性参数删除', @parentId, '4', '#', '', 1, 0, 'F', '0', '0', 'ngtools:ngpar:remove', '#', 'admin', sysdate(), '', null, '');
|
||||
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('天然气物性参数导出', @parentId, '5', '#', '', 1, 0, 'F', '0', '0', 'system:ngpar:export', '#', 'admin', sysdate(), '', null, '');
|
||||
values('天然气物性参数导出', @parentId, '5', '#', '', 1, 0, 'F', '0', '0', 'ngtools:ngpar:export', '#', 'admin', sysdate(), '', null, '');
|
||||
2341
sql/ry2025-3-25.sql
Normal file
2341
sql/ry2025-3-25.sql
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user