Compare commits
10 Commits
8d238a0b20
...
eefd16bc3d
| Author | SHA1 | Date | |
|---|---|---|---|
|
eefd16bc3d | ||
|
|
58c0897162 | ||
|
|
7d42794b17 | ||
|
|
991ab454f1 | ||
|
|
0fcd26552b | ||
|
|
7b8c68f565 | ||
|
|
b4cdbf119b | ||
|
|
8b777e1913 | ||
|
|
d9c06d9bf1 | ||
|
|
061268be69 |
40
.vscode/settings.json
vendored
40
.vscode/settings.json
vendored
@ -21,30 +21,36 @@
|
||||
"maven.executable.preferMavenWrapper": true,
|
||||
"java.import.maven.enabled": true,
|
||||
"java.dependency.packagePresentation": "hierarchical",
|
||||
"sqltools.connections": [
|
||||
"dbcode.connections": [
|
||||
{
|
||||
"mysqlOptions": {
|
||||
"authProtocol": "default",
|
||||
"enableSsl": "Disabled"
|
||||
},
|
||||
"previewLimit": 50,
|
||||
"server": "localhost",
|
||||
"connectionId": "btr-_nFe7R0oOvCj0mMun",
|
||||
"name": "ry-mysql",
|
||||
"driver": "mysql",
|
||||
"connectionType": "host",
|
||||
"host": "127.0.0.1",
|
||||
"port": 3306,
|
||||
"driver": "MySQL",
|
||||
"name": "localhost-mysql",
|
||||
"database": "ry",
|
||||
"ssl": false,
|
||||
"username": "root",
|
||||
"password": "123456"
|
||||
"password": "123456",
|
||||
"savePassword": "secretStorage",
|
||||
"database": "ry",
|
||||
"connectionTimeout": 30,
|
||||
"driverOptions": {
|
||||
"retrievePublickey": true
|
||||
}
|
||||
},
|
||||
{
|
||||
"previewLimit": 50,
|
||||
"server": "localhost",
|
||||
"connectionId": "7NX2UhXl__9t3Ca6TzEsB",
|
||||
"name": "ry-postgres",
|
||||
"driver": "postgres",
|
||||
"connectionType": "host",
|
||||
"host": "127.0.0.1",
|
||||
"port": 5432,
|
||||
"driver": "PostgreSQL",
|
||||
"name": "localhost-postgres",
|
||||
"database": "ry",
|
||||
"ssl": false,
|
||||
"username": "postgres",
|
||||
"password": "123456"
|
||||
"password": "123456",
|
||||
"savePassword": "secretStorage",
|
||||
"connectionTimeout": 30
|
||||
}
|
||||
],
|
||||
}
|
||||
@ -9,9 +9,9 @@ spring:
|
||||
datasource:
|
||||
# 主库数据源
|
||||
MASTER:
|
||||
url: jdbc:mysql://127.0.0.1/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
url: jdbc:mysql://192.168.3.19/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
username: root
|
||||
password: 123456
|
||||
password: 4877017Ldy
|
||||
# MASTER:
|
||||
# url: jdbc:postgresql://127.0.0.1/ry
|
||||
# username: postgres
|
||||
|
||||
@ -1,4 +1,7 @@
|
||||
# 当前支付模块写的并不完善，请根据自己的业务需求进行修改
|
||||
# 回调地址使用的内网穿透http://e2vca6.natappfree.cc
|
||||
pay:
|
||||
# https://doc.shouqianba.com/zh-cn/
|
||||
sqb:
|
||||
enabled: false
|
||||
appId: "appId"
|
||||
@ -7,14 +10,16 @@ pay:
|
||||
terminalKey: "terminalKey"
|
||||
vendorSn: "vendorSn"
|
||||
vendorKey: "vendorKey"
|
||||
publicKey: classpath:pay/sqb/sqb_public_key.pem
|
||||
notifyUrl: http://e2vca6.natappfree.cc/pay/sqb/notify
|
||||
# https://opendocs.alipay.com/open/02np95
|
||||
alipay:
|
||||
enabled: false
|
||||
appId: appid
|
||||
# 应用私钥
|
||||
appPrivateKey: classpath:pay/alipay/alipay_private_key.pem
|
||||
# 支付宝公钥
|
||||
alipayPublicKey: classpath:pay/alipay/alipay_public_key.pem
|
||||
notifyUrl: http://e2vca6.natappfree.cc/alipay/notify
|
||||
# https://github.com/wechatpay-apiv3/wechatpay-java
|
||||
wechat:
|
||||
enabled: false
|
||||
appId: appid
|
||||
@ -22,5 +27,4 @@ pay:
|
||||
privateKeyPath: classpath:pay/wx/apiclient_key.pem
|
||||
merchantId: merchantId
|
||||
merchantSerialNumber: merchantSerialNumber
|
||||
# 回调地址，此处使用的内网穿透http://e2vca6.natappfree.cc
|
||||
notifyUrl: http://e2vca6.natappfree.cc/pay/wechat/notify
|
||||
|
||||
@ -0,0 +1,14 @@
|
||||
package com.ruoyi.auth.common.service;
|
||||
|
||||
import com.ruoyi.common.core.domain.model.LoginBody;
|
||||
import com.ruoyi.common.core.domain.model.RegisterBody;
|
||||
|
||||
public interface TfaService {
|
||||
public void doBind(LoginBody loginBody);
|
||||
|
||||
public void doBindVerify(LoginBody loginBody);
|
||||
|
||||
public void doRegister(RegisterBody registerBody);
|
||||
|
||||
public void doRegisterVerify(RegisterBody registerBody);
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
package com.ruoyi.auth.common.controller;
|
||||
package com.ruoyi.auth.controller;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@ -35,8 +35,7 @@ import jakarta.servlet.http.HttpServletResponse;
|
||||
@RestController
|
||||
@RequestMapping("/system/oauth")
|
||||
@Tag(name = "【第三方认证】管理")
|
||||
public class OauthUserController extends BaseController
|
||||
{
|
||||
public class OauthUserController extends BaseController {
|
||||
@Autowired
|
||||
private IOauthUserService oauthUserService;
|
||||
|
||||
@ -46,8 +45,7 @@ public class OauthUserController extends BaseController
|
||||
@Operation(summary = "查询第三方认证列表")
|
||||
@PreAuthorize("@ss.hasPermi('system:oauth:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(OauthUser oauthUser)
|
||||
{
|
||||
public TableDataInfo list(OauthUser oauthUser) {
|
||||
startPage();
|
||||
List<OauthUser> list = oauthUserService.selectOauthUserList(oauthUser);
|
||||
return getDataTable(list);
|
||||
@ -60,8 +58,7 @@ public class OauthUserController extends BaseController
|
||||
@PreAuthorize("@ss.hasPermi('system:oauth:export')")
|
||||
@Log(title = "第三方认证", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, OauthUser oauthUser)
|
||||
{
|
||||
public void export(HttpServletResponse response, OauthUser oauthUser) {
|
||||
List<OauthUser> list = oauthUserService.selectOauthUserList(oauthUser);
|
||||
ExcelUtil<OauthUser> util = new ExcelUtil<OauthUser>(OauthUser.class);
|
||||
util.exportExcel(response, list, "第三方认证数据");
|
||||
@ -73,8 +70,7 @@ public class OauthUserController extends BaseController
|
||||
@Operation(summary = "获取第三方认证详细信息")
|
||||
@PreAuthorize("@ss.hasPermi('system:oauth:query')")
|
||||
@GetMapping(value = "/{id}")
|
||||
public AjaxResult getInfo(@PathVariable("id") Long id)
|
||||
{
|
||||
public AjaxResult getInfo(@PathVariable("id") Long id) {
|
||||
return success(oauthUserService.selectOauthUserById(id));
|
||||
}
|
||||
|
||||
@ -85,8 +81,7 @@ public class OauthUserController extends BaseController
|
||||
@PreAuthorize("@ss.hasPermi('system:oauth:add')")
|
||||
@Log(title = "第三方认证", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody OauthUser oauthUser)
|
||||
{
|
||||
public AjaxResult add(@RequestBody OauthUser oauthUser) {
|
||||
return toAjax(oauthUserService.insertOauthUser(oauthUser));
|
||||
}
|
||||
|
||||
@ -97,8 +92,7 @@ public class OauthUserController extends BaseController
|
||||
@PreAuthorize("@ss.hasPermi('system:oauth:edit')")
|
||||
@Log(title = "第三方认证", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody OauthUser oauthUser)
|
||||
{
|
||||
public AjaxResult edit(@RequestBody OauthUser oauthUser) {
|
||||
return toAjax(oauthUserService.updateOauthUser(oauthUser));
|
||||
}
|
||||
|
||||
@ -108,9 +102,8 @@ public class OauthUserController extends BaseController
|
||||
@Operation(summary = "删除第三方认证")
|
||||
@PreAuthorize("@ss.hasPermi('system:oauth:remove')")
|
||||
@Log(title = "第三方认证", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public AjaxResult remove(@PathVariable( name = "ids" ) Long[] ids)
|
||||
{
|
||||
@DeleteMapping("/{ids}")
|
||||
public AjaxResult remove(@PathVariable(name = "ids") Long[] ids) {
|
||||
return toAjax(oauthUserService.deleteOauthUserByIds(ids));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,70 @@
|
||||
package com.ruoyi.auth.controller;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
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 com.ruoyi.auth.common.service.TfaService;
|
||||
import com.ruoyi.common.annotation.Anonymous;
|
||||
import com.ruoyi.common.core.controller.BaseController;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.common.core.domain.model.LoginBody;
|
||||
import com.ruoyi.common.core.domain.model.RegisterBody;
|
||||
|
||||
import jakarta.annotation.PostConstruct;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/auth/{channel}") // dySms mail
|
||||
public class TfaController extends BaseController {
|
||||
|
||||
@Autowired(required = false)
|
||||
Map<String, TfaService> tfaServiceMap;
|
||||
|
||||
@PostConstruct
|
||||
public void init() {
|
||||
if (tfaServiceMap == null) {
|
||||
tfaServiceMap = new HashMap<>();
|
||||
logger.warn("请注意，没有加载任何双认证服务");
|
||||
} else {
|
||||
tfaServiceMap.forEach((k, v) -> {
|
||||
logger.info("已加载双认证服务 {}", k);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@PostMapping("/send/bind")
|
||||
public AjaxResult send(@PathVariable String channel, @RequestBody LoginBody loginBody) {
|
||||
TfaService tfaService = tfaServiceMap.get(channel + "AuthService");
|
||||
tfaService.doBind(loginBody);
|
||||
return success();
|
||||
}
|
||||
|
||||
@PostMapping("/verify/bind") // 发送验证码
|
||||
public AjaxResult verify(@PathVariable String channel, @RequestBody LoginBody loginBody) {
|
||||
TfaService tfaService = tfaServiceMap.get(channel + "AuthService");
|
||||
tfaService.doBindVerify(loginBody);
|
||||
return success();
|
||||
}
|
||||
|
||||
@PostMapping("/send/register")
|
||||
@Anonymous
|
||||
public AjaxResult sendRegister(@PathVariable String channel, @RequestBody RegisterBody registerBody) {
|
||||
TfaService tfaService = tfaServiceMap.get(channel + "AuthService");
|
||||
tfaService.doRegister(registerBody);
|
||||
return success();
|
||||
}
|
||||
|
||||
@PostMapping("/verify/register")
|
||||
@Anonymous
|
||||
public AjaxResult verifyRegister(@PathVariable String channel, @RequestBody RegisterBody registerBody) {
|
||||
TfaService tfaService = tfaServiceMap.get(channel + "AuthService");
|
||||
tfaService.doRegisterVerify(registerBody);
|
||||
return success();
|
||||
}
|
||||
}
|
||||
@ -13,6 +13,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import com.alibaba.fastjson2.JSONObject;
|
||||
import com.ruoyi.auth.common.domain.OauthUser;
|
||||
import com.ruoyi.auth.common.service.IOauthUserService;
|
||||
import com.ruoyi.common.annotation.Anonymous;
|
||||
import com.ruoyi.common.constant.Constants;
|
||||
import com.ruoyi.common.core.controller.BaseController;
|
||||
@ -25,9 +27,7 @@ import com.ruoyi.common.utils.SecurityUtils;
|
||||
import com.ruoyi.common.utils.StringUtils;
|
||||
import com.ruoyi.framework.web.service.SysPermissionService;
|
||||
import com.ruoyi.framework.web.service.TokenService;
|
||||
import com.ruoyi.auth.common.domain.OauthUser;
|
||||
import com.ruoyi.auth.common.service.IOauthUserService;
|
||||
import com.ruoyi.oauth.justauth.utils.AuthUtils;
|
||||
import com.ruoyi.oauth.justauth.utils.JustAuthUtils;
|
||||
import com.ruoyi.system.service.ISysUserService;
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
@ -91,7 +91,7 @@ public class SysAuthController extends BaseController
|
||||
return error(source + "平台账号暂不支持");
|
||||
}
|
||||
JSONObject json = JSONObject.parseObject(obj);
|
||||
AuthRequest authRequest = AuthUtils.getAuthRequest(source, json.getString("clientId"), json.getString("clientSecret"), json.getString("redirectUri"), authStateCache);
|
||||
AuthRequest authRequest = JustAuthUtils.getAuthRequest(source, json.getString("clientId"), json.getString("clientSecret"), json.getString("redirectUri"), authStateCache);
|
||||
String authorizeUrl = authRequest.authorize(AuthStateUtils.createState());
|
||||
return success(authorizeUrl);
|
||||
}
|
||||
@ -114,7 +114,7 @@ public class SysAuthController extends BaseController
|
||||
return AjaxResult.error(10002, "第三方平台系统不支持或未提供来源");
|
||||
}
|
||||
JSONObject json = JSONObject.parseObject(obj);
|
||||
AuthRequest authRequest = AuthUtils.getAuthRequest(source, json.getString("clientId"), json.getString("clientSecret"), json.getString("redirectUri"), authStateCache);
|
||||
AuthRequest authRequest = JustAuthUtils.getAuthRequest(source, json.getString("clientId"), json.getString("clientSecret"), json.getString("redirectUri"), authStateCache);
|
||||
AuthResponse<AuthUser> response = authRequest.login(callback);
|
||||
if (response.ok())
|
||||
{
|
||||
|
||||
@ -38,7 +38,7 @@ import me.zhyd.oauth.request.AuthWeiboRequest;
|
||||
*
|
||||
* @author ruoyi
|
||||
*/
|
||||
public class AuthUtils
|
||||
public class JustAuthUtils
|
||||
{
|
||||
@SuppressWarnings("deprecation")
|
||||
public static AuthRequest getAuthRequest(String source, String clientId, String clientSecret, String redirectUri,
|
||||
@ -1,48 +0,0 @@
|
||||
package com.ruoyi.tfa.email.controller;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
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 com.ruoyi.common.annotation.Anonymous;
|
||||
import com.ruoyi.common.core.controller.BaseController;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.common.core.domain.model.LoginBody;
|
||||
import com.ruoyi.common.core.domain.model.RegisterBody;
|
||||
import com.ruoyi.tfa.email.service.impl.MailServiceImpl;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/auth/mail")
|
||||
public class MailAuthController extends BaseController {
|
||||
|
||||
@Autowired
|
||||
MailServiceImpl serviceImpl;
|
||||
|
||||
@PostMapping("/send/bind") // 发送验证码
|
||||
public AjaxResult send(@RequestBody LoginBody loginBody) {
|
||||
serviceImpl.doBind(loginBody);
|
||||
return success();
|
||||
}
|
||||
|
||||
@PostMapping("/verify/bind") // 发送验证码
|
||||
public AjaxResult verify(@RequestBody LoginBody loginBody) {
|
||||
serviceImpl.doBindVerify(loginBody);
|
||||
return success();
|
||||
}
|
||||
|
||||
@PostMapping("/send/register")
|
||||
@Anonymous
|
||||
public AjaxResult sendRegister(@RequestBody RegisterBody registerBody) {
|
||||
serviceImpl.doRegister(registerBody);
|
||||
return success();
|
||||
}
|
||||
|
||||
@PostMapping("/verify/register")
|
||||
@Anonymous
|
||||
public AjaxResult verifyRegister(@RequestBody RegisterBody registerBody) {
|
||||
serviceImpl.doRegisterVerify(registerBody);
|
||||
return success();
|
||||
}
|
||||
}
|
||||
@ -1,6 +1,7 @@
|
||||
package com.ruoyi.tfa.email.service;
|
||||
|
||||
import com.ruoyi.auth.common.service.OauthVerificationCodeService;
|
||||
import com.ruoyi.auth.common.service.TfaService;
|
||||
|
||||
public interface IMailService extends OauthVerificationCodeService {
|
||||
public interface IMailService extends OauthVerificationCodeService,TfaService {
|
||||
}
|
||||
|
||||
@ -24,7 +24,7 @@ import com.ruoyi.system.service.ISysUserService;
|
||||
import com.ruoyi.tfa.email.service.IMailService;
|
||||
import com.ruoyi.tfa.email.utils.EmailUtil;
|
||||
|
||||
@Service
|
||||
@Service("mailAuthService")
|
||||
public class MailServiceImpl implements IMailService {
|
||||
|
||||
@Autowired
|
||||
|
||||
@ -1,53 +0,0 @@
|
||||
package com.ruoyi.tfa.phone.controller;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
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 com.ruoyi.common.annotation.Anonymous;
|
||||
import com.ruoyi.common.core.controller.BaseController;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.common.core.domain.model.LoginBody;
|
||||
import com.ruoyi.common.core.domain.model.RegisterBody;
|
||||
import com.ruoyi.tfa.phone.service.Impl.DySmsServiceImpl;
|
||||
|
||||
/**
|
||||
* 手机号认证Controller
|
||||
*
|
||||
* @author zlh
|
||||
* @date 2024-04-16
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/auth/phone")
|
||||
public class DySmsAuthController extends BaseController {
|
||||
@Autowired
|
||||
public DySmsServiceImpl dySmsService;
|
||||
|
||||
@PostMapping("/send/bind") // 发送验证码
|
||||
public AjaxResult send(@RequestBody LoginBody loginBody) {
|
||||
dySmsService.doBind(loginBody);
|
||||
return success();
|
||||
}
|
||||
|
||||
@PostMapping("/verify/bind") // 发送验证码
|
||||
public AjaxResult verify(@RequestBody LoginBody loginBody) {
|
||||
dySmsService.doBindVerify(loginBody);
|
||||
return success();
|
||||
}
|
||||
|
||||
@PostMapping("/send/register")
|
||||
@Anonymous
|
||||
public AjaxResult sendRegister(@RequestBody RegisterBody registerBody) {
|
||||
dySmsService.doRegister(registerBody);
|
||||
return success();
|
||||
}
|
||||
|
||||
@PostMapping("/verify/register")
|
||||
@Anonymous
|
||||
public AjaxResult verifyRegister(@RequestBody RegisterBody registerBody) {
|
||||
dySmsService.doRegisterVerify(registerBody);
|
||||
return success();
|
||||
}
|
||||
}
|
||||
@ -1,6 +1,7 @@
|
||||
package com.ruoyi.tfa.phone.service;
|
||||
|
||||
import com.ruoyi.auth.common.service.OauthVerificationCodeService;
|
||||
import com.ruoyi.auth.common.service.TfaService;
|
||||
|
||||
/**
|
||||
* 手机号认证Servcie
|
||||
@ -8,6 +9,6 @@ import com.ruoyi.auth.common.service.OauthVerificationCodeService;
|
||||
* @author zlh
|
||||
* @date 2024-04-16
|
||||
*/
|
||||
public interface DySmsService extends OauthVerificationCodeService {
|
||||
public interface DySmsService extends OauthVerificationCodeService, TfaService {
|
||||
|
||||
}
|
||||
|
||||
@ -32,7 +32,7 @@ import com.ruoyi.tfa.phone.utils.DySmsUtil;
|
||||
* @author zlh
|
||||
* @date 2024-04-16
|
||||
*/
|
||||
@Service
|
||||
@Service("dySmsAuthService")
|
||||
public class DySmsServiceImpl implements DySmsService {
|
||||
|
||||
@Autowired
|
||||
@ -114,14 +114,14 @@ public class DySmsServiceImpl implements DySmsService {
|
||||
}
|
||||
}
|
||||
|
||||
public boolean doRegisterVerify(RegisterBody registerBody) {
|
||||
public void doRegisterVerify(RegisterBody registerBody) {
|
||||
if (checkCode(registerBody.getPhonenumber(), registerBody.getCode(), OauthVerificationUse.REGISTER)) {
|
||||
SysUser sysUser = new SysUser();
|
||||
sysUser.setUserName(registerBody.getPhonenumber());
|
||||
sysUser.setNickName(registerBody.getUsername());
|
||||
sysUser.setPassword(SecurityUtils.encryptPassword(registerBody.getPassword()));
|
||||
sysUser.setPhonenumber(registerBody.getPhonenumber());
|
||||
return userService.registerUser(sysUser);
|
||||
userService.registerUser(sysUser);
|
||||
} else {
|
||||
throw new ServiceException("验证码错误");
|
||||
}
|
||||
@ -158,14 +158,14 @@ public class DySmsServiceImpl implements DySmsService {
|
||||
sendCode(loginBody.getPhonenumber(), RandomCodeUtil.numberCode(6), OauthVerificationUse.BIND);
|
||||
}
|
||||
|
||||
public int doBindVerify(LoginBody loginBody) {
|
||||
public void doBindVerify(LoginBody loginBody) {
|
||||
if (checkCode(loginBody.getPhonenumber(), loginBody.getCode(), OauthVerificationUse.BIND)) {
|
||||
SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
|
||||
if (!SecurityUtils.matchesPassword(loginBody.getPassword(), sysUser.getPassword())) {
|
||||
throw new ServiceException("密码错误");
|
||||
}
|
||||
sysUser.setPhonenumber(loginBody.getPhonenumber());
|
||||
return userService.updateUser(sysUser);
|
||||
userService.updateUser(sysUser);
|
||||
} else {
|
||||
throw new ServiceException("验证码错误");
|
||||
}
|
||||
|
||||
1
ruoyi-geek-app
Submodule
1
ruoyi-geek-app
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 3489a065a6c361142c08e70b910ba87b30dd01e4
|
||||
1
ruoyi-geek-vue3
Submodule
1
ruoyi-geek-vue3
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 1f9d80c33fb09c7d1c5b848419772f92fc090b63
|
||||
@ -87,7 +87,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
#if($table.haveSubColumn == '1')
|
||||
where ${pkColumn.columnName} = #{${pkColumn.javaField}}
|
||||
#else
|
||||
where ${tableName}.${pkColumn.columnName} = #{${pkColumn.javaField}}
|
||||
#set($tableAlias=$table.tableAlias)
|
||||
where ${tableAlias}.${pkColumn.columnName} = #{${pkColumn.javaField}}
|
||||
#end
|
||||
#elseif($table.sub)
|
||||
select#foreach($column in $columns) a.$column.columnName#if($foreach.count != $columns.size()),#end#end,
|
||||
|
||||
36
ruoyi-ngtools/pom.xml
Normal file
36
ruoyi-ngtools/pom.xml
Normal file
@ -0,0 +1,36 @@
|
||||
<?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</artifactId>
|
||||
<version>3.8.9</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>ruoyi-ngtools</artifactId>
|
||||
|
||||
<properties>
|
||||
<maven.compiler.source>8</maven.compiler.source>
|
||||
<maven.compiler.target>8</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>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<artifactId>ruoyi-system</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
</project>
|
||||
7
ruoyi-ngtools/src/main/java/com/ruoyi/Main.java
Normal file
7
ruoyi-ngtools/src/main/java/com/ruoyi/Main.java
Normal file
@ -0,0 +1,7 @@
|
||||
package com.ruoyi;
|
||||
|
||||
public class Main {
|
||||
public static void main(String[] args) {
|
||||
System.out.println("Hello world!");
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,176 @@
|
||||
package com.ruoyi.ngCalTools.controller;
|
||||
|
||||
// GasController.java
|
||||
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.ngCalTools.model.GasProps;
|
||||
import com.ruoyi.ngCalTools.model.FlowProps;
|
||||
import com.ruoyi.ngCalTools.service.DetailService;
|
||||
import com.ruoyi.ngCalTools.service.GBT11062Service;
|
||||
import com.ruoyi.ngCalTools.service.ThermService;
|
||||
import com.ruoyi.ngCalTools.utils.GasConstants;
|
||||
import com.ruoyi.system.controller.SysUnitConvertController;
|
||||
import com.ruoyi.system.controller.UnitConvert;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/NGCalcTools")
|
||||
public class GasController {
|
||||
|
||||
|
||||
private final UnitConvert unitConvert;
|
||||
public ThermService thermService;
|
||||
public DetailService detailService;
|
||||
public GBT11062Service gbt11062Service;
|
||||
|
||||
public GasController(UnitConvert unitConvert) {
|
||||
this.unitConvert = unitConvert;
|
||||
}
|
||||
@PostMapping ("/ngCalc")
|
||||
public AjaxResult ngCalc(@RequestBody FlowProps flowProps) {
|
||||
thermService = new ThermService();
|
||||
detailService = new DetailService();
|
||||
gbt11062Service = new GBT11062Service();
|
||||
GasProps gasProps = new GasProps();
|
||||
//大气压力转换成Pa
|
||||
double tempPatm = unitConvert.ConvertUniter("pressure", flowProps.getdPatm(), flowProps.getdPatmUnit(), 0);
|
||||
//压力转换成Pa
|
||||
double tempPf = unitConvert.ConvertUniter("pressure", flowProps.getdPf(), flowProps.getdPfUnit(), 0);
|
||||
//温度转换成K
|
||||
double tempTf = unitConvert.ConvertUniter("temperature", flowProps.getdTf(), flowProps.getdTfUnit(), 2);
|
||||
if (flowProps.getdPfType() == 0) //0是表压
|
||||
{
|
||||
gasProps.dPf = tempPatm + tempPf;
|
||||
} else {
|
||||
gasProps.dPf = tempPf;
|
||||
}
|
||||
gasProps.dTf = tempTf;
|
||||
gasProps.dCbtj = flowProps.getdCbtj();
|
||||
String[] stringArray = flowProps.getdngComponents().split("_");
|
||||
double[] doubleArray = new double[stringArray.length]; // 遍历字符串数组，将每个元素转换为 double 类型
|
||||
for (int i = 0; i < stringArray.length; i++) {
|
||||
try {
|
||||
doubleArray[i] = Double.parseDouble(stringArray[i]) / 100;
|
||||
} catch (NumberFormatException e) {
|
||||
// 处理转换异常
|
||||
System.err.println("无法将字符串 " + stringArray[i] + " 转换为 double 类型: " + e.getMessage());
|
||||
}
|
||||
}
|
||||
gasProps.adMixture = doubleArray;
|
||||
Crit(gasProps, 0); //计算临界流函数所有参数都计算了
|
||||
return AjaxResult.success(gasProps);
|
||||
}
|
||||
|
||||
|
||||
|
||||
public void ngCalcVoid( FlowProps flowProps,GasProps gasProps) {
|
||||
thermService = new ThermService();
|
||||
detailService = new DetailService();
|
||||
gbt11062Service = new GBT11062Service();
|
||||
|
||||
Crit(gasProps, 0); //计算临界流函数所有参数都计算了
|
||||
|
||||
}
|
||||
|
||||
public int NG_Cal_Init() {
|
||||
//create object for calculating density
|
||||
if (null == (detailService=new DetailService())) {
|
||||
return GasConstants.MEMORY_ALLOCATION_ERROR;
|
||||
}
|
||||
|
||||
//create object for calculating thermodynamic properties
|
||||
if (null == (thermService=new ThermService())) {
|
||||
return GasConstants.MEMORY_ALLOCATION_ERROR;
|
||||
}
|
||||
|
||||
return GasConstants.NG_Cal_INITIALIZED;
|
||||
|
||||
}// NG_Cal_Init
|
||||
public int NG_Cal_UnInit() {
|
||||
// delete the objects (if they exist)
|
||||
detailService = null;
|
||||
thermService = null;
|
||||
return 0;
|
||||
|
||||
}
|
||||
|
||||
public double Crit(GasProps gasProps, double dPlenumVelocity)
|
||||
{
|
||||
//variables local to function
|
||||
double DH, DDH, S, H;
|
||||
double tolerance = 1.0;
|
||||
double R, P, T, Z;
|
||||
|
||||
int i;
|
||||
|
||||
//check objects for readiness; try to initialize if not
|
||||
if (null == detailService || null == thermService)
|
||||
{
|
||||
NG_Cal_UnInit();
|
||||
|
||||
if (GasConstants.NG_Cal_INITIALIZED != NG_Cal_Init())
|
||||
{
|
||||
|
||||
gasProps.lStatus =GasConstants. MEMORY_ALLOCATION_ERROR; return 0.0;
|
||||
|
||||
}
|
||||
}
|
||||
switch (gasProps.dCbtj)
|
||||
{
|
||||
case 2:
|
||||
gasProps.dPb = 101325;
|
||||
gasProps.dTb = 273.15;
|
||||
break;
|
||||
case 1:
|
||||
gasProps.dPb = 101325;
|
||||
gasProps.dTb = 288.15;
|
||||
break;
|
||||
case 0:
|
||||
gasProps.dPb = 101325;
|
||||
gasProps.dTb = 293.15;
|
||||
break;
|
||||
|
||||
|
||||
}
|
||||
//begin by calculating densities and thermodynamic properties
|
||||
thermService.Run(gasProps, detailService);
|
||||
|
||||
//DH is enthalpy change from plenum to throat; this is our initial guess
|
||||
|
||||
DH = (gasProps.dSOS * gasProps.dSOS - dPlenumVelocity * dPlenumVelocity) / 2.0;
|
||||
|
||||
//trap plenum conditions before we alter the data stucture's contents
|
||||
S = gasProps.dS;
|
||||
|
||||
H = gasProps.dH;
|
||||
|
||||
R = gasProps.dRhof;
|
||||
P = gasProps.dPf;
|
||||
Z = gasProps.dZf;
|
||||
T = gasProps.dTf;
|
||||
|
||||
DDH = 10.0;
|
||||
|
||||
for (i = 1; i < GasConstants.MAX_NUM_OF_ITERATIONS; i++)
|
||||
{
|
||||
thermService.HS_Mode( gasProps, detailService, H - DH, S, true);
|
||||
thermService.Run( gasProps, detailService);
|
||||
DDH = DH;
|
||||
DH = (gasProps.dSOS * gasProps.dSOS - dPlenumVelocity * dPlenumVelocity) / 2.0;
|
||||
if (Math.abs(DDH - DH) < tolerance) break;
|
||||
}
|
||||
gasProps.dCstar = (gasProps.dRhof * gasProps.dSOS) / Math.sqrt(R * P * Z);
|
||||
gasProps.dPf = P;
|
||||
gasProps.dTf = T;
|
||||
thermService.Run(gasProps, detailService);
|
||||
gbt11062Service.Run(gasProps );
|
||||
return gasProps.dCstar;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -0,0 +1,7 @@
|
||||
package com.ruoyi.ngCalTools.enums;
|
||||
|
||||
public enum GasComponent {
|
||||
XiC1, XiN2, XiCO2, XiC2, XiC3,
|
||||
XiH2O, XiH2S, XiH2, XiCO, XiO2, XiIC4, XiNC4,
|
||||
XiIC5, XiNC5, XiNC6, XiNC7, XiNC8, XiNC9, XiNC10, XiHe, XiAr
|
||||
}
|
||||
@ -0,0 +1,592 @@
|
||||
package com.ruoyi.ngCalTools.model;
|
||||
|
||||
public class FlowProps {
|
||||
// 流量计算输入参数信息
|
||||
private int dFlowCalbz; // 流量计算标准
|
||||
|
||||
public int getdZcalbz() {
|
||||
return dZcalbz;
|
||||
}
|
||||
|
||||
public void setdZcalbz(int dZcalbz) {
|
||||
this.dZcalbz = dZcalbz;
|
||||
}
|
||||
|
||||
public int getdFlowCalbz() {
|
||||
return dFlowCalbz;
|
||||
}
|
||||
|
||||
public void setdFlowCalbz(int dFlowCalbz) {
|
||||
this.dFlowCalbz = dFlowCalbz;
|
||||
}
|
||||
|
||||
public int getdCbtj() {
|
||||
return dCbtj;
|
||||
}
|
||||
|
||||
public void setdCbtj(int dCbtj) {
|
||||
this.dCbtj = dCbtj;
|
||||
}
|
||||
|
||||
public double getdPb_M() {
|
||||
return dPb_M;
|
||||
}
|
||||
|
||||
public void setdPb_M(double dPb_M) {
|
||||
this.dPb_M = dPb_M;
|
||||
}
|
||||
|
||||
public double getdTb_M() {
|
||||
return dTb_M;
|
||||
}
|
||||
|
||||
public void setdTb_M(double dTb_M) {
|
||||
this.dTb_M = dTb_M;
|
||||
}
|
||||
|
||||
public double getdPb_E() {
|
||||
return dPb_E;
|
||||
}
|
||||
|
||||
public void setdPb_E(double dPb_E) {
|
||||
this.dPb_E = dPb_E;
|
||||
}
|
||||
|
||||
public double getdTb_E() {
|
||||
return dTb_E;
|
||||
}
|
||||
|
||||
public void setdTb_E(double dTb_E) {
|
||||
this.dTb_E = dTb_E;
|
||||
}
|
||||
|
||||
public double getdPatm() {
|
||||
return dPatm;
|
||||
}
|
||||
|
||||
public void setdPatm(double dPatm) {
|
||||
this.dPatm = dPatm;
|
||||
}
|
||||
|
||||
public int getdPatmUnit() {
|
||||
return dPatmUnit;
|
||||
}
|
||||
|
||||
public void setdPatmUnit(int dPatmUnit) {
|
||||
this.dPatmUnit = dPatmUnit;
|
||||
}
|
||||
|
||||
public String getdngComponents() {
|
||||
return dngComponents;
|
||||
}
|
||||
|
||||
public void setdngComponents(String dngComponents) {
|
||||
this.dngComponents = dngComponents;
|
||||
}
|
||||
|
||||
public int getdMeterType() {
|
||||
return dMeterType;
|
||||
}
|
||||
|
||||
public void setdMeterType(int dMeterType) {
|
||||
this.dMeterType = dMeterType;
|
||||
}
|
||||
|
||||
public int getdCoreType() {
|
||||
return dCoreType;
|
||||
}
|
||||
|
||||
public void setdCoreType(int dCoreType) {
|
||||
this.dCoreType = dCoreType;
|
||||
}
|
||||
|
||||
public int getdPtmode() {
|
||||
return dPtmode;
|
||||
}
|
||||
|
||||
public void setdPtmode(int dPtmode) {
|
||||
this.dPtmode = dPtmode;
|
||||
}
|
||||
|
||||
public int getdPipeType() {
|
||||
return dPipeType;
|
||||
}
|
||||
|
||||
public void setdPipeType(int dPipeType) {
|
||||
this.dPipeType = dPipeType;
|
||||
}
|
||||
|
||||
public double getdPipeD() {
|
||||
return dPipeD;
|
||||
}
|
||||
|
||||
public void setdPipeD(double dPipeD) {
|
||||
this.dPipeD = dPipeD;
|
||||
}
|
||||
|
||||
public int getdLenUnit() {
|
||||
return dLenUnit;
|
||||
}
|
||||
|
||||
public void setdLenUnit(int dLenUnit) {
|
||||
this.dLenUnit = dLenUnit;
|
||||
}
|
||||
|
||||
public double getdPipeDtemp() {
|
||||
return dPipeDtemp;
|
||||
}
|
||||
|
||||
public void setdPipeDtemp(double dPipeDtemp) {
|
||||
this.dPipeDtemp = dPipeDtemp;
|
||||
}
|
||||
|
||||
public int getdPileDtempUint() {
|
||||
return dPileDtempUint;
|
||||
}
|
||||
|
||||
public void setdPileDtempUint(int dPileDtempUint) {
|
||||
this.dPileDtempUint = dPileDtempUint;
|
||||
}
|
||||
|
||||
public double getdPipeMaterial() {
|
||||
return dPipeMaterial;
|
||||
}
|
||||
|
||||
public void setdPipeMaterial(double dPipeMaterial) {
|
||||
this.dPipeMaterial = dPipeMaterial;
|
||||
}
|
||||
|
||||
public double getdOrificeD() {
|
||||
return dOrificeD;
|
||||
}
|
||||
|
||||
public void setdOrificeD(double dOrificeD) {
|
||||
this.dOrificeD = dOrificeD;
|
||||
}
|
||||
|
||||
public int getdOrificeUnit() {
|
||||
return dOrificeUnit;
|
||||
}
|
||||
|
||||
public void setdOrificeUnit(int dOrificeUnit) {
|
||||
this.dOrificeUnit = dOrificeUnit;
|
||||
}
|
||||
|
||||
public double getdOrificeDtemp() {
|
||||
return dOrificeDtemp;
|
||||
}
|
||||
|
||||
public void setdOrificeDtemp(double dOrificeDtemp) {
|
||||
this.dOrificeDtemp = dOrificeDtemp;
|
||||
}
|
||||
|
||||
public int getdOrificeDtempUnit() {
|
||||
return dOrificeDtempUnit;
|
||||
}
|
||||
|
||||
public void setdOrificeDtempUnit(int dOrificeDtempUnit) {
|
||||
this.dOrificeDtempUnit = dOrificeDtempUnit;
|
||||
}
|
||||
|
||||
public double getdOrificeMaterial() {
|
||||
return dOrificeMaterial;
|
||||
}
|
||||
|
||||
public void setdOrificeMaterial(double dOrificeMaterial) {
|
||||
this.dOrificeMaterial = dOrificeMaterial;
|
||||
}
|
||||
|
||||
public int getdOrificeSharpness() {
|
||||
return dOrificeSharpness;
|
||||
}
|
||||
|
||||
public void setdOrificeSharpness(int dOrificeSharpness) {
|
||||
this.dOrificeSharpness = dOrificeSharpness;
|
||||
}
|
||||
|
||||
public double getdOrificeRk() {
|
||||
return dOrificeRk;
|
||||
}
|
||||
|
||||
public void setdOrificeRk(double dOrificeRk) {
|
||||
this.dOrificeRk = dOrificeRk;
|
||||
}
|
||||
|
||||
public int getdOrificeRkLenUint() {
|
||||
return dOrificeRkLenUint;
|
||||
}
|
||||
|
||||
public void setdOrificeRkLenUint(int dOrificeRkLenUint) {
|
||||
this.dOrificeRkLenUint = dOrificeRkLenUint;
|
||||
}
|
||||
|
||||
public double getdPf() {
|
||||
return dPf;
|
||||
}
|
||||
|
||||
public void setdPf(double dPf) {
|
||||
this.dPf = dPf;
|
||||
}
|
||||
|
||||
public int getdPfUnit() {
|
||||
return dPfUnit;
|
||||
}
|
||||
|
||||
public void setdPfUnit(int dPfUnit) {
|
||||
this.dPfUnit = dPfUnit;
|
||||
}
|
||||
|
||||
public int getdPfType() {
|
||||
return dPfType;
|
||||
}
|
||||
|
||||
public void setdPfType(int dPfType) {
|
||||
this.dPfType = dPfType;
|
||||
}
|
||||
|
||||
public double getdTf() {
|
||||
return dTf;
|
||||
}
|
||||
|
||||
public void setdTf(double dTf) {
|
||||
this.dTf = dTf;
|
||||
}
|
||||
|
||||
public int getdTfUnit() {
|
||||
return dTfUnit;
|
||||
}
|
||||
|
||||
public void setdTfUnit(int dTfUnit) {
|
||||
this.dTfUnit = dTfUnit;
|
||||
}
|
||||
|
||||
public double getdDp() {
|
||||
return dDp;
|
||||
}
|
||||
|
||||
public void setdDp(double dDp) {
|
||||
this.dDp = dDp;
|
||||
}
|
||||
|
||||
public int getdDpUnit() {
|
||||
return dDpUnit;
|
||||
}
|
||||
|
||||
public void setdDpUnit(int dDpUnit) {
|
||||
this.dDpUnit = dDpUnit;
|
||||
}
|
||||
|
||||
public int getdVFlowUnit() {
|
||||
return dVFlowUnit;
|
||||
}
|
||||
|
||||
public void setdVFlowUnit(int dVFlowUnit) {
|
||||
this.dVFlowUnit = dVFlowUnit;
|
||||
}
|
||||
|
||||
public int getdMFlowUnit() {
|
||||
return dMFlowUnit;
|
||||
}
|
||||
|
||||
public void setdMFlowUnit(int dMFlowUnit) {
|
||||
this.dMFlowUnit = dMFlowUnit;
|
||||
}
|
||||
|
||||
public int getdEFlowUnit() {
|
||||
return dEFlowUnit;
|
||||
}
|
||||
|
||||
public void setdEFlowUnit(int dEFlowUnit) {
|
||||
this.dEFlowUnit = dEFlowUnit;
|
||||
}
|
||||
|
||||
public double getdCd() {
|
||||
return dCd;
|
||||
}
|
||||
|
||||
public void setdCd(double dCd) {
|
||||
this.dCd = dCd;
|
||||
}
|
||||
|
||||
public double getdMeterFactor() {
|
||||
return dMeterFactor;
|
||||
}
|
||||
|
||||
public void setdMeterFactor(double dMeterFactor) {
|
||||
this.dMeterFactor = dMeterFactor;
|
||||
}
|
||||
|
||||
public double getdPulseNum() {
|
||||
return dPulseNum;
|
||||
}
|
||||
|
||||
public void setdPulseNum(double dPulseNum) {
|
||||
this.dPulseNum = dPulseNum;
|
||||
}
|
||||
|
||||
public double getdVFlowMax() {
|
||||
return dVFlowMax;
|
||||
}
|
||||
|
||||
public void setdVFlowMax(double dVFlowMax) {
|
||||
this.dVFlowMax = dVFlowMax;
|
||||
}
|
||||
|
||||
public double getdVFlowMin() {
|
||||
return dVFlowMin;
|
||||
}
|
||||
|
||||
public void setdVFlowMin(double dVFlowMin) {
|
||||
this.dVFlowMin = dVFlowMin;
|
||||
}
|
||||
|
||||
public double getdVFlowCon() {
|
||||
return dVFlowCon;
|
||||
}
|
||||
|
||||
public void setdVFlowCon(double dVFlowCon) {
|
||||
this.dVFlowCon = dVFlowCon;
|
||||
}
|
||||
|
||||
public double getdPfRange() {
|
||||
return dPfRange;
|
||||
}
|
||||
|
||||
public void setdPfRange(double dPfRange) {
|
||||
this.dPfRange = dPfRange;
|
||||
}
|
||||
|
||||
public double getdDpRange() {
|
||||
return dDpRange;
|
||||
}
|
||||
|
||||
public void setdDpRange(double dDpRange) {
|
||||
this.dDpRange = dDpRange;
|
||||
}
|
||||
|
||||
public double getdTfRange() {
|
||||
return dTfRange;
|
||||
}
|
||||
|
||||
public void setdTfRange(double dTfRange) {
|
||||
this.dTfRange = dTfRange;
|
||||
}
|
||||
|
||||
public double getdE() {
|
||||
return dE;
|
||||
}
|
||||
|
||||
public void setdE(double dE) {
|
||||
this.dE = dE;
|
||||
}
|
||||
|
||||
public double getdFG() {
|
||||
return dFG;
|
||||
}
|
||||
|
||||
public void setdFG(double dFG) {
|
||||
this.dFG = dFG;
|
||||
}
|
||||
|
||||
public double getdFT() {
|
||||
return dFT;
|
||||
}
|
||||
|
||||
public void setdFT(double dFT) {
|
||||
this.dFT = dFT;
|
||||
}
|
||||
|
||||
public double getdDViscosity() {
|
||||
return dDViscosity;
|
||||
}
|
||||
|
||||
public void setdDViscosity(double dDViscosity) {
|
||||
this.dDViscosity = dDViscosity;
|
||||
}
|
||||
|
||||
public double getdDExpCoefficient() {
|
||||
return dDExpCoefficient;
|
||||
}
|
||||
|
||||
public void setdDExpCoefficient(double dDExpCoefficient) {
|
||||
this.dDExpCoefficient = dDExpCoefficient;
|
||||
}
|
||||
|
||||
public double getdRnPipe() {
|
||||
return dRnPipe;
|
||||
}
|
||||
|
||||
public void setdRnPipe(double dRnPipe) {
|
||||
this.dRnPipe = dRnPipe;
|
||||
}
|
||||
|
||||
public double getdBk() {
|
||||
return dBk;
|
||||
}
|
||||
|
||||
public void setdBk(double dBk) {
|
||||
this.dBk = dBk;
|
||||
}
|
||||
|
||||
public double getdRoughNessPipe() {
|
||||
return dRoughNessPipe;
|
||||
}
|
||||
|
||||
public void setdRoughNessPipe(double dRoughNessPipe) {
|
||||
this.dRoughNessPipe = dRoughNessPipe;
|
||||
}
|
||||
|
||||
public double getdCdCorrect() {
|
||||
return dCdCorrect;
|
||||
}
|
||||
|
||||
public void setdCdCorrect(double dCdCorrect) {
|
||||
this.dCdCorrect = dCdCorrect;
|
||||
}
|
||||
|
||||
public double getdCdNozell() {
|
||||
return dCdNozell;
|
||||
}
|
||||
|
||||
public void setdCdNozell(double dCdNozell) {
|
||||
this.dCdNozell = dCdNozell;
|
||||
}
|
||||
|
||||
public double getdVFlowb() {
|
||||
return dVFlowb;
|
||||
}
|
||||
|
||||
public void setdVFlowb(double dVFlowb) {
|
||||
this.dVFlowb = dVFlowb;
|
||||
}
|
||||
|
||||
public double getdVFlowf() {
|
||||
return dVFlowf;
|
||||
}
|
||||
|
||||
public void setdVFlowf(double dVFlowf) {
|
||||
this.dVFlowf = dVFlowf;
|
||||
}
|
||||
|
||||
public double getdMFlowb() {
|
||||
return dMFlowb;
|
||||
}
|
||||
|
||||
public void setdMFlowb(double dMFlowb) {
|
||||
this.dMFlowb = dMFlowb;
|
||||
}
|
||||
|
||||
public double getdEFlowb() {
|
||||
return dEFlowb;
|
||||
}
|
||||
|
||||
public void setdEFlowb(double dEFlowb) {
|
||||
this.dEFlowb = dEFlowb;
|
||||
}
|
||||
|
||||
public double getdVelocityFlow() {
|
||||
return dVelocityFlow;
|
||||
}
|
||||
|
||||
public void setdVelocityFlow(double dVelocityFlow) {
|
||||
this.dVelocityFlow = dVelocityFlow;
|
||||
}
|
||||
|
||||
public double getdPressLost() {
|
||||
return dPressLost;
|
||||
}
|
||||
|
||||
public void setdPressLost(double dPressLost) {
|
||||
this.dPressLost = dPressLost;
|
||||
}
|
||||
|
||||
public double getdBeta() {
|
||||
return dBeta;
|
||||
}
|
||||
|
||||
public void setdBeta(double dBeta) {
|
||||
this.dBeta = dBeta;
|
||||
}
|
||||
|
||||
public double getdKappa() {
|
||||
return dKappa;
|
||||
}
|
||||
|
||||
public void setdKappa(double dKappa) {
|
||||
this.dKappa = dKappa;
|
||||
}
|
||||
|
||||
private int dZcalbz; // 压缩因子计算标准
|
||||
private int dCbtj; // 计量参比条件压力
|
||||
private double dPb_M; // 计量参比条件压力
|
||||
private double dTb_M; // 计量参比条件温度
|
||||
private double dPb_E; // 燃烧参比条件压力
|
||||
private double dTb_E; // 燃烧参比条件温度
|
||||
private double dPatm; // 当地大气压
|
||||
private int dPatmUnit; // 当地大气压单位
|
||||
private String dngComponents; // 天然气组分
|
||||
|
||||
private int dMeterType; // 流量计类别
|
||||
private int dCoreType; // 节流装置类型
|
||||
private int dPtmode; // 取压方式
|
||||
private int dPipeType; // 管道类型
|
||||
private double dPipeD; // 管道内径
|
||||
private int dLenUnit; // 长度单位
|
||||
private double dPipeDtemp; // 管道内径参考温度
|
||||
private int dPileDtempUint; // 温度单位
|
||||
private double dPipeMaterial; // 管道材料
|
||||
|
||||
private double dOrificeD; // 孔板孔径
|
||||
private int dOrificeUnit; // 长度单位
|
||||
private double dOrificeDtemp; // 孔板内径参考温度
|
||||
private int dOrificeDtempUnit; // 温度单位
|
||||
private double dOrificeMaterial; // 孔板材料
|
||||
private int dOrificeSharpness; // 锐利度系数计算方法
|
||||
private double dOrificeRk; // 孔板入口圆弧半径
|
||||
private int dOrificeRkLenUint; // 长度单位
|
||||
private double dPf; // 输入压力
|
||||
private int dPfUnit; // 压力单位
|
||||
private int dPfType; // 压力类型
|
||||
private double dTf; // 输入温度
|
||||
private int dTfUnit; // 温度单位
|
||||
private double dDp; // 输入差压
|
||||
private int dDpUnit; // 压力单位
|
||||
private int dVFlowUnit; // 体积流量单位
|
||||
private int dMFlowUnit; // 质量流量单位
|
||||
private int dEFlowUnit; // 能量流量单位
|
||||
private double dCd; // 流出系数
|
||||
private double dMeterFactor; // 仪表系数
|
||||
private double dPulseNum; // 脉冲数
|
||||
private double dVFlowMax; // 最大体积流量
|
||||
private double dVFlowMin; // 最小体积流量
|
||||
private double dVFlowCon; // 常用流量
|
||||
private double dPfRange; // 压力量程
|
||||
private double dDpRange; // 差压量程
|
||||
private double dTfRange; // 温度计量程
|
||||
|
||||
// 流量计算输出参数
|
||||
private double dE; // 求渐近速度系数 E
|
||||
private double dFG; // 求相对密度系数 FG
|
||||
private double dFT; // 求流动温度系数 FT
|
||||
private double dDViscosity; // 求动力粘度 dlnd
|
||||
private double dDExpCoefficient; // 求可膨胀系数
|
||||
private double dRnPipe; // 管道雷诺数
|
||||
private double dBk; // 孔板锐利度系数Bk
|
||||
private double dRoughNessPipe; // 管道粗糙度系数 Gme
|
||||
private double dCdCorrect; // 修正后的流出系数
|
||||
private double dCdNozell; // 喷嘴的流出系数
|
||||
private double dVFlowb; // 标况体积流量 m³、s
|
||||
private double dVFlowf; // 工况体积流量
|
||||
private double dMFlowb; // 标况质量流量
|
||||
private double dEFlowb; // 标况能量流量
|
||||
private double dVelocityFlow; // 管道内天然气流速
|
||||
private double dPressLost; // 压力损失
|
||||
private double dBeta; // 直径比
|
||||
private double dKappa; // 等熵指数
|
||||
|
||||
|
||||
// Getters and Setters
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,513 @@
|
||||
package com.ruoyi.ngCalTools.model;
|
||||
|
||||
public class GasProps {
|
||||
// corresponds to the control group in meter classes
|
||||
public int lStatus; // calculation status 计算状态
|
||||
public boolean bForceUpdate; // 执行全部计算的标志 signal to perform full calculation
|
||||
|
||||
|
||||
|
||||
public double[] adMixture; // 气体摩尔组成 Composition in mole fraction
|
||||
public double[] adMixtureV; // 气体体积组成 Composition in mole fraction
|
||||
|
||||
public double[] getAdMixtureD() {
|
||||
return adMixtureD;
|
||||
}
|
||||
|
||||
public void setAdMixtureD(double[] adMixtureD) {
|
||||
this.adMixtureD = adMixtureD;
|
||||
}
|
||||
|
||||
public int getlStatus() {
|
||||
return lStatus;
|
||||
}
|
||||
|
||||
public void setlStatus(int lStatus) {
|
||||
this.lStatus = lStatus;
|
||||
}
|
||||
|
||||
public boolean isbForceUpdate() {
|
||||
return bForceUpdate;
|
||||
}
|
||||
|
||||
public void setbForceUpdate(boolean bForceUpdate) {
|
||||
this.bForceUpdate = bForceUpdate;
|
||||
}
|
||||
|
||||
public double[] getAdMixture() {
|
||||
return adMixture;
|
||||
}
|
||||
|
||||
public void setAdMixture(double[] adMixture) {
|
||||
this.adMixture = adMixture;
|
||||
}
|
||||
|
||||
public double[] getAdMixtureV() {
|
||||
return adMixtureV;
|
||||
}
|
||||
|
||||
public void setAdMixtureV(double[] adMixtureV) {
|
||||
this.adMixtureV = adMixtureV;
|
||||
}
|
||||
|
||||
public int getdCbtj() {
|
||||
return dCbtj;
|
||||
}
|
||||
|
||||
public void setdCbtj(int dCbtj) {
|
||||
this.dCbtj = dCbtj;
|
||||
}
|
||||
|
||||
public double getdPb() {
|
||||
return dPb;
|
||||
}
|
||||
|
||||
public void setdPb(double dPb) {
|
||||
this.dPb = dPb;
|
||||
}
|
||||
|
||||
public double getdTb() {
|
||||
return dTb;
|
||||
}
|
||||
|
||||
public void setdTb(double dTb) {
|
||||
this.dTb = dTb;
|
||||
}
|
||||
|
||||
public double getdPf() {
|
||||
return dPf;
|
||||
}
|
||||
|
||||
public void setdPf(double dPf) {
|
||||
this.dPf = dPf;
|
||||
}
|
||||
|
||||
public double getdTf() {
|
||||
return dTf;
|
||||
}
|
||||
|
||||
public void setdTf(double dTf) {
|
||||
this.dTf = dTf;
|
||||
}
|
||||
|
||||
public double getdMrx() {
|
||||
return dMrx;
|
||||
}
|
||||
|
||||
public void setdMrx(double dMrx) {
|
||||
this.dMrx = dMrx;
|
||||
}
|
||||
|
||||
public double getdZb() {
|
||||
return dZb;
|
||||
}
|
||||
|
||||
public void setdZb(double dZb) {
|
||||
this.dZb = dZb;
|
||||
}
|
||||
|
||||
public double getdZf() {
|
||||
return dZf;
|
||||
}
|
||||
|
||||
public void setdZf(double dZf) {
|
||||
this.dZf = dZf;
|
||||
}
|
||||
|
||||
public double getdFpv() {
|
||||
return dFpv;
|
||||
}
|
||||
|
||||
public void setdFpv(double dFpv) {
|
||||
this.dFpv = dFpv;
|
||||
}
|
||||
|
||||
public double getdDb() {
|
||||
return dDb;
|
||||
}
|
||||
|
||||
public void setdDb(double dDb) {
|
||||
this.dDb = dDb;
|
||||
}
|
||||
|
||||
public double getdDf() {
|
||||
return dDf;
|
||||
}
|
||||
|
||||
public void setdDf(double dDf) {
|
||||
this.dDf = dDf;
|
||||
}
|
||||
|
||||
public double getdRhob() {
|
||||
return dRhob;
|
||||
}
|
||||
|
||||
public void setdRhob(double dRhob) {
|
||||
this.dRhob = dRhob;
|
||||
}
|
||||
|
||||
public double getdRhof() {
|
||||
return dRhof;
|
||||
}
|
||||
|
||||
public void setdRhof(double dRhof) {
|
||||
this.dRhof = dRhof;
|
||||
}
|
||||
|
||||
public double getdRD_Ideal() {
|
||||
return dRD_Ideal;
|
||||
}
|
||||
|
||||
public void setdRD_Ideal(double dRD_Ideal) {
|
||||
this.dRD_Ideal = dRD_Ideal;
|
||||
}
|
||||
|
||||
public double getdRD_Real() {
|
||||
return dRD_Real;
|
||||
}
|
||||
|
||||
public void setdRD_Real(double dRD_Real) {
|
||||
this.dRD_Real = dRD_Real;
|
||||
}
|
||||
|
||||
public double getdHo() {
|
||||
return dHo;
|
||||
}
|
||||
|
||||
public void setdHo(double dHo) {
|
||||
this.dHo = dHo;
|
||||
}
|
||||
|
||||
public double getdH() {
|
||||
return dH;
|
||||
}
|
||||
|
||||
public void setdH(double dH) {
|
||||
this.dH = dH;
|
||||
}
|
||||
|
||||
public double getdS() {
|
||||
return dS;
|
||||
}
|
||||
|
||||
public void setdS(double dS) {
|
||||
this.dS = dS;
|
||||
}
|
||||
|
||||
public double getdCpi() {
|
||||
return dCpi;
|
||||
}
|
||||
|
||||
public void setdCpi(double dCpi) {
|
||||
this.dCpi = dCpi;
|
||||
}
|
||||
|
||||
public double getdCp() {
|
||||
return dCp;
|
||||
}
|
||||
|
||||
public void setdCp(double dCp) {
|
||||
this.dCp = dCp;
|
||||
}
|
||||
|
||||
public double getdCv() {
|
||||
return dCv;
|
||||
}
|
||||
|
||||
public void setdCv(double dCv) {
|
||||
this.dCv = dCv;
|
||||
}
|
||||
|
||||
public double getDk() {
|
||||
return dk;
|
||||
}
|
||||
|
||||
public void setDk(double dk) {
|
||||
this.dk = dk;
|
||||
}
|
||||
|
||||
public double getdKappa() {
|
||||
return dKappa;
|
||||
}
|
||||
|
||||
public void setdKappa(double dKappa) {
|
||||
this.dKappa = dKappa;
|
||||
}
|
||||
|
||||
public double getdSOS() {
|
||||
return dSOS;
|
||||
}
|
||||
|
||||
public void setdSOS(double dSOS) {
|
||||
this.dSOS = dSOS;
|
||||
}
|
||||
|
||||
public double getdCstar() {
|
||||
return dCstar;
|
||||
}
|
||||
|
||||
public void setdCstar(double dCstar) {
|
||||
this.dCstar = dCstar;
|
||||
}
|
||||
|
||||
public double getdHhvMol() {
|
||||
return dHhvMol;
|
||||
}
|
||||
|
||||
public void setdHhvMol(double dHhvMol) {
|
||||
this.dHhvMol = dHhvMol;
|
||||
}
|
||||
|
||||
public double getdLhvMol() {
|
||||
return dLhvMol;
|
||||
}
|
||||
|
||||
public void setdLhvMol(double dLhvMol) {
|
||||
this.dLhvMol = dLhvMol;
|
||||
}
|
||||
|
||||
public double getdHhvv() {
|
||||
return dHhvv;
|
||||
}
|
||||
|
||||
public void setdHhvv(double dHhvv) {
|
||||
this.dHhvv = dHhvv;
|
||||
}
|
||||
|
||||
public double getdLhvv() {
|
||||
return dLhvv;
|
||||
}
|
||||
|
||||
public void setdLhvv(double dLhvv) {
|
||||
this.dLhvv = dLhvv;
|
||||
}
|
||||
|
||||
public double getdHhvm() {
|
||||
return dHhvm;
|
||||
}
|
||||
|
||||
public void setdHhvm(double dHhvm) {
|
||||
this.dHhvm = dHhvm;
|
||||
}
|
||||
|
||||
public double getdLhvm() {
|
||||
return dLhvm;
|
||||
}
|
||||
|
||||
public void setdLhvm(double dLhvm) {
|
||||
this.dLhvm = dLhvm;
|
||||
}
|
||||
|
||||
public double getdZb11062() {
|
||||
return dZb11062;
|
||||
}
|
||||
|
||||
public void setdZb11062(double dZb11062) {
|
||||
this.dZb11062 = dZb11062;
|
||||
}
|
||||
|
||||
public double getdRhob11062() {
|
||||
return dRhob11062;
|
||||
}
|
||||
|
||||
public void setdRhob11062(double dRhob11062) {
|
||||
this.dRhob11062 = dRhob11062;
|
||||
}
|
||||
|
||||
public double getdRhof11062() {
|
||||
return dRhof11062;
|
||||
}
|
||||
|
||||
public void setdRhof11062(double dRhof11062) {
|
||||
this.dRhof11062 = dRhof11062;
|
||||
}
|
||||
|
||||
public double getdRD_Ideal11062() {
|
||||
return dRD_Ideal11062;
|
||||
}
|
||||
|
||||
public void setdRD_Ideal11062(double dRD_Ideal11062) {
|
||||
this.dRD_Ideal11062 = dRD_Ideal11062;
|
||||
}
|
||||
|
||||
public double getdRD_Real11062() {
|
||||
return dRD_Real11062;
|
||||
}
|
||||
|
||||
public void setdRD_Real11062(double dRD_Real11062) {
|
||||
this.dRD_Real11062 = dRD_Real11062;
|
||||
}
|
||||
|
||||
public double getdWobbeIndex() {
|
||||
return dWobbeIndex;
|
||||
}
|
||||
|
||||
public void setdWobbeIndex(double dWobbeIndex) {
|
||||
this.dWobbeIndex = dWobbeIndex;
|
||||
}
|
||||
|
||||
public double getdPc() {
|
||||
return dPc;
|
||||
}
|
||||
|
||||
public void setdPc(double dPc) {
|
||||
this.dPc = dPc;
|
||||
}
|
||||
|
||||
public double getdTC() {
|
||||
return dTC;
|
||||
}
|
||||
|
||||
public void setdTC(double dTC) {
|
||||
this.dTC = dTC;
|
||||
}
|
||||
|
||||
public double getdBzsx() {
|
||||
return dBzsx;
|
||||
}
|
||||
|
||||
public void setdBzsx(double dBzsx) {
|
||||
this.dBzsx = dBzsx;
|
||||
}
|
||||
|
||||
public double getdBzxx() {
|
||||
return dBzxx;
|
||||
}
|
||||
|
||||
public void setdBzxx(double dBzxx) {
|
||||
this.dBzxx = dBzxx;
|
||||
}
|
||||
|
||||
public double getdTotalC() {
|
||||
return dTotalC;
|
||||
}
|
||||
|
||||
public void setdTotalC(double dTotalC) {
|
||||
this.dTotalC = dTotalC;
|
||||
}
|
||||
|
||||
public double getdC2() {
|
||||
return dC2;
|
||||
}
|
||||
|
||||
public void setdC2(double dC2) {
|
||||
this.dC2 = dC2;
|
||||
}
|
||||
|
||||
public double getdC2j() {
|
||||
return dC2j;
|
||||
}
|
||||
|
||||
public void setdC2j(double dC2j) {
|
||||
this.dC2j = dC2j;
|
||||
}
|
||||
|
||||
public double getdC3j() {
|
||||
return dC3j;
|
||||
}
|
||||
|
||||
public void setdC3j(double dC3j) {
|
||||
this.dC3j = dC3j;
|
||||
}
|
||||
|
||||
public double getdC4j() {
|
||||
return dC4j;
|
||||
}
|
||||
|
||||
public void setdC4j(double dC4j) {
|
||||
this.dC4j = dC4j;
|
||||
}
|
||||
|
||||
public double getdC5j() {
|
||||
return dC5j;
|
||||
}
|
||||
|
||||
public void setdC5j(double dC5j) {
|
||||
this.dC5j = dC5j;
|
||||
}
|
||||
|
||||
public double getdC6j() {
|
||||
return dC6j;
|
||||
}
|
||||
|
||||
public void setdC6j(double dC6j) {
|
||||
this.dC6j = dC6j;
|
||||
}
|
||||
|
||||
public double getdC3C4() {
|
||||
return dC3C4;
|
||||
}
|
||||
|
||||
public void setdC3C4(double dC3C4) {
|
||||
this.dC3C4 = dC3C4;
|
||||
}
|
||||
|
||||
public String getDngComponents() {
|
||||
return dngComponents;
|
||||
}
|
||||
|
||||
public void setDngComponents(String dngComponents) {
|
||||
this.dngComponents = dngComponents;
|
||||
}
|
||||
|
||||
public double[] adMixtureD; // 气体质量组成 Composition in mole fraction
|
||||
public int dCbtj; // 参比条件 101325 0,15,20
|
||||
public double dPb; // 参比压力 Contract base Pressure (Pa)
|
||||
public double dTb; // 参比温度Contract base temperature (K)
|
||||
public double dPf; // 绝对压力 Absolute Pressure (Pa)
|
||||
public double dTf; // 工况温度 Flowing temperature (K)
|
||||
// basic output from AGA 8 Detail method
|
||||
public double dMrx; // 分子量 mixture molar mass
|
||||
public double dZb; // 标况压缩因子compressibility at contract base condition
|
||||
public double dZf; // 工况压缩因子compressibility at flowing condition
|
||||
public double dFpv; // 超压缩系数 supercompressibility
|
||||
public double dDb; // 标况摩尔密度molar density at contract base conditions (moles/dm3)
|
||||
public double dDf; // 工况摩尔密度 molar density at flowing conditions (moles/dm3)
|
||||
public double dRhob; // 标况质量密度mass density at contract base conditions (kg/m3)
|
||||
public double dRhof; // 工况质量密度 mass density at flowing conditions (kg/m3)
|
||||
public double dRD_Ideal; // 理想气体的相对密度ideal gas relative density
|
||||
public double dRD_Real; // 真实气体的相对密度real gas relative density
|
||||
// additional output
|
||||
public double dHo; // 理想气体的比焓 ideal gas specific enthalpy
|
||||
public double dH; // 真实气体的焓 real gas specific enthalpy (J/kg)
|
||||
public double dS; // 真实气体的熵real gas specific entropy (J/kg-mol.K)
|
||||
public double dCpi; // 理想气体定压热容 ideal gas constant pressure heat capacity (J/kg-mol.K)
|
||||
public double dCp; // 定压热容real gas constant pressure heat capacity (J/kg-mol.K)
|
||||
public double dCv; // 定容积热容 real gas constant volume heat capacity (J/kg-mol.K)
|
||||
public double dk; // 比热比ratio of specific heats
|
||||
public double dKappa; // 等熵指数 isentropic exponent, denoted with Greek letter kappa
|
||||
public double dSOS; // 声速speed of sound (m/s)
|
||||
public double dCstar; // 临界流函数 critical flow factor C*
|
||||
|
||||
// 11062 输出
|
||||
public double dHhvMol; // 摩尔高位发热量
|
||||
public double dLhvMol; // 摩尔低位发热量
|
||||
public double dHhvv; // 体积高位发热量
|
||||
public double dLhvv; // 体积低位发热量
|
||||
public double dHhvm; // 质量高位发热量
|
||||
public double dLhvm; // 质量地位发热量
|
||||
|
||||
public double dZb11062; // 标况压缩因子
|
||||
public double dRhob11062; // 标况质量密度mass density at contract base conditions (kg/m3)
|
||||
public double dRhof11062; // 工况质量密度 mass density at flowing conditions (kg/m3)
|
||||
public double dRD_Ideal11062; // 理想气体的相对密度ideal gas relative density
|
||||
public double dRD_Real11062; // 真实气体的相对密度real gas relative density
|
||||
public double dWobbeIndex; // 真实气体的沃泊指数
|
||||
|
||||
public double dPc; // 临界压力
|
||||
public double dTC; // 临界温度
|
||||
public double dBzsx; // 爆炸上限
|
||||
public double dBzxx; // 爆炸下限
|
||||
public double dTotalC; // 总炭含量 (kg/m3)
|
||||
public double dC2; // C2组分含量 (kg/m3)
|
||||
public double dC2j; // C2以上组分含量 (kg/m3)
|
||||
public double dC3j; // C3以上组分含量 (kg/m3)
|
||||
public double dC4j; // C4以上组分含量 (kg/m3)
|
||||
public double dC5j; // C5以上组分含量 (kg/m3)
|
||||
public double dC6j; // C6以上组分含量 (kg/m3)
|
||||
public double dC3C4; // C3C4组分含量 (kg/m3)
|
||||
public String dngComponents; //组分的组合字符串 从前端传过来
|
||||
|
||||
|
||||
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,139 @@
|
||||
package com.ruoyi.ngCalTools.service;
|
||||
|
||||
import com.ruoyi.ngCalTools.model.GasProps;
|
||||
import com.ruoyi.ngCalTools.utils.GasConstants;
|
||||
import org.springframework.stereotype.Service;
|
||||
@Service
|
||||
public class GBT11062Service {
|
||||
|
||||
int iNCC;// number of components
|
||||
int[] aiCID = new int[21];// component IDs
|
||||
double[] dXi = new double[21];// mole fraction of component i
|
||||
// 初始化 adTableMri 数组
|
||||
double[] adTableMri = { 16.0430, 28.0135, 44.0100, 30.0700, 44.0970, 18.0153, 34.0820, 2.0159, 28.0100, 31.9988, 58.1230, 58.1230, 72.1500, 72.1500, 86.1770, 100.2040, 114.2310, 128.2580, 142.2850, 4.0026, 39.9480 };
|
||||
// 初始化 adTablePc 数组
|
||||
double[] adTablePc = { 4.604, 3.399, 7.382, 4.88, 4.249, 22.118, 9.005, 1.297, 3.499, 5.081, 3.648, 3.797, 3.381, 3.369, 3.012, 2.736, 2.486, 0, 0, 0.2275, 4.876 };
|
||||
// 初始化 adTableTc 数组
|
||||
double[] adTableTc = { 190.55, 126.1, 304.19, 305.43, 369.82, 647.3, 373.5, 33.2, 132.92, 154.7, 408.13, 425.16, 460.39, 469.6, 507.4, 540.2, 568.76, 0, 0, 5.2, 150.82 };
|
||||
// 初始化 adTableBzsx 数组
|
||||
double[] adTableBzsx = { 15, 0, 0, 13, 9.5, 0, 45.5, 74.2, 74.2, 0, 8.4, 8.4, 8.3, 8.3, 7.7, 7.0, 0, 0, 0, 0, 0 };
|
||||
// 初始化 adTableBzxx 数组
|
||||
double[] adTableBzxx = { 5.0, 0, 0, 2.9, 2.1, 0, 4.3, 4.0, 12.5, 0, 1.8, 1.8, 1.4, 1.4, 1.2, 1.0, 0.96, 0, 0, 0, 0 };
|
||||
|
||||
|
||||
double[][] adTableZn = {
|
||||
{0.9976, 0.9995, 0.9933, 0.99, 0.9789, 0.93, 0.99, 1.0006, 0.9993, 0.999, 0.958, 0.9572, 0.9377, 0.918, 0.892, 0.83, 0.742, 0.613, 0.434, 1.0005, 0.999},
|
||||
{0.998, 0.9997, 0.9944, 0.9915, 0.9821, 0.945, 0.99, 1.0006, 0.9995, 0.9992, 0.968, 0.965, 0.948, 0.937, 0.913, 0.866, 0.802, 0.71, 0.584, 1.0005, 0.9992},
|
||||
{0.9981, 0.9997, 0.9944, 0.992, 0.9834, 0.952, 0.99, 1.0006, 0.9996, 0.9993, 0.971, 0.9682, 0.953, 0.945, 0.919, 0.876, 0.817, 0.735, 0.623, 1.0005, 0.9993}
|
||||
};
|
||||
|
||||
double[][] adTableSqrtbj = {
|
||||
{0.049, 0.0224, 0.0819, 0.1, 0.1453, 0.2646, 0.1, -0.004, 0.0265, 0.0316, 0.2049, 0.2069, 0.251, 0.2864, 0.3286, 0.4123, 0.5079, 0.6221, 0.7523, 0.0006, 0.0316},
|
||||
{0.0447, 0.0173, 0.0748, 0.0922, 0.1338, 0.2345, 0.1, -0.0048, 0.0224, 0.0283, 0.1789, 0.1871, 0.228, 0.251, 0.295, 0.3661, 0.445, 0.5385, 0.645, 0.0002, 0.0283},
|
||||
{0.0436, 0.0173, 0.0728, 0.0894, 0.1288, 0.2191, 0.1, -0.0051, 0.02, 0.0265, 0.1703, 0.1783, 0.2168, 0.2345, 0.2846, 0.3521, 0.4278, 0.5148, 0.614, 0, 0.0265}
|
||||
};
|
||||
|
||||
double[][] adTableHhvMol = {
|
||||
{892.97, 0, 0, 1564.34, 2224.01, 45.074, 562.94, 286.63, 282.8, 0, 2874.2, 2883.82, 3535.98, 3542.89, 4203.23, 4862.87, 5522.4, 6182.91, 6842.69, 0, 0},
|
||||
{891.56, 0, 0, 1562.14, 2221.1, 44.433, 562.38, 286.15, 282.91, 0, 2870.58, 2879.76, 3531.68, 3538.6, 4198.24, 4857.18, 5516.01, 6175.82, 6834.9, 0, 0},
|
||||
{891.09, 0, 0, 1561.41, 2220.13, 44.224, 562.19, 285.99, 282.95, 0, 2869.38, 2878.57, 3530.24, 3537.17, 4196.58, 4855.29, 5513.88, 6173.46, 6832.31, 0, 0},
|
||||
{890.63, 0, 0, 1560.69, 2219.17, 44.016, 562.01, 285.83, 282.98, 0, 2868.2, 2877.4, 3528.83, 3535.77, 4194.95, 4853.43, 5511.8, 6171.15, 6829.77, 0, 0}
|
||||
};
|
||||
|
||||
double[][] adTableLhvMol = {
|
||||
{802.82, 0, 0, 1429.12, 2043.71, 0, 517.87, 241.56, 282.8, 0, 2648.83, 2658.45, 3265.54, 3272.45, 3887.71, 4502.28, 5116.73, 5732.17, 6346.88, 0, 0},
|
||||
{802.69, 0, 0, 1428.84, 2043.37, 0, 517.95, 241.72, 282.91, 0, 2648.42, 2657.6, 3265.08, 3272, 3887.21, 4501.72, 5116.11, 5731.49, 6346.14, 0, 0},
|
||||
{802.65, 0, 0, 1428.74, 2043.23, 0, 517.97, 241.76, 282.95, 0, 2648.26, 2657.45, 3264.89, 3271.83, 3887.01, 4501.49, 5115.87, 5731.22, 6345.85, 0, 0},
|
||||
{802.6, 0, 0, 1428.64, 2043.11, 0, 517.99, 241.81, 282.98, 0, 2648.12, 2657.32, 3264.73, 3271.67, 3886.84, 4501.3, 5115.66, 5730.99, 6345.59, 0, 0}
|
||||
};
|
||||
int i;
|
||||
|
||||
double dMair = 28.9626;
|
||||
double dZair = 0;
|
||||
|
||||
public void Run(GasProps gasProps) {
|
||||
for (int i = 0; i < GasConstants.NUMBEROFCOMPONENTS; i++) dXi[i] = 0;
|
||||
iNCC = -1;
|
||||
for (i = 0; i < GasConstants.NUMBEROFCOMPONENTS; i++) {
|
||||
if (gasProps.adMixture[i] > 0.0) {
|
||||
iNCC = iNCC + 1;
|
||||
aiCID[iNCC] = i;
|
||||
dXi[iNCC] = gasProps.adMixture[i];
|
||||
}
|
||||
}
|
||||
iNCC = iNCC + 1;
|
||||
|
||||
for (i = 0; i < GasConstants.NUMBEROFCOMPONENTS; i++) {
|
||||
if (gasProps.adMixture[i] != 0) {
|
||||
gasProps.dPc += adTablePc[i] * gasProps.adMixture[i];
|
||||
gasProps.dTC += adTableTc[i] * gasProps.adMixture[i];
|
||||
if (adTableBzsx[i] != 0) {
|
||||
gasProps.dBzsx += gasProps.adMixture[i] / adTableBzsx[i];
|
||||
gasProps.dBzxx += gasProps.adMixture[i] / adTableBzxx[i];
|
||||
}
|
||||
|
||||
if (i >= 10 & i <= 18) {
|
||||
gasProps.dC4j += gasProps.adMixture[i] * adTableMri[i];
|
||||
}
|
||||
if (i >= 12 & i <= 18) {
|
||||
gasProps.dC5j += gasProps.adMixture[i] * adTableMri[i];
|
||||
}
|
||||
if (i >= 14 & i <= 18) {
|
||||
gasProps.dC6j += gasProps.adMixture[i] * adTableMri[i];
|
||||
}
|
||||
if (i == 3) {
|
||||
gasProps.dC2 += gasProps.adMixture[i] * adTableMri[i];
|
||||
}
|
||||
|
||||
switch (gasProps.dCbtj) {
|
||||
case 2:
|
||||
gasProps.dZb11062 += adTableSqrtbj[0][i] * gasProps.adMixture[i];
|
||||
gasProps.dHhvMol += adTableHhvMol[0][i] * gasProps.adMixture[i];
|
||||
gasProps.dLhvMol += adTableLhvMol[0][i] * gasProps.adMixture[i];
|
||||
dZair = 0.99941;
|
||||
break;
|
||||
case 1:
|
||||
gasProps.dZb11062 += adTableSqrtbj[1][i] * gasProps.adMixture[i];
|
||||
gasProps.dHhvMol += adTableHhvMol[1][i] * gasProps.adMixture[i];
|
||||
gasProps.dLhvMol += adTableLhvMol[1][i] * gasProps.adMixture[i];
|
||||
dZair = 0.99958;
|
||||
break;
|
||||
case 0:
|
||||
gasProps.dZb11062 += adTableSqrtbj[2][i] * gasProps.adMixture[i];
|
||||
gasProps.dHhvMol += adTableHhvMol[2][i] * gasProps.adMixture[i];
|
||||
gasProps.dLhvMol += adTableLhvMol[2][i] * gasProps.adMixture[i];
|
||||
dZair = 0.99963;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
gasProps.dBzsx = 1 / gasProps.dBzsx;
|
||||
gasProps.dBzxx = 1 / gasProps.dBzxx;
|
||||
gasProps.dZb11062 = 1 - gasProps.dZb11062 * gasProps.dZb11062;
|
||||
gasProps.dHhvm = gasProps.dHhvMol / gasProps.dMrx;
|
||||
gasProps.dLhvm = gasProps.dLhvMol / gasProps.dMrx;
|
||||
gasProps.dHhvv = gasProps.dHhvMol * gasProps.dPb / gasProps.dTb / 8314.510 / gasProps.dZb11062;
|
||||
gasProps.dLhvv = gasProps.dLhvMol * gasProps.dPb / gasProps.dTb / 8314.510 / gasProps.dZb11062;
|
||||
gasProps.dRD_Ideal11062 = gasProps.dMrx / dMair;
|
||||
gasProps.dRD_Real11062 = gasProps.dRD_Ideal11062 * dZair / gasProps.dZb11062;
|
||||
|
||||
gasProps.dRhob11062 = gasProps.dMrx * gasProps.dPb / 8314.51 / gasProps.dTb / gasProps.dZb11062;
|
||||
gasProps.dRhof11062 = gasProps.dMrx * gasProps.dPf / 8314.51 / gasProps.dTf / gasProps.dZf;
|
||||
gasProps.dWobbeIndex = gasProps.dHhvv / Math.sqrt(gasProps.dRD_Real11062);
|
||||
gasProps.dC3j = gasProps.dC4j + gasProps.adMixture[4] * adTableMri[4];
|
||||
gasProps.dC2j = gasProps.dC3j + gasProps.adMixture[3] * adTableMri[3];
|
||||
gasProps.dC3C4 = gasProps.adMixture[4] * adTableMri[4] + gasProps.adMixture[10] * adTableMri[10] + gasProps.adMixture[11] * adTableMri[11];
|
||||
gasProps.dTotalC = gasProps.dC2j + gasProps.adMixture[0] * adTableMri[0];
|
||||
|
||||
gasProps.dTotalC = gasProps.dTotalC * gasProps.dPb / 8314.51 / gasProps.dTb / gasProps.dZb11062;
|
||||
gasProps.dC2 = gasProps.dC2 * gasProps.dPb / 8314.51 / gasProps.dTb / gasProps.dZb11062;
|
||||
gasProps.dC3C4 = gasProps.dC3C4 * gasProps.dPb / 8314.51 / gasProps.dTb / gasProps.dZb11062;
|
||||
gasProps.dC2j = gasProps.dC2j * gasProps.dPb / 8314.51 / gasProps.dTb / gasProps.dZb11062;
|
||||
gasProps.dC3j = gasProps.dC3j * gasProps.dPb / 8314.51 / gasProps.dTb / gasProps.dZb11062;
|
||||
gasProps.dC4j = gasProps.dC4j * gasProps.dPb / 8314.51 / gasProps.dTb / gasProps.dZb11062;
|
||||
gasProps.dC5j = gasProps.dC5j * gasProps.dPb / 8314.51 / gasProps.dTb / gasProps.dZb11062;
|
||||
gasProps.dC6j = gasProps.dC6j * gasProps.dPb / 8314.51 / gasProps.dTb / gasProps.dZb11062;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,430 @@
|
||||
package com.ruoyi.ngCalTools.service;
|
||||
|
||||
import com.ruoyi.ngCalTools.model.GasProps;
|
||||
import com.ruoyi.ngCalTools.utils.GasConstants;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
public class ThermService {
|
||||
private static final double CAL_TH = 4.1840;
|
||||
public int coefA = 0;
|
||||
public int coefB = 1;
|
||||
public int coefC = 2;
|
||||
public int coefD = 3;
|
||||
public int coefE = 4;
|
||||
public int coefF = 5;
|
||||
public int coefG = 6;
|
||||
public int coefH = 7;
|
||||
public int coefI = 8;
|
||||
public int coefJ = 9;
|
||||
public int coefK = 10;
|
||||
|
||||
double dPdD;// partial deriv of P wrt D
|
||||
double dPdT;// partial deriv of P wrt T
|
||||
double dSi;// ideal gas specific entropy, kJ/kg.K
|
||||
double dTold;// temperature previously used
|
||||
double dMrxold;// mixture molar mass previously used
|
||||
//set the number of points for quadrature
|
||||
int GK_points = 5;
|
||||
// 初始化 GK_root 数组
|
||||
double[] GK_root = { 0.14887433898163121088, 0.43339539412924719080, 0.67940956829902440263, 0.86506336668898451073, 0.97390652851717172008 };
|
||||
// 初始化 GK_weight 数组
|
||||
double[] GK_weight = { 0.29552422471475286217, 0.26926671930999634918, 0.21908636251598204295, 0.14945134915058059038, 0.066671344308688137179 };
|
||||
|
||||
private final double[][] ThermConstants = {
|
||||
{-29776.4, 7.95454, 43.9417, 1037.09, 1.56373, 813.205, -24.9027, 1019.98, -10.1601, 1070.14, -20.0615},
|
||||
{-3495.34, 6.95587, 0.272892, 662.738, -0.291318, -680.562, 1.78980, 1740.06, 0.0, 100.0, 4.49823},
|
||||
{20.7307, 6.96237, 2.68645, 500.371, -2.56429, -530.443, 3.91921, 500.198, 2.13290, 2197.22, 5.81381},
|
||||
{-37524.4, 7.98139, 24.3668, 752.320, 3.53990, 272.846, 8.44724, 1020.13, -13.2732, 869.510, -22.4010},
|
||||
{-56072.1, 8.14319, 37.0629, 735.402, 9.38159, 247.190, 13.4556, 1454.78, -11.7342, 984.518, -24.0426},
|
||||
{-13773.1, 7.97183, 6.27078, 2572.63, 2.05010, 1156.72, 0.0, 100.0, 0.0, 100.0, -3.24989},
|
||||
{-10085.4, 7.94680, -0.08380, 433.801, 2.85539, 843.792, 6.31595, 1481.43, -2.88457, 1102.23, -0.51551},
|
||||
{-5565.60, 6.66789, 2.33458, 2584.98, 0.749019, 559.656, 0.0, 100.0, 0.0, 100.0, -7.94821},
|
||||
{-2753.49, 6.95854, 2.02441, 1541.22, 0.096774, 3674.81, 0.0, 100.0, 0.0, 100.0, 6.23387},
|
||||
{-3497.45, 6.96302, 2.40013, 2522.05, 2.21752, 1154.15, 0.0, 100.0, 0.0, 100.0, 9.19749},
|
||||
{-72387.0, 17.8143, 58.2062, 1787.39, 40.7621, 808.645, 0.0, 100.0, 0.0, 100.0, -44.1341},
|
||||
{-72674.8, 18.6383, 57.4178, 1792.73, 38.6599, 814.151, 0.0, 100.0, 0.0, 100.0, -46.1938},
|
||||
{-91505.5, 21.3861, 74.3410, 1701.58, 47.0587, 775.899, 0.0, 100.0, 0.0, 100.0, -60.2474},
|
||||
{-83845.2, 22.5012, 69.5789, 1719.58, 46.2164, 802.174, 0.0, 100.0, 0.0, 100.0, -62.2197},
|
||||
{-94982.5, 26.6225, 80.3819, 1718.49, 55.6598, 802.069, 0.0, 100.0, 0.0, 100.0, -77.5366},
|
||||
{-103353.0, 30.4029, 90.6941, 1669.32, 63.2028, 786.001, 0.0, 100.0, 0.0, 100.0, -92.0164},
|
||||
{-109674.0, 34.0847, 100.253, 1611.55, 69.7675, 768.847, 0.0, 100.0, 0.0, 100.0, -106.149},
|
||||
{-122599.0, 38.5014, 111.446, 1646.48, 80.5015, 781.588, 0.0, 100.0, 0.0, 100.0, -122.444},
|
||||
{-133564.0, 42.7143, 122.173, 1654.85, 90.2255, 785.564, 0.0, 100.0, 0.0, 100.0, -138.006},
|
||||
{0.0, 4.9680, 0.0, 100.0, 0.0, 100.0, 0.0, 100.0, 0.0, 100.0, 0.0},
|
||||
{0.0, 4.9680, 0.0, 100.0, 0.0, 100.0, 0.0, 100.0, 0.0, 100.0, 0.0}
|
||||
};
|
||||
public ThermService()
|
||||
{
|
||||
// initialize 3 history-sensitive variables
|
||||
dSi = 0.0;
|
||||
dTold = 0.0;
|
||||
dMrxold = 0.0;
|
||||
}
|
||||
|
||||
public void Run(GasProps gasProps, DetailService detailService)
|
||||
{
|
||||
//local variables
|
||||
double c, x, y, z;
|
||||
//first run basic set of functions within AGA 8 (1994) Detail Method
|
||||
detailService.run(gasProps);
|
||||
//find first partial derivative of Z wrt D
|
||||
detailService.dZdD(gasProps.dDf);
|
||||
//find real gas cv, cp, specific enthalpy and entropy
|
||||
CprCvrHS(gasProps, detailService);
|
||||
//ratio of real gas specific heats
|
||||
gasProps.dk = gasProps.dCp / gasProps.dCv;
|
||||
//solve c in three steps, for clarity and ease of debugging
|
||||
x = gasProps.dk * GasConstants.RGAS * 1000.0 * gasProps.dTf;
|
||||
y = gasProps.dMrx;
|
||||
z = gasProps.dZf + gasProps.dDf * detailService.ddZdD;
|
||||
//calculate c, which is SOS^2
|
||||
c = (x / y) * z;
|
||||
//speed of sound
|
||||
gasProps.dSOS = Math.sqrt(c);
|
||||
//calculate the real gas isentropic exponent
|
||||
//using expression functionally equivalent to Equation 3.2
|
||||
gasProps.dKappa = (c * gasProps.dRhof) / gasProps.dPf;
|
||||
return;
|
||||
}
|
||||
private double CpiMolar(GasProps gasProps) {
|
||||
double cp = 0.0;
|
||||
double Cpx;
|
||||
double DT, FT, HT, JT;
|
||||
double Dx, Fx, Hx, Jx;
|
||||
double T;
|
||||
T = gasProps.dTf;
|
||||
for (int i = 0; i < GasConstants.NUMBEROFCOMPONENTS; i++) {
|
||||
if (gasProps.getAdMixture()[i] > 0) {
|
||||
// 计算每个组分的贡献
|
||||
Cpx = 0.0;
|
||||
// calculate species intermediate terms
|
||||
DT = ThermConstants[i][ coefD] / T;
|
||||
FT = ThermConstants[i][ coefF] / T;
|
||||
HT = ThermConstants[i][ coefH] / T;
|
||||
JT = ThermConstants[i][ coefJ] / T;
|
||||
// use intermediate terms to avoid redundant calcs
|
||||
Dx = DT / Math.sinh(DT);
|
||||
Fx = FT / Math.cosh(FT);
|
||||
Hx = HT / Math.sinh(HT);
|
||||
Jx = JT / Math.cosh(JT);
|
||||
Cpx += ThermConstants[i][ coefB];
|
||||
Cpx += ThermConstants[i][ coefC] * Dx * Dx;
|
||||
Cpx += ThermConstants[i][ coefE] * Fx * Fx;
|
||||
Cpx += ThermConstants[i][ coefG] * Hx * Hx;
|
||||
Cpx += ThermConstants[i][ coefI] * Jx * Jx;
|
||||
//use current mole fraction to weight the contribution
|
||||
Cpx *= gasProps.adMixture[i];
|
||||
//add this contribution to the sum
|
||||
cp += Cpx;
|
||||
}
|
||||
}
|
||||
return cp * CAL_TH;
|
||||
}
|
||||
// coth 函数实现
|
||||
private static double coth(double x) {
|
||||
return 1.0 / Math.tanh(x);
|
||||
}
|
||||
// Ho 函数
|
||||
public double Ho(GasProps gasProps) {
|
||||
double H = 0.0;
|
||||
double Hx;
|
||||
double DT, FT, HT, JT;
|
||||
double cothDT, tanhFT, cothHT, tanhJT;
|
||||
double T = gasProps.dTf;
|
||||
|
||||
for (int i = 0; i < GasConstants.NUMBEROFCOMPONENTS; i++) {
|
||||
if (gasProps.adMixture[i] <= 0.0) continue;
|
||||
Hx = 0.0;
|
||||
|
||||
DT = ThermConstants[i][coefD] / T;
|
||||
FT = ThermConstants[i][coefF] / T;
|
||||
HT = ThermConstants[i][coefH] / T;
|
||||
JT = ThermConstants[i][coefJ] / T;
|
||||
|
||||
cothDT = coth(DT);
|
||||
tanhFT = Math.tanh(FT);
|
||||
cothHT = coth(HT);
|
||||
tanhJT = Math.tanh(JT);
|
||||
|
||||
Hx += ThermConstants[i][coefA];
|
||||
Hx += ThermConstants[i][coefB] * T;
|
||||
Hx += ThermConstants[i][coefC] * ThermConstants[i][coefD] * cothDT;
|
||||
Hx -= ThermConstants[i][coefE] * ThermConstants[i][coefF] * tanhFT;
|
||||
Hx += ThermConstants[i][coefG] * ThermConstants[i][coefH] * cothHT;
|
||||
Hx -= ThermConstants[i][coefI] * ThermConstants[i][coefJ] * tanhJT;
|
||||
|
||||
Hx *= gasProps.adMixture[i];
|
||||
H += Hx;
|
||||
}
|
||||
|
||||
H *= CAL_TH;
|
||||
H /= gasProps.dMrx;
|
||||
return H * 1000.0;
|
||||
}
|
||||
|
||||
// So 函数
|
||||
public double So(GasProps gasProps) {
|
||||
double S = 0.0;
|
||||
double Sx;
|
||||
double DT, FT, HT, JT;
|
||||
double cothDT, tanhFT, cothHT, tanhJT;
|
||||
double sinhDT, coshFT, sinhHT, coshJT;
|
||||
double T = gasProps.dTf;
|
||||
|
||||
for (int i = 0; i < GasConstants.NUMBEROFCOMPONENTS; i++) {
|
||||
if (gasProps.adMixture[i] <= 0.0) continue;
|
||||
Sx = 0.0;
|
||||
|
||||
DT = ThermConstants[i][coefD] / T;
|
||||
FT = ThermConstants[i][coefF] / T;
|
||||
HT = ThermConstants[i][coefH] / T;
|
||||
JT = ThermConstants[i][coefJ] / T;
|
||||
|
||||
cothDT = coth(DT);
|
||||
tanhFT = Math.tanh(FT);
|
||||
cothHT = coth(HT);
|
||||
tanhJT = Math.tanh(JT);
|
||||
|
||||
sinhDT = Math.sinh(DT);
|
||||
coshFT = Math.cosh(FT);
|
||||
sinhHT = Math.sinh(HT);
|
||||
coshJT = Math.cosh(JT);
|
||||
|
||||
Sx += ThermConstants[i][coefK];
|
||||
Sx += ThermConstants[i][coefB] * Math.log(T);
|
||||
Sx += ThermConstants[i][coefC] * (DT * cothDT - Math.log(sinhDT));
|
||||
Sx -= ThermConstants[i][coefE] * (FT * tanhFT - Math.log(coshFT));
|
||||
Sx += ThermConstants[i][coefG] * (HT * cothHT - Math.log(sinhHT));
|
||||
Sx -= ThermConstants[i][coefI] * (JT * tanhJT - Math.log(coshJT));
|
||||
|
||||
Sx *= gasProps.adMixture[i];
|
||||
S += Sx;
|
||||
}
|
||||
|
||||
S *= CAL_TH;
|
||||
S /= gasProps.dMrx;
|
||||
return S * 1000.0;
|
||||
}
|
||||
|
||||
// CprCvrHS 函数
|
||||
public void CprCvrHS(GasProps gasProps, DetailService detailService) {
|
||||
double Cvinc = 0.0;
|
||||
double Cvr, Cpr;
|
||||
double Hinc = 0.0;
|
||||
double Sinc = 0.0;
|
||||
double Smixing = 0.0;
|
||||
double Cp = CpiMolar(gasProps);
|
||||
double Si;
|
||||
|
||||
gasProps.dHo = Ho(gasProps);
|
||||
Si = So(gasProps);
|
||||
|
||||
gasProps.dCpi = (Cp * 1000.0) / gasProps.dMrx;
|
||||
|
||||
for (int i = 0; i < GK_points; i++) {
|
||||
double x = gasProps.dDf * (1.0 + GK_root[i]) / 2.0;
|
||||
detailService.zdetail(x);
|
||||
detailService.dZdT(x);
|
||||
detailService.d2ZdT2(x);
|
||||
|
||||
Hinc += GK_weight[i] * detailService.ddZdT / x;
|
||||
Cvinc += GK_weight[i] * (2.0 * detailService.ddZdT + gasProps.dTf * detailService.dd2ZdT2) / x;
|
||||
Sinc += GK_weight[i] * (detailService.dZ + gasProps.dTf * detailService.ddZdT - 1.0) / x;
|
||||
|
||||
x = gasProps.dDf * (1.0 - GK_root[i]) / 2.0;
|
||||
detailService.zdetail(x);
|
||||
detailService.dZdT(x);
|
||||
detailService.d2ZdT2(x);
|
||||
|
||||
Hinc += GK_weight[i] * detailService.ddZdT / x;
|
||||
Cvinc += GK_weight[i] * (2.0 * detailService.ddZdT + gasProps.dTf * detailService.dd2ZdT2) / x;
|
||||
Sinc += GK_weight[i] * (detailService.dZ + gasProps.dTf * detailService.ddZdT - 1.0) / x;
|
||||
}
|
||||
|
||||
detailService.zdetail(gasProps.dDf);
|
||||
detailService.dZdT(gasProps.dDf);
|
||||
detailService.d2ZdT2(gasProps.dDf);
|
||||
|
||||
Cvr = Cp - GasConstants.RGAS * (1.0 + gasProps.dTf * Cvinc * 0.5 * gasProps.dDf);
|
||||
|
||||
double a = (gasProps.dZf + gasProps.dTf * detailService.ddZdT);
|
||||
double b = (gasProps.dZf + gasProps.dDf * detailService.ddZdD);
|
||||
|
||||
double dPdT =GasConstants. RGAS * gasProps.dDf * a;
|
||||
double dPdD = GasConstants.RGAS * gasProps.dTf * b;
|
||||
|
||||
Cpr = Cvr + GasConstants.RGAS * ((a * a) / b);
|
||||
|
||||
Cpr /= gasProps.dMrx;
|
||||
Cvr /= gasProps.dMrx;
|
||||
|
||||
gasProps.dCv = Cvr * 1000.0;
|
||||
gasProps.dCp = Cpr * 1000.0;
|
||||
|
||||
gasProps.dH = gasProps.dHo + 1000.0 * GasConstants.RGAS * gasProps.dTf * (gasProps.dZf - 1.0 - gasProps.dTf * Hinc * 0.5 * gasProps.dDf) / gasProps.dMrx;
|
||||
|
||||
for (int i = 0; i < GasConstants.NUMBEROFCOMPONENTS; i++) {
|
||||
if (gasProps.adMixture[i] != 0) Smixing += gasProps.adMixture[i] * Math.log(gasProps.adMixture[i]);
|
||||
}
|
||||
Smixing *= GasConstants.RGAS;
|
||||
|
||||
gasProps.dS = Si - Smixing - 1000.0 * GasConstants.RGAS * (Math.log(gasProps.dPf / 101325.0) - Math.log(gasProps.dZf) + Sinc * 0.5 * gasProps.dDf) / gasProps.dMrx;
|
||||
}
|
||||
|
||||
// HS_Mode 函数
|
||||
public void HS_Mode( GasProps gasProps, DetailService detailService, double H, double S, boolean bGuess) {
|
||||
double s0 = S;
|
||||
double h0 = H;
|
||||
double t1, t2, tmin, tmax;
|
||||
double p1, p2, px, pmin, pmax;
|
||||
double delta1, delta2;
|
||||
double tolerance = 0.001;
|
||||
if (bGuess) {
|
||||
t1 = gasProps.dTf;
|
||||
px = gasProps.dPf;
|
||||
pmax = px * 2.0;
|
||||
pmin = px * 0.1;
|
||||
tmax = t1 * 1.5;
|
||||
tmin = t1 * 0.67;
|
||||
} else {
|
||||
t1 = 273.15;
|
||||
px = 1013250.0;
|
||||
pmax = GasConstants.P_MAX;
|
||||
pmin = 10000.0;
|
||||
tmax = GasConstants.T_MAX;
|
||||
tmin = GasConstants.T_MIN;
|
||||
}
|
||||
|
||||
t2 = t1 + 10.0;
|
||||
|
||||
detailService.run(gasProps);
|
||||
double h1 = H(gasProps, detailService) - h0;
|
||||
|
||||
for (int i = 0; i < GasConstants.MAX_NUM_OF_ITERATIONS; i++) {
|
||||
gasProps.dTf = t2;
|
||||
p1 = px;
|
||||
p2 = px * 0.1;
|
||||
gasProps.dPf = p1;
|
||||
detailService.run(gasProps);
|
||||
double s1 = S(gasProps, detailService) - s0;
|
||||
|
||||
for (int j = 0; j < GasConstants.MAX_NUM_OF_ITERATIONS; j++) {
|
||||
gasProps.dPf = p2;
|
||||
detailService.run(gasProps);
|
||||
double s2 = S(gasProps, detailService) - s0;
|
||||
|
||||
delta2 = Math.abs(s1 - s2) / s0;
|
||||
if (delta2 < tolerance) break;
|
||||
|
||||
double p0 = p2;
|
||||
p2 = (p1 * s2 - p2 * s1) / (s2 - s1);
|
||||
|
||||
if (p2 <= pmin) p2 = pmin;
|
||||
if (p2 >= pmax) p2 = pmax;
|
||||
|
||||
p1 = p0;
|
||||
s1 = s2;
|
||||
}
|
||||
|
||||
if (gasProps.lStatus == GasConstants.MAX_NUM_OF_ITERATIONS_EXCEEDED) break;
|
||||
|
||||
double h2 = H(gasProps, detailService) - h0;
|
||||
delta1 = Math.abs(h1 - h2) / h0;
|
||||
|
||||
if (delta1 < tolerance && i > 0) break;
|
||||
|
||||
double t0 = t2;
|
||||
t2 = (t1 * h2 - t2 * h1) / (h2 - h1);
|
||||
|
||||
if (t2 >= tmax) t2 = tmax;
|
||||
if (t2 <= tmin) {
|
||||
t2 = t0 + 10.0;
|
||||
gasProps.dTf = t2;
|
||||
detailService.run(gasProps);
|
||||
h2 = H(gasProps, detailService) - h0;
|
||||
}
|
||||
|
||||
t1 = t0;
|
||||
h1 = h2;
|
||||
}
|
||||
|
||||
if (gasProps.lStatus == GasConstants.MAX_NUM_OF_ITERATIONS_EXCEEDED) {
|
||||
gasProps.lStatus = GasConstants.MAX_NUM_OF_ITERATIONS_EXCEEDED;
|
||||
}
|
||||
}
|
||||
|
||||
// H 函数
|
||||
public double H(GasProps gasProps, DetailService detailService) {
|
||||
double Hinc = 0.0;
|
||||
gasProps.dHo = Ho(gasProps);
|
||||
|
||||
for (int i = 0; i < GK_points; i++) {
|
||||
double x = gasProps.dDf * (1.0 + GK_root[i]) / 2.0;
|
||||
detailService.zdetail(x);
|
||||
detailService.dZdT(x);
|
||||
detailService.d2ZdT2(x);
|
||||
|
||||
Hinc += GK_weight[i] * detailService.ddZdT / x;
|
||||
if (i == 10) break;
|
||||
|
||||
x = gasProps.dDf * (1.0 - GK_root[i]) / 2.0;
|
||||
detailService.zdetail(x);
|
||||
detailService.dZdT(x);
|
||||
detailService.d2ZdT2(x);
|
||||
|
||||
Hinc += GK_weight[i] * detailService.ddZdT / x;
|
||||
}
|
||||
|
||||
detailService.zdetail(gasProps.dDf);
|
||||
detailService.dZdT(gasProps.dDf);
|
||||
detailService.d2ZdT2(gasProps.dDf);
|
||||
|
||||
gasProps.dH = gasProps.dHo + 1000.0 * GasConstants.RGAS * gasProps.dTf * (gasProps.dZf - 1.0 - gasProps.dTf * Hinc * 0.5 * gasProps.dDf) / gasProps.dMrx;
|
||||
return gasProps.dH;
|
||||
}
|
||||
|
||||
|
||||
|
||||
double S(GasProps gasProps, DetailService detailService)
|
||||
{
|
||||
double Sinc; double Smixing; double x;
|
||||
int i;
|
||||
//initialize integral
|
||||
Sinc = 0.0;
|
||||
//initialize entropy of mixing
|
||||
Smixing = 0.0;
|
||||
//integrate partial derivatives from D=0 to D=D, applying Gauss-Kronrod quadrature
|
||||
for (i = 0; i <GK_points ; i++)
|
||||
{
|
||||
//calculate 1st and 2nd partial derivatives of Z wrt T
|
||||
x = gasProps.dDf * (1.0 + GK_root[i]) / 2.0; detailService.zdetail(x);
|
||||
detailService.dZdT(x); detailService.d2ZdT2(x);
|
||||
Sinc += GK_weight[i] * (detailService.dZ + gasProps.dTf * detailService.ddZdT - 1.0) / x;
|
||||
if (i == 10) break;
|
||||
x = gasProps.dDf * (1.0 - GK_root[i]) / 2.0; detailService.zdetail(x);
|
||||
detailService.dZdT(x); detailService.d2ZdT2(x);
|
||||
Sinc += GK_weight[i] * (detailService.dZ + gasProps.dTf * detailService.ddZdT - 1.0) / x;
|
||||
}
|
||||
//reset Z and partial deivatives dZdT and d2ZdT2
|
||||
detailService.zdetail(gasProps.dDf);
|
||||
detailService.dZdT(gasProps.dDf);
|
||||
detailService.d2ZdT2(gasProps.dDf);
|
||||
//find ideal gas entropy, but only if temperature or composition have changed
|
||||
if (gasProps.dTf != dTold || gasProps.dMrx != dMrxold)
|
||||
{
|
||||
dSi = So(gasProps); dTold = gasProps.dTf; dMrxold = gasProps.dMrx;
|
||||
}
|
||||
//calculate entropy of mixing
|
||||
for (i = 0; i < GasConstants.NUMBEROFCOMPONENTS; i++)
|
||||
{
|
||||
if (gasProps.adMixture[i] != 0) Smixing += gasProps.adMixture[i] * Math.log(gasProps.adMixture[i]);
|
||||
}
|
||||
Smixing *= GasConstants.RGAS;
|
||||
// calculate specific entropy
|
||||
gasProps.dS = dSi - Smixing - 1000.0 * GasConstants.RGAS * (Math.log(gasProps.dPf / 101325.0) - Math.log(gasProps.dZf) + Sinc * 0.5 * gasProps.dDf) / gasProps.dMrx;
|
||||
return (gasProps.dS);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,29 @@
|
||||
package com.ruoyi.ngCalTools.utils;
|
||||
|
||||
public final class GasConstants {
|
||||
public static final int NORMAL = 9000;
|
||||
public static final int NG_Cal_INITIALIZED = 9001;
|
||||
public static final int MEMORY_ALLOCATION_ERROR = 9002;
|
||||
public static final int GENERAL_CALCULATION_FAILURE = 9003;
|
||||
public static final int MAX_NUM_OF_ITERATIONS_EXCEEDED = 9004;
|
||||
public static final int NEGATIVE_DENSITY_DERIVATIVE = 9005;
|
||||
public static final int MAX_DENSITY_IN_BRAKET_EXCEEDED = 9006;
|
||||
/* 天然气组分个数 */
|
||||
public static final int NUMBEROFCOMPONENTS = 21;
|
||||
/* maximum number of tries within search routines */
|
||||
public static final int MAX_NUM_OF_ITERATIONS = 100;
|
||||
/* default tolerance limits */
|
||||
public static final double P_CHG_TOL = 0.001; /* 0.001 Pa */
|
||||
public static final double T_CHG_TOL = 0.001; /* 0.001 of a Kelvin */
|
||||
/* maximum allowable P & T */
|
||||
public static final double P_MAX = 1.379e8; // maximum pressure (Pa) ~= 20,000 psi
|
||||
public static final double P_MIN = 0.0; // maximum pressure = 0
|
||||
public static final double T_MAX = 473.15; // maximum temperature (K) ~= 392 F
|
||||
public static final double T_MIN = 143.0; // maximum temperature (K) ~= -200 F
|
||||
/* universal gas constant, in two configurations */
|
||||
public static final double RGASKJ = 8.314510e-3; /* in kJ mol^-1 K^-1 */
|
||||
public static final double RGAS = 8.314510; /* in J mol^-1 K^-1 */
|
||||
/* the main data structure used by this library */
|
||||
|
||||
// 其他常量...
|
||||
}
|
||||
@ -0,0 +1,104 @@
|
||||
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));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,104 @@
|
||||
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));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,104 @@
|
||||
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));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,104 @@
|
||||
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));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,419 @@
|
||||
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();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,811 @@
|
||||
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();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,363 @@
|
||||
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();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,825 @@
|
||||
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();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package com.ruoyi.ngtools.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.ngtools.domain.NgComponents;
|
||||
|
||||
/**
|
||||
* 天然气组分Mapper接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-02-09
|
||||
*/
|
||||
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);
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package com.ruoyi.ngtools.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.ngtools.domain.NgMeterpar;
|
||||
|
||||
/**
|
||||
* 流量计参数Mapper接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-02-09
|
||||
*/
|
||||
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);
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package com.ruoyi.ngtools.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.ngtools.domain.NgMeterresult;
|
||||
|
||||
/**
|
||||
* 流量计算结果Mapper接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-02-09
|
||||
*/
|
||||
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);
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package com.ruoyi.ngtools.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.ngtools.domain.NgNgpar;
|
||||
|
||||
/**
|
||||
* 天然气物性参数Mapper接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-02-09
|
||||
*/
|
||||
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);
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package com.ruoyi.ngtools.service;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.ngtools.domain.NgComponents;
|
||||
|
||||
/**
|
||||
* 天然气组分Service接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-02-09
|
||||
*/
|
||||
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);
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package com.ruoyi.ngtools.service;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.ngtools.domain.NgMeterpar;
|
||||
|
||||
/**
|
||||
* 流量计参数Service接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-02-09
|
||||
*/
|
||||
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);
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package com.ruoyi.ngtools.service;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.ngtools.domain.NgMeterresult;
|
||||
|
||||
/**
|
||||
* 流量计算结果Service接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-02-09
|
||||
*/
|
||||
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);
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package com.ruoyi.ngtools.service;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.ngtools.domain.NgNgpar;
|
||||
|
||||
/**
|
||||
* 天然气物性参数Service接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-02-09
|
||||
*/
|
||||
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);
|
||||
}
|
||||
@ -0,0 +1,96 @@
|
||||
package com.ruoyi.ngtools.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.ngtools.mapper.NgComponentsMapper;
|
||||
import com.ruoyi.ngtools.domain.NgComponents;
|
||||
import com.ruoyi.ngtools.service.INgComponentsService;
|
||||
|
||||
/**
|
||||
* 天然气组分Service业务层处理
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-02-09
|
||||
*/
|
||||
@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);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,96 @@
|
||||
package com.ruoyi.ngtools.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.ngtools.mapper.NgMeterparMapper;
|
||||
import com.ruoyi.ngtools.domain.NgMeterpar;
|
||||
import com.ruoyi.ngtools.service.INgMeterparService;
|
||||
|
||||
/**
|
||||
* 流量计参数Service业务层处理
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-02-09
|
||||
*/
|
||||
@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);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,96 @@
|
||||
package com.ruoyi.ngtools.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.ngtools.mapper.NgMeterresultMapper;
|
||||
import com.ruoyi.ngtools.domain.NgMeterresult;
|
||||
import com.ruoyi.ngtools.service.INgMeterresultService;
|
||||
|
||||
/**
|
||||
* 流量计算结果Service业务层处理
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-02-09
|
||||
*/
|
||||
@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);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,96 @@
|
||||
package com.ruoyi.ngtools.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.ngtools.mapper.NgNgparMapper;
|
||||
import com.ruoyi.ngtools.domain.NgNgpar;
|
||||
import com.ruoyi.ngtools.service.INgNgparService;
|
||||
|
||||
/**
|
||||
* 天然气物性参数Service业务层处理
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-02-09
|
||||
*/
|
||||
@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);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,113 @@
|
||||
package com.ruoyi.system.controller;
|
||||
|
||||
import java.util.List;
|
||||
import jakarta.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.system.domain.NgComponents;
|
||||
import com.ruoyi.system.service.INgComponentsService;
|
||||
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
|
||||
/**
|
||||
* 天然气组分Controller
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-03-21
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/system/components")
|
||||
@Tag(name = "【天然气组分】管理")
|
||||
public class NgComponentsController extends BaseController
|
||||
{
|
||||
@Autowired
|
||||
private INgComponentsService ngComponentsService;
|
||||
|
||||
/**
|
||||
* 查询天然气组分列表
|
||||
*/
|
||||
@Operation(summary = "查询天然气组分列表")
|
||||
@PreAuthorize("@ss.hasPermi('system:components:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(NgComponents ngComponents)
|
||||
{
|
||||
startPage();
|
||||
List<NgComponents> list = ngComponentsService.selectNgComponentsList(ngComponents);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出天然气组分列表
|
||||
*/
|
||||
@Operation(summary = "导出天然气组分列表")
|
||||
@PreAuthorize("@ss.hasPermi('system: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, "天然气组分数据");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取天然气组分详细信息
|
||||
*/
|
||||
@Operation(summary = "获取天然气组分详细信息")
|
||||
@PreAuthorize("@ss.hasPermi('system:components:query')")
|
||||
@GetMapping(value = "/{id}")
|
||||
public AjaxResult getInfo(@PathVariable("id") String id)
|
||||
{
|
||||
return success(ngComponentsService.selectNgComponentsById(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增天然气组分
|
||||
*/
|
||||
@Operation(summary = "新增天然气组分")
|
||||
@PreAuthorize("@ss.hasPermi('system:components:add')")
|
||||
@Log(title = "天然气组分", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody NgComponents ngComponents)
|
||||
{
|
||||
return toAjax(ngComponentsService.insertNgComponents(ngComponents));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改天然气组分
|
||||
*/
|
||||
@Operation(summary = "修改天然气组分")
|
||||
@PreAuthorize("@ss.hasPermi('system:components:edit')")
|
||||
@Log(title = "天然气组分", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody NgComponents ngComponents)
|
||||
{
|
||||
return toAjax(ngComponentsService.updateNgComponents(ngComponents));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除天然气组分
|
||||
*/
|
||||
@Operation(summary = "删除天然气组分")
|
||||
@PreAuthorize("@ss.hasPermi('system:components:remove')")
|
||||
@Log(title = "天然气组分", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public AjaxResult remove(@PathVariable( name = "ids" ) String[] ids)
|
||||
{
|
||||
return toAjax(ngComponentsService.deleteNgComponentsByIds(ids));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,113 @@
|
||||
package com.ruoyi.system.controller;
|
||||
|
||||
import java.util.List;
|
||||
import jakarta.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.system.domain.NgMeterpar;
|
||||
import com.ruoyi.system.service.INgMeterparService;
|
||||
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
|
||||
/**
|
||||
* 流量计参数Controller
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-03-21
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/system/meterpar")
|
||||
@Tag(name = "【流量计参数】管理")
|
||||
public class NgMeterparController extends BaseController
|
||||
{
|
||||
@Autowired
|
||||
private INgMeterparService ngMeterparService;
|
||||
|
||||
/**
|
||||
* 查询流量计参数列表
|
||||
*/
|
||||
@Operation(summary = "查询流量计参数列表")
|
||||
@PreAuthorize("@ss.hasPermi('system:meterpar:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(NgMeterpar ngMeterpar)
|
||||
{
|
||||
startPage();
|
||||
List<NgMeterpar> list = ngMeterparService.selectNgMeterparList(ngMeterpar);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出流量计参数列表
|
||||
*/
|
||||
@Operation(summary = "导出流量计参数列表")
|
||||
@PreAuthorize("@ss.hasPermi('system: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, "流量计参数数据");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取流量计参数详细信息
|
||||
*/
|
||||
@Operation(summary = "获取流量计参数详细信息")
|
||||
@PreAuthorize("@ss.hasPermi('system:meterpar:query')")
|
||||
@GetMapping(value = "/{id}")
|
||||
public AjaxResult getInfo(@PathVariable("id") String id)
|
||||
{
|
||||
return success(ngMeterparService.selectNgMeterparById(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增流量计参数
|
||||
*/
|
||||
@Operation(summary = "新增流量计参数")
|
||||
@PreAuthorize("@ss.hasPermi('system:meterpar:add')")
|
||||
@Log(title = "流量计参数", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody NgMeterpar ngMeterpar)
|
||||
{
|
||||
return toAjax(ngMeterparService.insertNgMeterpar(ngMeterpar));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改流量计参数
|
||||
*/
|
||||
@Operation(summary = "修改流量计参数")
|
||||
@PreAuthorize("@ss.hasPermi('system:meterpar:edit')")
|
||||
@Log(title = "流量计参数", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody NgMeterpar ngMeterpar)
|
||||
{
|
||||
return toAjax(ngMeterparService.updateNgMeterpar(ngMeterpar));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除流量计参数
|
||||
*/
|
||||
@Operation(summary = "删除流量计参数")
|
||||
@PreAuthorize("@ss.hasPermi('system:meterpar:remove')")
|
||||
@Log(title = "流量计参数", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public AjaxResult remove(@PathVariable( name = "ids" ) String[] ids)
|
||||
{
|
||||
return toAjax(ngMeterparService.deleteNgMeterparByIds(ids));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,113 @@
|
||||
package com.ruoyi.system.controller;
|
||||
|
||||
import java.util.List;
|
||||
import jakarta.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.system.domain.NgMeterresult;
|
||||
import com.ruoyi.system.service.INgMeterresultService;
|
||||
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
|
||||
/**
|
||||
* 流量计算结果Controller
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-03-21
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/system/meterresult")
|
||||
@Tag(name = "【流量计算结果】管理")
|
||||
public class NgMeterresultController extends BaseController
|
||||
{
|
||||
@Autowired
|
||||
private INgMeterresultService ngMeterresultService;
|
||||
|
||||
/**
|
||||
* 查询流量计算结果列表
|
||||
*/
|
||||
@Operation(summary = "查询流量计算结果列表")
|
||||
@PreAuthorize("@ss.hasPermi('system:meterresult:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(NgMeterresult ngMeterresult)
|
||||
{
|
||||
startPage();
|
||||
List<NgMeterresult> list = ngMeterresultService.selectNgMeterresultList(ngMeterresult);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出流量计算结果列表
|
||||
*/
|
||||
@Operation(summary = "导出流量计算结果列表")
|
||||
@PreAuthorize("@ss.hasPermi('system: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, "流量计算结果数据");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取流量计算结果详细信息
|
||||
*/
|
||||
@Operation(summary = "获取流量计算结果详细信息")
|
||||
@PreAuthorize("@ss.hasPermi('system:meterresult:query')")
|
||||
@GetMapping(value = "/{id}")
|
||||
public AjaxResult getInfo(@PathVariable("id") String id)
|
||||
{
|
||||
return success(ngMeterresultService.selectNgMeterresultById(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增流量计算结果
|
||||
*/
|
||||
@Operation(summary = "新增流量计算结果")
|
||||
@PreAuthorize("@ss.hasPermi('system:meterresult:add')")
|
||||
@Log(title = "流量计算结果", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody NgMeterresult ngMeterresult)
|
||||
{
|
||||
return toAjax(ngMeterresultService.insertNgMeterresult(ngMeterresult));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改流量计算结果
|
||||
*/
|
||||
@Operation(summary = "修改流量计算结果")
|
||||
@PreAuthorize("@ss.hasPermi('system:meterresult:edit')")
|
||||
@Log(title = "流量计算结果", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody NgMeterresult ngMeterresult)
|
||||
{
|
||||
return toAjax(ngMeterresultService.updateNgMeterresult(ngMeterresult));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除流量计算结果
|
||||
*/
|
||||
@Operation(summary = "删除流量计算结果")
|
||||
@PreAuthorize("@ss.hasPermi('system:meterresult:remove')")
|
||||
@Log(title = "流量计算结果", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public AjaxResult remove(@PathVariable( name = "ids" ) String[] ids)
|
||||
{
|
||||
return toAjax(ngMeterresultService.deleteNgMeterresultByIds(ids));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,113 @@
|
||||
package com.ruoyi.system.controller;
|
||||
|
||||
import java.util.List;
|
||||
import jakarta.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.system.domain.NgNgpar;
|
||||
import com.ruoyi.system.service.INgNgparService;
|
||||
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
|
||||
/**
|
||||
* 天然气物性参数Controller
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-03-21
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/system/ngpar")
|
||||
@Tag(name = "【天然气物性参数】管理")
|
||||
public class NgNgparController extends BaseController
|
||||
{
|
||||
@Autowired
|
||||
private INgNgparService ngNgparService;
|
||||
|
||||
/**
|
||||
* 查询天然气物性参数列表
|
||||
*/
|
||||
@Operation(summary = "查询天然气物性参数列表")
|
||||
@PreAuthorize("@ss.hasPermi('system:ngpar:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(NgNgpar ngNgpar)
|
||||
{
|
||||
startPage();
|
||||
List<NgNgpar> list = ngNgparService.selectNgNgparList(ngNgpar);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出天然气物性参数列表
|
||||
*/
|
||||
@Operation(summary = "导出天然气物性参数列表")
|
||||
@PreAuthorize("@ss.hasPermi('system: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, "天然气物性参数数据");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取天然气物性参数详细信息
|
||||
*/
|
||||
@Operation(summary = "获取天然气物性参数详细信息")
|
||||
@PreAuthorize("@ss.hasPermi('system:ngpar:query')")
|
||||
@GetMapping(value = "/{id}")
|
||||
public AjaxResult getInfo(@PathVariable("id") String id)
|
||||
{
|
||||
return success(ngNgparService.selectNgNgparById(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增天然气物性参数
|
||||
*/
|
||||
@Operation(summary = "新增天然气物性参数")
|
||||
@PreAuthorize("@ss.hasPermi('system:ngpar:add')")
|
||||
@Log(title = "天然气物性参数", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody NgNgpar ngNgpar)
|
||||
{
|
||||
return toAjax(ngNgparService.insertNgNgpar(ngNgpar));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改天然气物性参数
|
||||
*/
|
||||
@Operation(summary = "修改天然气物性参数")
|
||||
@PreAuthorize("@ss.hasPermi('system:ngpar:edit')")
|
||||
@Log(title = "天然气物性参数", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody NgNgpar ngNgpar)
|
||||
{
|
||||
return toAjax(ngNgparService.updateNgNgpar(ngNgpar));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除天然气物性参数
|
||||
*/
|
||||
@Operation(summary = "删除天然气物性参数")
|
||||
@PreAuthorize("@ss.hasPermi('system:ngpar:remove')")
|
||||
@Log(title = "天然气物性参数", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public AjaxResult remove(@PathVariable( name = "ids" ) String[] ids)
|
||||
{
|
||||
return toAjax(ngNgparService.deleteNgNgparByIds(ids));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,522 @@
|
||||
package com.ruoyi.system.domain;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
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-03-21
|
||||
*/
|
||||
@Schema(description = "天然气组分对象")
|
||||
public class NgComponents extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
|
||||
/** ID */
|
||||
@Schema(title = " ID ")
|
||||
private String id;
|
||||
|
||||
/** 创建人名称 */
|
||||
@Schema(title = " 创建人名称 ")
|
||||
@Excel(name = " 创建人名称 ")
|
||||
private String createName;
|
||||
|
||||
/** 更新人名称 */
|
||||
@Schema(title = " 更新人名称 ")
|
||||
@Excel(name = " 更新人名称 ")
|
||||
private String updateName;
|
||||
|
||||
/** 甲烷C1 */
|
||||
@Schema(title = " 甲烷C1 ")
|
||||
@Excel(name = " 甲烷C1 ")
|
||||
private String ngC1;
|
||||
|
||||
/** 氮气N2 */
|
||||
@Schema(title = " 氮气N2 ")
|
||||
@Excel(name = " 氮气N2 ")
|
||||
private String ngN2;
|
||||
|
||||
/** 二氧化碳CO2 */
|
||||
@Schema(title = " 二氧化碳CO2 ")
|
||||
@Excel(name = " 二氧化碳CO2 ")
|
||||
private String ngCo2;
|
||||
|
||||
/** 乙烷C2 */
|
||||
@Schema(title = " 乙烷C2 ")
|
||||
@Excel(name = " 乙烷C2 ")
|
||||
private String ngC2;
|
||||
|
||||
/** 丙烷C3 */
|
||||
@Schema(title = " 丙烷C3 ")
|
||||
@Excel(name = " 丙烷C3 ")
|
||||
private String ngC3;
|
||||
|
||||
/** 水H2O */
|
||||
@Schema(title = " 水H2O ")
|
||||
@Excel(name = " 水H2O ")
|
||||
private String ngH2o;
|
||||
|
||||
/** 硫化氢H2S */
|
||||
@Schema(title = " 硫化氢H2S ")
|
||||
@Excel(name = " 硫化氢H2S ")
|
||||
private String ngH2s;
|
||||
|
||||
/** 氢气H2 */
|
||||
@Schema(title = " 氢气H2 ")
|
||||
@Excel(name = " 氢气H2 ")
|
||||
private String ngH2;
|
||||
|
||||
/** 一氧化碳CO */
|
||||
@Schema(title = " 一氧化碳CO ")
|
||||
@Excel(name = " 一氧化碳CO ")
|
||||
private String ngCo;
|
||||
|
||||
/** 氧气O2 */
|
||||
@Schema(title = " 氧气O2 ")
|
||||
@Excel(name = " 氧气O2 ")
|
||||
private String ngO2;
|
||||
|
||||
/** 异丁烷iC4 */
|
||||
@Schema(title = " 异丁烷iC4 ")
|
||||
@Excel(name = " 异丁烷iC4 ")
|
||||
private String ngIc4;
|
||||
|
||||
/** 正丁烷nC4 */
|
||||
@Schema(title = " 正丁烷nC4 ")
|
||||
@Excel(name = " 正丁烷nC4 ")
|
||||
private String ngNc4;
|
||||
|
||||
/** 异戊烷iC5 */
|
||||
@Schema(title = " 异戊烷iC5 ")
|
||||
@Excel(name = " 异戊烷iC5 ")
|
||||
private String ngIc5;
|
||||
|
||||
/** 正戊烷nC5 */
|
||||
@Schema(title = " 正戊烷nC5 ")
|
||||
@Excel(name = " 正戊烷nC5 ")
|
||||
private String ngNc5;
|
||||
|
||||
/** 己烷C6 */
|
||||
@Schema(title = " 己烷C6 ")
|
||||
@Excel(name = " 己烷C6 ")
|
||||
private String ngC6;
|
||||
|
||||
/** 庚烷C7 */
|
||||
@Schema(title = " 庚烷C7 ")
|
||||
@Excel(name = " 庚烷C7 ")
|
||||
private String ngC7;
|
||||
|
||||
/** 辛烷C8 */
|
||||
@Schema(title = " 辛烷C8 ")
|
||||
@Excel(name = " 辛烷C8 ")
|
||||
private String ngC8;
|
||||
|
||||
/** 壬烷C9 */
|
||||
@Schema(title = " 壬烷C9 ")
|
||||
@Excel(name = " 壬烷C9 ")
|
||||
private String ngC9;
|
||||
|
||||
/** 癸烷C10 */
|
||||
@Schema(title = " 癸烷C10 ")
|
||||
@Excel(name = " 癸烷C10 ")
|
||||
private String ngC10;
|
||||
|
||||
/** 氦气He */
|
||||
@Schema(title = " 氦气He ")
|
||||
@Excel(name = " 氦气He ")
|
||||
private String ngHe;
|
||||
|
||||
/** 氩气Ar */
|
||||
@Schema(title = " 氩气Ar ")
|
||||
@Excel(name = " 氩气Ar ")
|
||||
private String ngAr;
|
||||
|
||||
/** 合计 */
|
||||
@Schema(title = "合计")
|
||||
@Excel(name = "合计")
|
||||
private String sum;
|
||||
|
||||
/** 取样编号 */
|
||||
@Schema(title = "取样编号")
|
||||
@Excel(name = "取样编号")
|
||||
private String sampleno;
|
||||
|
||||
/** 仪表编号 */
|
||||
@Schema(title = "仪表编号")
|
||||
@Excel(name = "仪表编号")
|
||||
private String meterno;
|
||||
|
||||
/** 常用组分 */
|
||||
@Schema(title = "常用组分")
|
||||
@Excel(name = "常用组分")
|
||||
private String cyzf;
|
||||
|
||||
/** 租户ID */
|
||||
@Schema(title = "租户ID")
|
||||
@Excel(name = "租户ID")
|
||||
private Long tenantId;
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
public void setTenantId(Long tenantId)
|
||||
{
|
||||
this.tenantId = tenantId;
|
||||
}
|
||||
|
||||
public Long getTenantId()
|
||||
{
|
||||
return tenantId;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@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())
|
||||
.append("tenantId", getTenantId())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,998 @@
|
||||
package com.ruoyi.system.domain;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
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-03-21
|
||||
*/
|
||||
@Schema(description = "流量计参数对象")
|
||||
public class NgMeterpar extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
|
||||
/** ID */
|
||||
@Schema(title = "ID ")
|
||||
private String id;
|
||||
|
||||
/** 创建人名称 */
|
||||
@Schema(title = "创建人名称 ")
|
||||
@Excel(name = "创建人名称 ")
|
||||
private String createName;
|
||||
|
||||
/** 更新人名称 */
|
||||
@Schema(title = "更新人名称 ")
|
||||
@Excel(name = "更新人名称 ")
|
||||
private String updateName;
|
||||
|
||||
/** 流量计算标准 */
|
||||
@Schema(title = "流量计算标准 ")
|
||||
@Excel(name = "流量计算标准 ")
|
||||
private String dFlowCalbz;
|
||||
|
||||
/** 压缩因子计算标准 */
|
||||
@Schema(title = "压缩因子计算标准 ")
|
||||
@Excel(name = "压缩因子计算标准 ")
|
||||
private String dZcalbz;
|
||||
|
||||
/** 计量参比条件压力 */
|
||||
@Schema(title = "计量参比条件压力 ")
|
||||
@Excel(name = "计量参比条件压力 ")
|
||||
private String dCbtj;
|
||||
|
||||
/** 计量参比条件压力 */
|
||||
@Schema(title = "计量参比条件压力 ")
|
||||
@Excel(name = "计量参比条件压力 ")
|
||||
private String dpbM;
|
||||
|
||||
/** 计量参比条件温度 */
|
||||
@Schema(title = "计量参比条件温度 ")
|
||||
@Excel(name = "计量参比条件温度 ")
|
||||
private String dtbM;
|
||||
|
||||
/** 燃烧参比条件压力 */
|
||||
@Schema(title = "燃烧参比条件压力 ")
|
||||
@Excel(name = "燃烧参比条件压力 ")
|
||||
private String dpbE;
|
||||
|
||||
/** 燃烧参比条件温度 */
|
||||
@Schema(title = "燃烧参比条件温度 ")
|
||||
@Excel(name = "燃烧参比条件温度 ")
|
||||
private String dtbE;
|
||||
|
||||
/** 当地大气压 */
|
||||
@Schema(title = "当地大气压 ")
|
||||
@Excel(name = "当地大气压 ")
|
||||
private String dPatm;
|
||||
|
||||
/** 当地大气压单位 */
|
||||
@Schema(title = "当地大气压单位 ")
|
||||
@Excel(name = "当地大气压单位 ")
|
||||
private String dPatmUnit;
|
||||
|
||||
/** 天然气组分 */
|
||||
@Schema(title = "天然气组分 ")
|
||||
@Excel(name = "天然气组分 ")
|
||||
private String dngCompents;
|
||||
|
||||
/** 流量计类别 */
|
||||
@Schema(title = "流量计类别 ")
|
||||
@Excel(name = "流量计类别 ")
|
||||
private String dMeterType;
|
||||
|
||||
/** 节流装置类型 */
|
||||
@Schema(title = "节流装置类型 ")
|
||||
@Excel(name = "节流装置类型 ")
|
||||
private String dCoreType;
|
||||
|
||||
/** 取压方式 */
|
||||
@Schema(title = "取压方式 ")
|
||||
@Excel(name = "取压方式 ")
|
||||
private String dPtmode;
|
||||
|
||||
/** 管道类型 */
|
||||
@Schema(title = "管道类型 ")
|
||||
@Excel(name = "管道类型 ")
|
||||
private String dPipeType;
|
||||
|
||||
/** 管道内径 */
|
||||
@Schema(title = "管道内径 ")
|
||||
@Excel(name = "管道内径 ")
|
||||
private String dPipeD;
|
||||
|
||||
/** 长度单位 */
|
||||
@Schema(title = "长度单位 ")
|
||||
@Excel(name = "长度单位 ")
|
||||
private String dLenUnit;
|
||||
|
||||
/** 管道内径参考温度 */
|
||||
@Schema(title = "管道内径参考温度 ")
|
||||
@Excel(name = "管道内径参考温度 ")
|
||||
private String dPipeDtemp;
|
||||
|
||||
/** 温度单位 */
|
||||
@Schema(title = "温度单位 ")
|
||||
@Excel(name = "温度单位 ")
|
||||
private String dPileDtempU;
|
||||
|
||||
/** 管道材料 */
|
||||
@Schema(title = "管道材料 ")
|
||||
@Excel(name = "管道材料 ")
|
||||
private String dPipeMaterial;
|
||||
|
||||
/** 孔板孔径 */
|
||||
@Schema(title = "孔板孔径 ")
|
||||
@Excel(name = "孔板孔径 ")
|
||||
private String dOrificeD;
|
||||
|
||||
/** 长度单位 */
|
||||
@Schema(title = "长度单位 ")
|
||||
@Excel(name = "长度单位 ")
|
||||
private String dOrificeUnit;
|
||||
|
||||
/** 孔板内径参考温度 */
|
||||
@Schema(title = "孔板内径参考温度 ")
|
||||
@Excel(name = "孔板内径参考温度 ")
|
||||
private String dOrificeDtemp;
|
||||
|
||||
/** 温度单位 */
|
||||
@Schema(title = "温度单位 ")
|
||||
@Excel(name = "温度单位 ")
|
||||
private String dOrificeDtempUnit;
|
||||
|
||||
/** 孔板材料 */
|
||||
@Schema(title = "孔板材料 ")
|
||||
@Excel(name = "孔板材料 ")
|
||||
private String dOrificeMaterial;
|
||||
|
||||
/** 锐利度系数计算方法 */
|
||||
@Schema(title = "锐利度系数计算方法 ")
|
||||
@Excel(name = "锐利度系数计算方法 ")
|
||||
private String dOrificeSharpness;
|
||||
|
||||
/** 孔板入口圆弧半径 */
|
||||
@Schema(title = "孔板入口圆弧半径 ")
|
||||
@Excel(name = "孔板入口圆弧半径 ")
|
||||
private String dOrificeRk;
|
||||
|
||||
/** 长度单位 */
|
||||
@Schema(title = "长度单位 ")
|
||||
@Excel(name = "长度单位 ")
|
||||
private String dOrificeRkLenU;
|
||||
|
||||
/** 输入压力 */
|
||||
@Schema(title = "输入压力 ")
|
||||
@Excel(name = "输入压力 ")
|
||||
private String dPf;
|
||||
|
||||
/** 压力单位 */
|
||||
@Schema(title = "压力单位 ")
|
||||
@Excel(name = "压力单位 ")
|
||||
private String dPfUnit;
|
||||
|
||||
/** 压力类型 */
|
||||
@Schema(title = "压力类型 ")
|
||||
@Excel(name = "压力类型 ")
|
||||
private String dPfType;
|
||||
|
||||
/** 输入温度 */
|
||||
@Schema(title = "输入温度 ")
|
||||
@Excel(name = "输入温度 ")
|
||||
private String dTf;
|
||||
|
||||
/** 温度单位 */
|
||||
@Schema(title = "温度单位 ")
|
||||
@Excel(name = "温度单位 ")
|
||||
private String dTfUnit;
|
||||
|
||||
/** 输入差压 */
|
||||
@Schema(title = "输入差压 ")
|
||||
@Excel(name = "输入差压 ")
|
||||
private String dDp;
|
||||
|
||||
/** 压力单位 */
|
||||
@Schema(title = "压力单位 ")
|
||||
@Excel(name = "压力单位 ")
|
||||
private String dDpUnit;
|
||||
|
||||
/** 体积流量单位 */
|
||||
@Schema(title = "体积流量单位 ")
|
||||
@Excel(name = "体积流量单位 ")
|
||||
private String dVFlowUnit;
|
||||
|
||||
/** 质量流量单位 */
|
||||
@Schema(title = "质量流量单位 ")
|
||||
@Excel(name = "质量流量单位 ")
|
||||
private String dMFlowUnit;
|
||||
|
||||
/** 能量流量单位 */
|
||||
@Schema(title = "能量流量单位 ")
|
||||
@Excel(name = "能量流量单位 ")
|
||||
private String dEFlowUnit;
|
||||
|
||||
/** 流出系数 */
|
||||
@Schema(title = "流出系数 ")
|
||||
@Excel(name = "流出系数 ")
|
||||
private String dCd;
|
||||
|
||||
/** 流出系数计算方法 */
|
||||
@Schema(title = "流出系数计算方法 ")
|
||||
@Excel(name = "流出系数计算方法 ")
|
||||
private String dCdCalMethod;
|
||||
|
||||
/** 仪表系数 */
|
||||
@Schema(title = "仪表系数 ")
|
||||
@Excel(name = "仪表系数 ")
|
||||
private String dMeterFactor;
|
||||
|
||||
/** 脉冲数 */
|
||||
@Schema(title = "脉冲数 ")
|
||||
@Excel(name = "脉冲数 ")
|
||||
private String dPulseNum;
|
||||
|
||||
/** 最大体积流量 */
|
||||
@Schema(title = "最大体积流量 ")
|
||||
@Excel(name = "最大体积流量 ")
|
||||
private String dVFlowMax;
|
||||
|
||||
/** 最小体积流量 */
|
||||
@Schema(title = "最小体积流量 ")
|
||||
@Excel(name = "最小体积流量 ")
|
||||
private String dVFlowMin;
|
||||
|
||||
/** 常用流量 */
|
||||
@Schema(title = "常用流量 ")
|
||||
@Excel(name = "常用流量 ")
|
||||
private String dVFlowCon;
|
||||
|
||||
/** 压力量程下限 */
|
||||
@Schema(title = "压力量程下限 ")
|
||||
@Excel(name = "压力量程下限 ")
|
||||
private String dPfRangeMin;
|
||||
|
||||
/** 压力量程上限 */
|
||||
@Schema(title = "压力量程上限 ")
|
||||
@Excel(name = "压力量程上限 ")
|
||||
private String dPfRangeMax;
|
||||
|
||||
/** 差压量程下限 */
|
||||
@Schema(title = "差压量程下限 ")
|
||||
@Excel(name = "差压量程下限 ")
|
||||
private String dDpRangeMin;
|
||||
|
||||
/** 差压量程上限 */
|
||||
@Schema(title = "差压量程上限 ")
|
||||
@Excel(name = "差压量程上限 ")
|
||||
private String dDpRangeMax;
|
||||
|
||||
/** 温度计量程下限 */
|
||||
@Schema(title = "温度计量程下限 ")
|
||||
@Excel(name = "温度计量程下限 ")
|
||||
private String dTfRangeMin;
|
||||
|
||||
/** 温度计量程上限 */
|
||||
@Schema(title = "温度计量程上限 ")
|
||||
@Excel(name = "温度计量程上限 ")
|
||||
private String dTfRangeMax;
|
||||
|
||||
/** 管束车容积 */
|
||||
@Schema(title = "管束车容积 ")
|
||||
@Excel(name = "管束车容积 ")
|
||||
private String dVGsc;
|
||||
|
||||
/** 取样编号 */
|
||||
@Schema(title = "取样编号")
|
||||
@Excel(name = "取样编号")
|
||||
private String sampleno;
|
||||
|
||||
/** 仪表编号 */
|
||||
@Schema(title = "仪表编号")
|
||||
@Excel(name = "仪表编号")
|
||||
private String meterno;
|
||||
|
||||
/** 租户ID */
|
||||
@Schema(title = "租户ID")
|
||||
@Excel(name = "租户ID")
|
||||
private Long tenantId;
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
public void setTenantId(Long tenantId)
|
||||
{
|
||||
this.tenantId = tenantId;
|
||||
}
|
||||
|
||||
public Long getTenantId()
|
||||
{
|
||||
return tenantId;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@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())
|
||||
.append("tenantId", getTenantId())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,454 @@
|
||||
package com.ruoyi.system.domain;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
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-03-21
|
||||
*/
|
||||
@Schema(description = "流量计算结果对象")
|
||||
public class NgMeterresult extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
|
||||
/** ID */
|
||||
@Schema(title = "ID")
|
||||
private String id;
|
||||
|
||||
/** 创建人名称 */
|
||||
@Schema(title = "创建人名称")
|
||||
@Excel(name = "创建人名称")
|
||||
private String createName;
|
||||
|
||||
/** 更新人名称 */
|
||||
@Schema(title = "更新人名称")
|
||||
@Excel(name = "更新人名称")
|
||||
private String updateName;
|
||||
|
||||
/** 流量计编号 */
|
||||
@Schema(title = "流量计编号")
|
||||
@Excel(name = "流量计编号")
|
||||
private String ybbh;
|
||||
|
||||
/** 求渐近速度系数 E */
|
||||
@Schema(title = "求渐近速度系数 E")
|
||||
@Excel(name = "求渐近速度系数 E")
|
||||
private String dE;
|
||||
|
||||
/** 求相对密度系数 FG */
|
||||
@Schema(title = "求相对密度系数 FG")
|
||||
@Excel(name = "求相对密度系数 FG")
|
||||
private String dFG;
|
||||
|
||||
/** 求流动温度系数 FT */
|
||||
@Schema(title = "求流动温度系数 FT")
|
||||
@Excel(name = "求流动温度系数 FT")
|
||||
private String dFT;
|
||||
|
||||
/** 求动力粘度dlnd */
|
||||
@Schema(title = "求动力粘度dlnd")
|
||||
@Excel(name = "求动力粘度dlnd")
|
||||
private String dDViscosity;
|
||||
|
||||
/** 求可膨胀系数 */
|
||||
@Schema(title = "求可膨胀系数")
|
||||
@Excel(name = "求可膨胀系数")
|
||||
private String dDExpCoefficient;
|
||||
|
||||
/** 管道雷诺数 */
|
||||
@Schema(title = "管道雷诺数")
|
||||
@Excel(name = "管道雷诺数")
|
||||
private String dRnPipe;
|
||||
|
||||
/** 孔板锐利度系数Bk */
|
||||
@Schema(title = "孔板锐利度系数Bk")
|
||||
@Excel(name = "孔板锐利度系数Bk")
|
||||
private String dBk;
|
||||
|
||||
/** 管道粗糙度系数 Gme */
|
||||
@Schema(title = "管道粗糙度系数 Gme")
|
||||
@Excel(name = "管道粗糙度系数 Gme")
|
||||
private String dRoughNessPipe;
|
||||
|
||||
/** 修正后的流出系数 */
|
||||
@Schema(title = "修正后的流出系数")
|
||||
@Excel(name = "修正后的流出系数")
|
||||
private String dCdCorrect;
|
||||
|
||||
/** 喷嘴的流出系数 */
|
||||
@Schema(title = "喷嘴的流出系数")
|
||||
@Excel(name = "喷嘴的流出系数")
|
||||
private String dCdNozell;
|
||||
|
||||
/** 标况体积流量m³/s */
|
||||
@Schema(title = "标况体积流量m³/s")
|
||||
@Excel(name = "标况体积流量m³/s")
|
||||
private String dVFlowb;
|
||||
|
||||
/** 工况体积流量 */
|
||||
@Schema(title = "工况体积流量")
|
||||
@Excel(name = "工况体积流量")
|
||||
private String dVFlowf;
|
||||
|
||||
/** 标况质量流量 */
|
||||
@Schema(title = "标况质量流量")
|
||||
@Excel(name = "标况质量流量")
|
||||
private String dMFlowb;
|
||||
|
||||
/** 标况能量流量 */
|
||||
@Schema(title = "标况能量流量")
|
||||
@Excel(name = "标况能量流量")
|
||||
private String dEFlowb;
|
||||
|
||||
/** 管道内天然气流速 */
|
||||
@Schema(title = "管道内天然气流速")
|
||||
@Excel(name = "管道内天然气流速")
|
||||
private String dVelocityFlow;
|
||||
|
||||
/** 压力损失 */
|
||||
@Schema(title = "压力损失")
|
||||
@Excel(name = "压力损失")
|
||||
private String dPressLost;
|
||||
|
||||
/** 直径比 */
|
||||
@Schema(title = "直径比")
|
||||
@Excel(name = "直径比")
|
||||
private String dBeta;
|
||||
|
||||
/** 等熵指数 */
|
||||
@Schema(title = "等熵指数")
|
||||
@Excel(name = "等熵指数")
|
||||
private String dKappa;
|
||||
|
||||
/** 取样编号 */
|
||||
@Schema(title = "取样编号")
|
||||
@Excel(name = "取样编号")
|
||||
private String sampleno;
|
||||
|
||||
/** 仪表编号 */
|
||||
@Schema(title = "仪表编号")
|
||||
@Excel(name = "仪表编号")
|
||||
private String meterno;
|
||||
|
||||
/** 租户ID */
|
||||
@Schema(title = "租户ID")
|
||||
@Excel(name = "租户ID")
|
||||
private Long tenantId;
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
public void setTenantId(Long tenantId)
|
||||
{
|
||||
this.tenantId = tenantId;
|
||||
}
|
||||
|
||||
public Long getTenantId()
|
||||
{
|
||||
return tenantId;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@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())
|
||||
.append("tenantId", getTenantId())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
1032
ruoyi-ngtools/src/main/java/com/ruoyi/system/domain/NgNgpar.java
Normal file
1032
ruoyi-ngtools/src/main/java/com/ruoyi/system/domain/NgNgpar.java
Normal file
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,61 @@
|
||||
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);
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
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);
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
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);
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
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);
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
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);
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
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);
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
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);
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
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);
|
||||
}
|
||||
@ -0,0 +1,96 @@
|
||||
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);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,96 @@
|
||||
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);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,96 @@
|
||||
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);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,96 @@
|
||||
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);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,204 @@
|
||||
<?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.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" />
|
||||
</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
|
||||
</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>
|
||||
</select>
|
||||
|
||||
<select id="selectNgComponentsById" parameterType="String" resultMap="NgComponentsResult">
|
||||
<include refid="selectNgComponentsVo"/>
|
||||
where id = #{id}
|
||||
</select>
|
||||
|
||||
<insert id="insertNgComponents" parameterType="NgComponents">
|
||||
insert into ng_components
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null">id,</if>
|
||||
<if test="createName != null">create_name,</if>
|
||||
<if test="createBy != null">create_by,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
<if test="updateName != null">update_name,</if>
|
||||
<if test="updateBy != null">update_by,</if>
|
||||
<if test="updateTime != null">update_time,</if>
|
||||
<if test="ngC1 != null">NG_C1,</if>
|
||||
<if test="ngN2 != null">NG_N2,</if>
|
||||
<if test="ngCo2 != null">NG_CO2,</if>
|
||||
<if test="ngC2 != null">NG_C2,</if>
|
||||
<if test="ngC3 != null">NG_C3,</if>
|
||||
<if test="ngH2o != null">NG_H2O,</if>
|
||||
<if test="ngH2s != null">NG_H2S,</if>
|
||||
<if test="ngH2 != null">NG_H2,</if>
|
||||
<if test="ngCo != null">NG_CO,</if>
|
||||
<if test="ngO2 != null">NG_O2,</if>
|
||||
<if test="ngIc4 != null">NG_iC4,</if>
|
||||
<if test="ngNc4 != null">NG_nC4,</if>
|
||||
<if test="ngIc5 != null">NG_iC5,</if>
|
||||
<if test="ngNc5 != null">NG_nC5,</if>
|
||||
<if test="ngC6 != null">NG_C6,</if>
|
||||
<if test="ngC7 != null">NG_C7,</if>
|
||||
<if test="ngC8 != null">NG_C8,</if>
|
||||
<if test="ngC9 != null">NG_C9,</if>
|
||||
<if test="ngC10 != null">NG_C10,</if>
|
||||
<if test="ngHe != null">NG_He,</if>
|
||||
<if test="ngAr != null">NG_Ar,</if>
|
||||
<if test="sum != null">sum,</if>
|
||||
<if test="sampleno != null">sampleno,</if>
|
||||
<if test="meterno != null">meterno,</if>
|
||||
<if test="cyzf != null">cyzf,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null">#{id},</if>
|
||||
<if test="createName != null">#{createName},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
<if test="updateName != null">#{updateName},</if>
|
||||
<if test="updateBy != null">#{updateBy},</if>
|
||||
<if test="updateTime != null">#{updateTime},</if>
|
||||
<if test="ngC1 != null">#{ngC1},</if>
|
||||
<if test="ngN2 != null">#{ngN2},</if>
|
||||
<if test="ngCo2 != null">#{ngCo2},</if>
|
||||
<if test="ngC2 != null">#{ngC2},</if>
|
||||
<if test="ngC3 != null">#{ngC3},</if>
|
||||
<if test="ngH2o != null">#{ngH2o},</if>
|
||||
<if test="ngH2s != null">#{ngH2s},</if>
|
||||
<if test="ngH2 != null">#{ngH2},</if>
|
||||
<if test="ngCo != null">#{ngCo},</if>
|
||||
<if test="ngO2 != null">#{ngO2},</if>
|
||||
<if test="ngIc4 != null">#{ngIc4},</if>
|
||||
<if test="ngNc4 != null">#{ngNc4},</if>
|
||||
<if test="ngIc5 != null">#{ngIc5},</if>
|
||||
<if test="ngNc5 != null">#{ngNc5},</if>
|
||||
<if test="ngC6 != null">#{ngC6},</if>
|
||||
<if test="ngC7 != null">#{ngC7},</if>
|
||||
<if test="ngC8 != null">#{ngC8},</if>
|
||||
<if test="ngC9 != null">#{ngC9},</if>
|
||||
<if test="ngC10 != null">#{ngC10},</if>
|
||||
<if test="ngHe != null">#{ngHe},</if>
|
||||
<if test="ngAr != null">#{ngAr},</if>
|
||||
<if test="sum != null">#{sum},</if>
|
||||
<if test="sampleno != null">#{sampleno},</if>
|
||||
<if test="meterno != null">#{meterno},</if>
|
||||
<if test="cyzf != null">#{cyzf},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateNgComponents" parameterType="NgComponents">
|
||||
update ng_components
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="createName != null">create_name = #{createName},</if>
|
||||
<if test="createBy != null">create_by = #{createBy},</if>
|
||||
<if test="createTime != null">create_time = #{createTime},</if>
|
||||
<if test="updateName != null">update_name = #{updateName},</if>
|
||||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
<if test="ngC1 != null">NG_C1 = #{ngC1},</if>
|
||||
<if test="ngN2 != null">NG_N2 = #{ngN2},</if>
|
||||
<if test="ngCo2 != null">NG_CO2 = #{ngCo2},</if>
|
||||
<if test="ngC2 != null">NG_C2 = #{ngC2},</if>
|
||||
<if test="ngC3 != null">NG_C3 = #{ngC3},</if>
|
||||
<if test="ngH2o != null">NG_H2O = #{ngH2o},</if>
|
||||
<if test="ngH2s != null">NG_H2S = #{ngH2s},</if>
|
||||
<if test="ngH2 != null">NG_H2 = #{ngH2},</if>
|
||||
<if test="ngCo != null">NG_CO = #{ngCo},</if>
|
||||
<if test="ngO2 != null">NG_O2 = #{ngO2},</if>
|
||||
<if test="ngIc4 != null">NG_iC4 = #{ngIc4},</if>
|
||||
<if test="ngNc4 != null">NG_nC4 = #{ngNc4},</if>
|
||||
<if test="ngIc5 != null">NG_iC5 = #{ngIc5},</if>
|
||||
<if test="ngNc5 != null">NG_nC5 = #{ngNc5},</if>
|
||||
<if test="ngC6 != null">NG_C6 = #{ngC6},</if>
|
||||
<if test="ngC7 != null">NG_C7 = #{ngC7},</if>
|
||||
<if test="ngC8 != null">NG_C8 = #{ngC8},</if>
|
||||
<if test="ngC9 != null">NG_C9 = #{ngC9},</if>
|
||||
<if test="ngC10 != null">NG_C10 = #{ngC10},</if>
|
||||
<if test="ngHe != null">NG_He = #{ngHe},</if>
|
||||
<if test="ngAr != null">NG_Ar = #{ngAr},</if>
|
||||
<if test="sum != null">sum = #{sum},</if>
|
||||
<if test="sampleno != null">sampleno = #{sampleno},</if>
|
||||
<if test="meterno != null">meterno = #{meterno},</if>
|
||||
<if test="cyzf != null">cyzf = #{cyzf},</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
||||
<delete id="deleteNgComponentsById" parameterType="String">
|
||||
delete from ng_components where id = #{id}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteNgComponentsByIds" parameterType="String">
|
||||
delete from ng_components where id in
|
||||
<foreach item="id" collection="array" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</delete>
|
||||
</mapper>
|
||||
@ -0,0 +1,348 @@
|
||||
<?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.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" />
|
||||
</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
|
||||
</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>
|
||||
</select>
|
||||
|
||||
<select id="selectNgMeterparById" parameterType="String" resultMap="NgMeterparResult">
|
||||
<include refid="selectNgMeterparVo"/>
|
||||
where id = #{id}
|
||||
</select>
|
||||
|
||||
<insert id="insertNgMeterpar" parameterType="NgMeterpar">
|
||||
insert into ng_meterpar
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null">id,</if>
|
||||
<if test="createName != null">create_name,</if>
|
||||
<if test="createBy != null">create_by,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
<if test="updateName != null">update_name,</if>
|
||||
<if test="updateBy != null">update_by,</if>
|
||||
<if test="updateTime != null">update_time,</if>
|
||||
<if test="dFlowCalbz != null">dFlowCalbz,</if>
|
||||
<if test="dZcalbz != null">dZcalbz,</if>
|
||||
<if test="dCbtj != null">dCbtj,</if>
|
||||
<if test="dpbM != null">dPb_M,</if>
|
||||
<if test="dtbM != null">dTb_M,</if>
|
||||
<if test="dpbE != null">dPb_E,</if>
|
||||
<if test="dtbE != null">dTb_E,</if>
|
||||
<if test="dPatm != null">dPatm,</if>
|
||||
<if test="dPatmUnit != null">dPatmUnit,</if>
|
||||
<if test="dngCompents != null">dNG_Compents,</if>
|
||||
<if test="dMeterType != null">dMeterType,</if>
|
||||
<if test="dCoreType != null">dCoreType,</if>
|
||||
<if test="dPtmode != null">dPtmode,</if>
|
||||
<if test="dPipeType != null">dPipeType,</if>
|
||||
<if test="dPipeD != null">dPipeD,</if>
|
||||
<if test="dLenUnit != null">dLenUnit,</if>
|
||||
<if test="dPipeDtemp != null">dPipeDtemp,</if>
|
||||
<if test="dPileDtempU != null">dPileDtempU,</if>
|
||||
<if test="dPipeMaterial != null">dPipeMaterial,</if>
|
||||
<if test="dOrificeD != null">dOrificeD,</if>
|
||||
<if test="dOrificeUnit != null">dOrificeUnit,</if>
|
||||
<if test="dOrificeDtemp != null">dOrificeDtemp,</if>
|
||||
<if test="dOrificeDtempUnit != null">dOrificeDtempUnit,</if>
|
||||
<if test="dOrificeMaterial != null">dOrificeMaterial,</if>
|
||||
<if test="dOrificeSharpness != null">dOrificeSharpness,</if>
|
||||
<if test="dOrificeRk != null">dOrificeRk,</if>
|
||||
<if test="dOrificeRkLenU != null">dOrificeRkLenU,</if>
|
||||
<if test="dPf != null">dPf,</if>
|
||||
<if test="dPfUnit != null">dPfUnit,</if>
|
||||
<if test="dPfType != null">dPfType,</if>
|
||||
<if test="dTf != null">dTf,</if>
|
||||
<if test="dTfUnit != null">dTfUnit,</if>
|
||||
<if test="dDp != null">dDp,</if>
|
||||
<if test="dDpUnit != null">dDpUnit,</if>
|
||||
<if test="dVFlowUnit != null">dVFlowUnit,</if>
|
||||
<if test="dMFlowUnit != null">dMFlowUnit,</if>
|
||||
<if test="dEFlowUnit != null">dEFlowUnit,</if>
|
||||
<if test="dCd != null">dCd,</if>
|
||||
<if test="dCdCalMethod != null">dCdCalMethod,</if>
|
||||
<if test="dMeterFactor != null">dMeterFactor,</if>
|
||||
<if test="dPulseNum != null">dPulseNum,</if>
|
||||
<if test="dVFlowMax != null">dVFlowMax,</if>
|
||||
<if test="dVFlowMin != null">dVFlowMin,</if>
|
||||
<if test="dVFlowCon != null">dVFlowCon,</if>
|
||||
<if test="dPfRangeMin != null">dPfRangeMin,</if>
|
||||
<if test="dPfRangeMax != null">dPfRangeMax,</if>
|
||||
<if test="dDpRangeMin != null">dDpRangeMin,</if>
|
||||
<if test="dDpRangeMax != null">dDpRangeMax,</if>
|
||||
<if test="dTfRangeMin != null">dTfRangeMin,</if>
|
||||
<if test="dTfRangeMax != null">dTfRangeMax,</if>
|
||||
<if test="dVGsc != null">dVGsc,</if>
|
||||
<if test="sampleno != null">sampleno,</if>
|
||||
<if test="meterno != null">meterno,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null">#{id},</if>
|
||||
<if test="createName != null">#{createName},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
<if test="updateName != null">#{updateName},</if>
|
||||
<if test="updateBy != null">#{updateBy},</if>
|
||||
<if test="updateTime != null">#{updateTime},</if>
|
||||
<if test="dFlowCalbz != null">#{dFlowCalbz},</if>
|
||||
<if test="dZcalbz != null">#{dZcalbz},</if>
|
||||
<if test="dCbtj != null">#{dCbtj},</if>
|
||||
<if test="dpbM != null">#{dpbM},</if>
|
||||
<if test="dtbM != null">#{dtbM},</if>
|
||||
<if test="dpbE != null">#{dpbE},</if>
|
||||
<if test="dtbE != null">#{dtbE},</if>
|
||||
<if test="dPatm != null">#{dPatm},</if>
|
||||
<if test="dPatmUnit != null">#{dPatmUnit},</if>
|
||||
<if test="dngCompents != null">#{dngCompents},</if>
|
||||
<if test="dMeterType != null">#{dMeterType},</if>
|
||||
<if test="dCoreType != null">#{dCoreType},</if>
|
||||
<if test="dPtmode != null">#{dPtmode},</if>
|
||||
<if test="dPipeType != null">#{dPipeType},</if>
|
||||
<if test="dPipeD != null">#{dPipeD},</if>
|
||||
<if test="dLenUnit != null">#{dLenUnit},</if>
|
||||
<if test="dPipeDtemp != null">#{dPipeDtemp},</if>
|
||||
<if test="dPileDtempU != null">#{dPileDtempU},</if>
|
||||
<if test="dPipeMaterial != null">#{dPipeMaterial},</if>
|
||||
<if test="dOrificeD != null">#{dOrificeD},</if>
|
||||
<if test="dOrificeUnit != null">#{dOrificeUnit},</if>
|
||||
<if test="dOrificeDtemp != null">#{dOrificeDtemp},</if>
|
||||
<if test="dOrificeDtempUnit != null">#{dOrificeDtempUnit},</if>
|
||||
<if test="dOrificeMaterial != null">#{dOrificeMaterial},</if>
|
||||
<if test="dOrificeSharpness != null">#{dOrificeSharpness},</if>
|
||||
<if test="dOrificeRk != null">#{dOrificeRk},</if>
|
||||
<if test="dOrificeRkLenU != null">#{dOrificeRkLenU},</if>
|
||||
<if test="dPf != null">#{dPf},</if>
|
||||
<if test="dPfUnit != null">#{dPfUnit},</if>
|
||||
<if test="dPfType != null">#{dPfType},</if>
|
||||
<if test="dTf != null">#{dTf},</if>
|
||||
<if test="dTfUnit != null">#{dTfUnit},</if>
|
||||
<if test="dDp != null">#{dDp},</if>
|
||||
<if test="dDpUnit != null">#{dDpUnit},</if>
|
||||
<if test="dVFlowUnit != null">#{dVFlowUnit},</if>
|
||||
<if test="dMFlowUnit != null">#{dMFlowUnit},</if>
|
||||
<if test="dEFlowUnit != null">#{dEFlowUnit},</if>
|
||||
<if test="dCd != null">#{dCd},</if>
|
||||
<if test="dCdCalMethod != null">#{dCdCalMethod},</if>
|
||||
<if test="dMeterFactor != null">#{dMeterFactor},</if>
|
||||
<if test="dPulseNum != null">#{dPulseNum},</if>
|
||||
<if test="dVFlowMax != null">#{dVFlowMax},</if>
|
||||
<if test="dVFlowMin != null">#{dVFlowMin},</if>
|
||||
<if test="dVFlowCon != null">#{dVFlowCon},</if>
|
||||
<if test="dPfRangeMin != null">#{dPfRangeMin},</if>
|
||||
<if test="dPfRangeMax != null">#{dPfRangeMax},</if>
|
||||
<if test="dDpRangeMin != null">#{dDpRangeMin},</if>
|
||||
<if test="dDpRangeMax != null">#{dDpRangeMax},</if>
|
||||
<if test="dTfRangeMin != null">#{dTfRangeMin},</if>
|
||||
<if test="dTfRangeMax != null">#{dTfRangeMax},</if>
|
||||
<if test="dVGsc != null">#{dVGsc},</if>
|
||||
<if test="sampleno != null">#{sampleno},</if>
|
||||
<if test="meterno != null">#{meterno},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateNgMeterpar" parameterType="NgMeterpar">
|
||||
update ng_meterpar
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="createName != null">create_name = #{createName},</if>
|
||||
<if test="createBy != null">create_by = #{createBy},</if>
|
||||
<if test="createTime != null">create_time = #{createTime},</if>
|
||||
<if test="updateName != null">update_name = #{updateName},</if>
|
||||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
<if test="dFlowCalbz != null">dFlowCalbz = #{dFlowCalbz},</if>
|
||||
<if test="dZcalbz != null">dZcalbz = #{dZcalbz},</if>
|
||||
<if test="dCbtj != null">dCbtj = #{dCbtj},</if>
|
||||
<if test="dpbM != null">dPb_M = #{dpbM},</if>
|
||||
<if test="dtbM != null">dTb_M = #{dtbM},</if>
|
||||
<if test="dpbE != null">dPb_E = #{dpbE},</if>
|
||||
<if test="dtbE != null">dTb_E = #{dtbE},</if>
|
||||
<if test="dPatm != null">dPatm = #{dPatm},</if>
|
||||
<if test="dPatmUnit != null">dPatmUnit = #{dPatmUnit},</if>
|
||||
<if test="dngCompents != null">dNG_Compents = #{dngCompents},</if>
|
||||
<if test="dMeterType != null">dMeterType = #{dMeterType},</if>
|
||||
<if test="dCoreType != null">dCoreType = #{dCoreType},</if>
|
||||
<if test="dPtmode != null">dPtmode = #{dPtmode},</if>
|
||||
<if test="dPipeType != null">dPipeType = #{dPipeType},</if>
|
||||
<if test="dPipeD != null">dPipeD = #{dPipeD},</if>
|
||||
<if test="dLenUnit != null">dLenUnit = #{dLenUnit},</if>
|
||||
<if test="dPipeDtemp != null">dPipeDtemp = #{dPipeDtemp},</if>
|
||||
<if test="dPileDtempU != null">dPileDtempU = #{dPileDtempU},</if>
|
||||
<if test="dPipeMaterial != null">dPipeMaterial = #{dPipeMaterial},</if>
|
||||
<if test="dOrificeD != null">dOrificeD = #{dOrificeD},</if>
|
||||
<if test="dOrificeUnit != null">dOrificeUnit = #{dOrificeUnit},</if>
|
||||
<if test="dOrificeDtemp != null">dOrificeDtemp = #{dOrificeDtemp},</if>
|
||||
<if test="dOrificeDtempUnit != null">dOrificeDtempUnit = #{dOrificeDtempUnit},</if>
|
||||
<if test="dOrificeMaterial != null">dOrificeMaterial = #{dOrificeMaterial},</if>
|
||||
<if test="dOrificeSharpness != null">dOrificeSharpness = #{dOrificeSharpness},</if>
|
||||
<if test="dOrificeRk != null">dOrificeRk = #{dOrificeRk},</if>
|
||||
<if test="dOrificeRkLenU != null">dOrificeRkLenU = #{dOrificeRkLenU},</if>
|
||||
<if test="dPf != null">dPf = #{dPf},</if>
|
||||
<if test="dPfUnit != null">dPfUnit = #{dPfUnit},</if>
|
||||
<if test="dPfType != null">dPfType = #{dPfType},</if>
|
||||
<if test="dTf != null">dTf = #{dTf},</if>
|
||||
<if test="dTfUnit != null">dTfUnit = #{dTfUnit},</if>
|
||||
<if test="dDp != null">dDp = #{dDp},</if>
|
||||
<if test="dDpUnit != null">dDpUnit = #{dDpUnit},</if>
|
||||
<if test="dVFlowUnit != null">dVFlowUnit = #{dVFlowUnit},</if>
|
||||
<if test="dMFlowUnit != null">dMFlowUnit = #{dMFlowUnit},</if>
|
||||
<if test="dEFlowUnit != null">dEFlowUnit = #{dEFlowUnit},</if>
|
||||
<if test="dCd != null">dCd = #{dCd},</if>
|
||||
<if test="dCdCalMethod != null">dCdCalMethod = #{dCdCalMethod},</if>
|
||||
<if test="dMeterFactor != null">dMeterFactor = #{dMeterFactor},</if>
|
||||
<if test="dPulseNum != null">dPulseNum = #{dPulseNum},</if>
|
||||
<if test="dVFlowMax != null">dVFlowMax = #{dVFlowMax},</if>
|
||||
<if test="dVFlowMin != null">dVFlowMin = #{dVFlowMin},</if>
|
||||
<if test="dVFlowCon != null">dVFlowCon = #{dVFlowCon},</if>
|
||||
<if test="dPfRangeMin != null">dPfRangeMin = #{dPfRangeMin},</if>
|
||||
<if test="dPfRangeMax != null">dPfRangeMax = #{dPfRangeMax},</if>
|
||||
<if test="dDpRangeMin != null">dDpRangeMin = #{dDpRangeMin},</if>
|
||||
<if test="dDpRangeMax != null">dDpRangeMax = #{dDpRangeMax},</if>
|
||||
<if test="dTfRangeMin != null">dTfRangeMin = #{dTfRangeMin},</if>
|
||||
<if test="dTfRangeMax != null">dTfRangeMax = #{dTfRangeMax},</if>
|
||||
<if test="dVGsc != null">dVGsc = #{dVGsc},</if>
|
||||
<if test="sampleno != null">sampleno = #{sampleno},</if>
|
||||
<if test="meterno != null">meterno = #{meterno},</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
||||
<delete id="deleteNgMeterparById" parameterType="String">
|
||||
delete from ng_meterpar where id = #{id}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteNgMeterparByIds" parameterType="String">
|
||||
delete from ng_meterpar where id in
|
||||
<foreach item="id" collection="array" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</delete>
|
||||
</mapper>
|
||||
@ -0,0 +1,184 @@
|
||||
<?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.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" />
|
||||
</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
|
||||
</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>
|
||||
</select>
|
||||
|
||||
<select id="selectNgMeterresultById" parameterType="String" resultMap="NgMeterresultResult">
|
||||
<include refid="selectNgMeterresultVo"/>
|
||||
where id = #{id}
|
||||
</select>
|
||||
|
||||
<insert id="insertNgMeterresult" parameterType="NgMeterresult">
|
||||
insert into ng_meterresult
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null">id,</if>
|
||||
<if test="createName != null">create_name,</if>
|
||||
<if test="createBy != null">create_by,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
<if test="updateName != null">update_name,</if>
|
||||
<if test="updateBy != null">update_by,</if>
|
||||
<if test="updateTime != null">update_time,</if>
|
||||
<if test="ybbh != null">ybbh,</if>
|
||||
<if test="dE != null">dE,</if>
|
||||
<if test="dFG != null">dFG,</if>
|
||||
<if test="dFT != null">dFT,</if>
|
||||
<if test="dDViscosity != null">dDViscosity,</if>
|
||||
<if test="dDExpCoefficient != null">dDExpCoefficient,</if>
|
||||
<if test="dRnPipe != null">dRnPipe,</if>
|
||||
<if test="dBk != null">dBk,</if>
|
||||
<if test="dRoughNessPipe != null">dRoughNessPipe,</if>
|
||||
<if test="dCdCorrect != null">dCdCorrect,</if>
|
||||
<if test="dCdNozell != null">dCdNozell,</if>
|
||||
<if test="dVFlowb != null">dVFlowb,</if>
|
||||
<if test="dVFlowf != null">dVFlowf,</if>
|
||||
<if test="dMFlowb != null">dMFlowb,</if>
|
||||
<if test="dEFlowb != null">dEFlowb,</if>
|
||||
<if test="dVelocityFlow != null">dVelocityFlow,</if>
|
||||
<if test="dPressLost != null">dPressLost,</if>
|
||||
<if test="dBeta != null">dBeta,</if>
|
||||
<if test="dKappa != null">dKappa,</if>
|
||||
<if test="sampleno != null">sampleno,</if>
|
||||
<if test="meterno != null">meterno,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null">#{id},</if>
|
||||
<if test="createName != null">#{createName},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
<if test="updateName != null">#{updateName},</if>
|
||||
<if test="updateBy != null">#{updateBy},</if>
|
||||
<if test="updateTime != null">#{updateTime},</if>
|
||||
<if test="ybbh != null">#{ybbh},</if>
|
||||
<if test="dE != null">#{dE},</if>
|
||||
<if test="dFG != null">#{dFG},</if>
|
||||
<if test="dFT != null">#{dFT},</if>
|
||||
<if test="dDViscosity != null">#{dDViscosity},</if>
|
||||
<if test="dDExpCoefficient != null">#{dDExpCoefficient},</if>
|
||||
<if test="dRnPipe != null">#{dRnPipe},</if>
|
||||
<if test="dBk != null">#{dBk},</if>
|
||||
<if test="dRoughNessPipe != null">#{dRoughNessPipe},</if>
|
||||
<if test="dCdCorrect != null">#{dCdCorrect},</if>
|
||||
<if test="dCdNozell != null">#{dCdNozell},</if>
|
||||
<if test="dVFlowb != null">#{dVFlowb},</if>
|
||||
<if test="dVFlowf != null">#{dVFlowf},</if>
|
||||
<if test="dMFlowb != null">#{dMFlowb},</if>
|
||||
<if test="dEFlowb != null">#{dEFlowb},</if>
|
||||
<if test="dVelocityFlow != null">#{dVelocityFlow},</if>
|
||||
<if test="dPressLost != null">#{dPressLost},</if>
|
||||
<if test="dBeta != null">#{dBeta},</if>
|
||||
<if test="dKappa != null">#{dKappa},</if>
|
||||
<if test="sampleno != null">#{sampleno},</if>
|
||||
<if test="meterno != null">#{meterno},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateNgMeterresult" parameterType="NgMeterresult">
|
||||
update ng_meterresult
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="createName != null">create_name = #{createName},</if>
|
||||
<if test="createBy != null">create_by = #{createBy},</if>
|
||||
<if test="createTime != null">create_time = #{createTime},</if>
|
||||
<if test="updateName != null">update_name = #{updateName},</if>
|
||||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
<if test="ybbh != null">ybbh = #{ybbh},</if>
|
||||
<if test="dE != null">dE = #{dE},</if>
|
||||
<if test="dFG != null">dFG = #{dFG},</if>
|
||||
<if test="dFT != null">dFT = #{dFT},</if>
|
||||
<if test="dDViscosity != null">dDViscosity = #{dDViscosity},</if>
|
||||
<if test="dDExpCoefficient != null">dDExpCoefficient = #{dDExpCoefficient},</if>
|
||||
<if test="dRnPipe != null">dRnPipe = #{dRnPipe},</if>
|
||||
<if test="dBk != null">dBk = #{dBk},</if>
|
||||
<if test="dRoughNessPipe != null">dRoughNessPipe = #{dRoughNessPipe},</if>
|
||||
<if test="dCdCorrect != null">dCdCorrect = #{dCdCorrect},</if>
|
||||
<if test="dCdNozell != null">dCdNozell = #{dCdNozell},</if>
|
||||
<if test="dVFlowb != null">dVFlowb = #{dVFlowb},</if>
|
||||
<if test="dVFlowf != null">dVFlowf = #{dVFlowf},</if>
|
||||
<if test="dMFlowb != null">dMFlowb = #{dMFlowb},</if>
|
||||
<if test="dEFlowb != null">dEFlowb = #{dEFlowb},</if>
|
||||
<if test="dVelocityFlow != null">dVelocityFlow = #{dVelocityFlow},</if>
|
||||
<if test="dPressLost != null">dPressLost = #{dPressLost},</if>
|
||||
<if test="dBeta != null">dBeta = #{dBeta},</if>
|
||||
<if test="dKappa != null">dKappa = #{dKappa},</if>
|
||||
<if test="sampleno != null">sampleno = #{sampleno},</if>
|
||||
<if test="meterno != null">meterno = #{meterno},</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
||||
<delete id="deleteNgMeterresultById" parameterType="String">
|
||||
delete from ng_meterresult where id = #{id}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteNgMeterresultByIds" parameterType="String">
|
||||
delete from ng_meterresult where id in
|
||||
<foreach item="id" collection="array" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</delete>
|
||||
</mapper>
|
||||
@ -0,0 +1,349 @@
|
||||
<?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.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" />
|
||||
</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
|
||||
</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>
|
||||
</select>
|
||||
|
||||
<select id="selectNgNgparById" parameterType="String" resultMap="NgNgparResult">
|
||||
<include refid="selectNgNgparVo"/>
|
||||
where id = #{id}
|
||||
</select>
|
||||
|
||||
<insert id="insertNgNgpar" parameterType="NgNgpar">
|
||||
insert into ng_ngpar
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null">id,</if>
|
||||
<if test="createName != null">create_name,</if>
|
||||
<if test="createBy != null">create_by,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
<if test="updateName != null">update_name,</if>
|
||||
<if test="updateBy != null">update_by,</if>
|
||||
<if test="updateTime != null">update_time,</if>
|
||||
<if test="adMixture != null">adMixture,</if>
|
||||
<if test="adMixtureV != null">adMixtureV,</if>
|
||||
<if test="adMixtureD != null">adMixtureD,</if>
|
||||
<if test="dCbtj != null">dCbtj,</if>
|
||||
<if test="dPb != null">dPb,</if>
|
||||
<if test="dTb != null">dTb,</if>
|
||||
<if test="dPf != null">dPf,</if>
|
||||
<if test="dTf != null">dTf,</if>
|
||||
<if test="dMrx != null">dMrx,</if>
|
||||
<if test="dZb != null">dZb,</if>
|
||||
<if test="dZf != null">dZf,</if>
|
||||
<if test="dFpv != null">dFpv,</if>
|
||||
<if test="dDb != null">dDb,</if>
|
||||
<if test="dDf != null">dDf,</if>
|
||||
<if test="dRhob != null">dRhob,</if>
|
||||
<if test="dRhof != null">dRhof,</if>
|
||||
<if test="drdIdeal != null">dRD_Ideal,</if>
|
||||
<if test="drdReal != null">dRD_Real,</if>
|
||||
<if test="dHo != null">dHo,</if>
|
||||
<if test="dH != null">dH,</if>
|
||||
<if test="dS != null">dS,</if>
|
||||
<if test="dCpi != null">dCpi,</if>
|
||||
<if test="dCp != null">dCp,</if>
|
||||
<if test="dCv != null">dCv,</if>
|
||||
<if test="dk != null">dk,</if>
|
||||
<if test="dKappa != null">dKappa,</if>
|
||||
<if test="dSOS != null">dSOS,</if>
|
||||
<if test="dCstar != null">dCstar,</if>
|
||||
<if test="dHhvMol != null">dHhvMol,</if>
|
||||
<if test="dLhvMol != null">dLhvMol,</if>
|
||||
<if test="dHhvv != null">dHhvv,</if>
|
||||
<if test="dLhvv != null">dLhvv,</if>
|
||||
<if test="dHhvm != null">dHhvm,</if>
|
||||
<if test="dLhvm != null">dLhvm,</if>
|
||||
<if test="dZb11062 != null">dZb11062,</if>
|
||||
<if test="dRhob11062 != null">dRhob11062,</if>
|
||||
<if test="dRhof11062 != null">dRhof11062,</if>
|
||||
<if test="drdIdeal11062 != null">dRD_Ideal11062,</if>
|
||||
<if test="drdReal11062 != null">dRD_Real11062,</if>
|
||||
<if test="dWobbeIndex != null">dWobbeIndex,</if>
|
||||
<if test="dPc != null">dPc,</if>
|
||||
<if test="dTC != null">dTC,</if>
|
||||
<if test="dBzsx != null">dBzsx,</if>
|
||||
<if test="dBzxx != null">dBzxx,</if>
|
||||
<if test="dTotalC != null">dTotalC,</if>
|
||||
<if test="dC2 != null">dC2,</if>
|
||||
<if test="dC2j != null">dC2j,</if>
|
||||
<if test="dC3j != null">dC3j,</if>
|
||||
<if test="dC4j != null">dC4j,</if>
|
||||
<if test="dC5j != null">dC5j,</if>
|
||||
<if test="dC6j != null">dC6j,</if>
|
||||
<if test="dC3C4 != null">dC3C4,</if>
|
||||
<if test="sampleno != null">sampleno,</if>
|
||||
<if test="meterno != null">meterno,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null">#{id},</if>
|
||||
<if test="createName != null">#{createName},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
<if test="updateName != null">#{updateName},</if>
|
||||
<if test="updateBy != null">#{updateBy},</if>
|
||||
<if test="updateTime != null">#{updateTime},</if>
|
||||
<if test="adMixture != null">#{adMixture},</if>
|
||||
<if test="adMixtureV != null">#{adMixtureV},</if>
|
||||
<if test="adMixtureD != null">#{adMixtureD},</if>
|
||||
<if test="dCbtj != null">#{dCbtj},</if>
|
||||
<if test="dPb != null">#{dPb},</if>
|
||||
<if test="dTb != null">#{dTb},</if>
|
||||
<if test="dPf != null">#{dPf},</if>
|
||||
<if test="dTf != null">#{dTf},</if>
|
||||
<if test="dMrx != null">#{dMrx},</if>
|
||||
<if test="dZb != null">#{dZb},</if>
|
||||
<if test="dZf != null">#{dZf},</if>
|
||||
<if test="dFpv != null">#{dFpv},</if>
|
||||
<if test="dDb != null">#{dDb},</if>
|
||||
<if test="dDf != null">#{dDf},</if>
|
||||
<if test="dRhob != null">#{dRhob},</if>
|
||||
<if test="dRhof != null">#{dRhof},</if>
|
||||
<if test="drdIdeal != null">#{drdIdeal},</if>
|
||||
<if test="drdReal != null">#{drdReal},</if>
|
||||
<if test="dHo != null">#{dHo},</if>
|
||||
<if test="dH != null">#{dH},</if>
|
||||
<if test="dS != null">#{dS},</if>
|
||||
<if test="dCpi != null">#{dCpi},</if>
|
||||
<if test="dCp != null">#{dCp},</if>
|
||||
<if test="dCv != null">#{dCv},</if>
|
||||
<if test="dk != null">#{dk},</if>
|
||||
<if test="dKappa != null">#{dKappa},</if>
|
||||
<if test="dSOS != null">#{dSOS},</if>
|
||||
<if test="dCstar != null">#{dCstar},</if>
|
||||
<if test="dHhvMol != null">#{dHhvMol},</if>
|
||||
<if test="dLhvMol != null">#{dLhvMol},</if>
|
||||
<if test="dHhvv != null">#{dHhvv},</if>
|
||||
<if test="dLhvv != null">#{dLhvv},</if>
|
||||
<if test="dHhvm != null">#{dHhvm},</if>
|
||||
<if test="dLhvm != null">#{dLhvm},</if>
|
||||
<if test="dZb11062 != null">#{dZb11062},</if>
|
||||
<if test="dRhob11062 != null">#{dRhob11062},</if>
|
||||
<if test="dRhof11062 != null">#{dRhof11062},</if>
|
||||
<if test="drdIdeal11062 != null">#{drdIdeal11062},</if>
|
||||
<if test="drdReal11062 != null">#{drdReal11062},</if>
|
||||
<if test="dWobbeIndex != null">#{dWobbeIndex},</if>
|
||||
<if test="dPc != null">#{dPc},</if>
|
||||
<if test="dTC != null">#{dTC},</if>
|
||||
<if test="dBzsx != null">#{dBzsx},</if>
|
||||
<if test="dBzxx != null">#{dBzxx},</if>
|
||||
<if test="dTotalC != null">#{dTotalC},</if>
|
||||
<if test="dC2 != null">#{dC2},</if>
|
||||
<if test="dC2j != null">#{dC2j},</if>
|
||||
<if test="dC3j != null">#{dC3j},</if>
|
||||
<if test="dC4j != null">#{dC4j},</if>
|
||||
<if test="dC5j != null">#{dC5j},</if>
|
||||
<if test="dC6j != null">#{dC6j},</if>
|
||||
<if test="dC3C4 != null">#{dC3C4},</if>
|
||||
<if test="sampleno != null">#{sampleno},</if>
|
||||
<if test="meterno != null">#{meterno},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateNgNgpar" parameterType="NgNgpar">
|
||||
update ng_ngpar
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="createName != null">create_name = #{createName},</if>
|
||||
<if test="createBy != null">create_by = #{createBy},</if>
|
||||
<if test="createTime != null">create_time = #{createTime},</if>
|
||||
<if test="updateName != null">update_name = #{updateName},</if>
|
||||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
<if test="adMixture != null">adMixture = #{adMixture},</if>
|
||||
<if test="adMixtureV != null">adMixtureV = #{adMixtureV},</if>
|
||||
<if test="adMixtureD != null">adMixtureD = #{adMixtureD},</if>
|
||||
<if test="dCbtj != null">dCbtj = #{dCbtj},</if>
|
||||
<if test="dPb != null">dPb = #{dPb},</if>
|
||||
<if test="dTb != null">dTb = #{dTb},</if>
|
||||
<if test="dPf != null">dPf = #{dPf},</if>
|
||||
<if test="dTf != null">dTf = #{dTf},</if>
|
||||
<if test="dMrx != null">dMrx = #{dMrx},</if>
|
||||
<if test="dZb != null">dZb = #{dZb},</if>
|
||||
<if test="dZf != null">dZf = #{dZf},</if>
|
||||
<if test="dFpv != null">dFpv = #{dFpv},</if>
|
||||
<if test="dDb != null">dDb = #{dDb},</if>
|
||||
<if test="dDf != null">dDf = #{dDf},</if>
|
||||
<if test="dRhob != null">dRhob = #{dRhob},</if>
|
||||
<if test="dRhof != null">dRhof = #{dRhof},</if>
|
||||
<if test="drdIdeal != null">dRD_Ideal = #{drdIdeal},</if>
|
||||
<if test="drdReal != null">dRD_Real = #{drdReal},</if>
|
||||
<if test="dHo != null">dHo = #{dHo},</if>
|
||||
<if test="dH != null">dH = #{dH},</if>
|
||||
<if test="dS != null">dS = #{dS},</if>
|
||||
<if test="dCpi != null">dCpi = #{dCpi},</if>
|
||||
<if test="dCp != null">dCp = #{dCp},</if>
|
||||
<if test="dCv != null">dCv = #{dCv},</if>
|
||||
<if test="dk != null">dk = #{dk},</if>
|
||||
<if test="dKappa != null">dKappa = #{dKappa},</if>
|
||||
<if test="dSOS != null">dSOS = #{dSOS},</if>
|
||||
<if test="dCstar != null">dCstar = #{dCstar},</if>
|
||||
<if test="dHhvMol != null">dHhvMol = #{dHhvMol},</if>
|
||||
<if test="dLhvMol != null">dLhvMol = #{dLhvMol},</if>
|
||||
<if test="dHhvv != null">dHhvv = #{dHhvv},</if>
|
||||
<if test="dLhvv != null">dLhvv = #{dLhvv},</if>
|
||||
<if test="dHhvm != null">dHhvm = #{dHhvm},</if>
|
||||
<if test="dLhvm != null">dLhvm = #{dLhvm},</if>
|
||||
<if test="dZb11062 != null">dZb11062 = #{dZb11062},</if>
|
||||
<if test="dRhob11062 != null">dRhob11062 = #{dRhob11062},</if>
|
||||
<if test="dRhof11062 != null">dRhof11062 = #{dRhof11062},</if>
|
||||
<if test="drdIdeal11062 != null">dRD_Ideal11062 = #{drdIdeal11062},</if>
|
||||
<if test="drdReal11062 != null">dRD_Real11062 = #{drdReal11062},</if>
|
||||
<if test="dWobbeIndex != null">dWobbeIndex = #{dWobbeIndex},</if>
|
||||
<if test="dPc != null">dPc = #{dPc},</if>
|
||||
<if test="dTC != null">dTC = #{dTC},</if>
|
||||
<if test="dBzsx != null">dBzsx = #{dBzsx},</if>
|
||||
<if test="dBzxx != null">dBzxx = #{dBzxx},</if>
|
||||
<if test="dTotalC != null">dTotalC = #{dTotalC},</if>
|
||||
<if test="dC2 != null">dC2 = #{dC2},</if>
|
||||
<if test="dC2j != null">dC2j = #{dC2j},</if>
|
||||
<if test="dC3j != null">dC3j = #{dC3j},</if>
|
||||
<if test="dC4j != null">dC4j = #{dC4j},</if>
|
||||
<if test="dC5j != null">dC5j = #{dC5j},</if>
|
||||
<if test="dC6j != null">dC6j = #{dC6j},</if>
|
||||
<if test="dC3C4 != null">dC3C4 = #{dC3C4},</if>
|
||||
<if test="sampleno != null">sampleno = #{sampleno},</if>
|
||||
<if test="meterno != null">meterno = #{meterno},</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
||||
<delete id="deleteNgNgparById" parameterType="String">
|
||||
delete from ng_ngpar where id = #{id}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteNgNgparByIds" parameterType="String">
|
||||
delete from ng_ngpar where id in
|
||||
<foreach item="id" collection="array" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</delete>
|
||||
</mapper>
|
||||
@ -0,0 +1,243 @@
|
||||
<?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.system.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="tenantId" column="tenant_id" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectNgComponentsVo">
|
||||
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 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 nc.id = #{id}
|
||||
</select>
|
||||
|
||||
<insert id="insertNgComponents" parameterType="NgComponents">
|
||||
insert into ng_components
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null">id,</if>
|
||||
<if test="createName != null">create_name,</if>
|
||||
<if test="createBy != null">create_by,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
<if test="updateName != null">update_name,</if>
|
||||
<if test="updateBy != null">update_by,</if>
|
||||
<if test="updateTime != null">update_time,</if>
|
||||
<if test="ngC1 != null">NG_C1,</if>
|
||||
<if test="ngN2 != null">NG_N2,</if>
|
||||
<if test="ngCo2 != null">NG_CO2,</if>
|
||||
<if test="ngC2 != null">NG_C2,</if>
|
||||
<if test="ngC3 != null">NG_C3,</if>
|
||||
<if test="ngH2o != null">NG_H2O,</if>
|
||||
<if test="ngH2s != null">NG_H2S,</if>
|
||||
<if test="ngH2 != null">NG_H2,</if>
|
||||
<if test="ngCo != null">NG_CO,</if>
|
||||
<if test="ngO2 != null">NG_O2,</if>
|
||||
<if test="ngIc4 != null">NG_iC4,</if>
|
||||
<if test="ngNc4 != null">NG_nC4,</if>
|
||||
<if test="ngIc5 != null">NG_iC5,</if>
|
||||
<if test="ngNc5 != null">NG_nC5,</if>
|
||||
<if test="ngC6 != null">NG_C6,</if>
|
||||
<if test="ngC7 != null">NG_C7,</if>
|
||||
<if test="ngC8 != null">NG_C8,</if>
|
||||
<if test="ngC9 != null">NG_C9,</if>
|
||||
<if test="ngC10 != null">NG_C10,</if>
|
||||
<if test="ngHe != null">NG_He,</if>
|
||||
<if test="ngAr != null">NG_Ar,</if>
|
||||
<if test="sum != null">sum,</if>
|
||||
<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>
|
||||
<if test="createName != null">#{createName},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
<if test="updateName != null">#{updateName},</if>
|
||||
<if test="updateBy != null">#{updateBy},</if>
|
||||
<if test="updateTime != null">#{updateTime},</if>
|
||||
<if test="ngC1 != null">#{ngC1},</if>
|
||||
<if test="ngN2 != null">#{ngN2},</if>
|
||||
<if test="ngCo2 != null">#{ngCo2},</if>
|
||||
<if test="ngC2 != null">#{ngC2},</if>
|
||||
<if test="ngC3 != null">#{ngC3},</if>
|
||||
<if test="ngH2o != null">#{ngH2o},</if>
|
||||
<if test="ngH2s != null">#{ngH2s},</if>
|
||||
<if test="ngH2 != null">#{ngH2},</if>
|
||||
<if test="ngCo != null">#{ngCo},</if>
|
||||
<if test="ngO2 != null">#{ngO2},</if>
|
||||
<if test="ngIc4 != null">#{ngIc4},</if>
|
||||
<if test="ngNc4 != null">#{ngNc4},</if>
|
||||
<if test="ngIc5 != null">#{ngIc5},</if>
|
||||
<if test="ngNc5 != null">#{ngNc5},</if>
|
||||
<if test="ngC6 != null">#{ngC6},</if>
|
||||
<if test="ngC7 != null">#{ngC7},</if>
|
||||
<if test="ngC8 != null">#{ngC8},</if>
|
||||
<if test="ngC9 != null">#{ngC9},</if>
|
||||
<if test="ngC10 != null">#{ngC10},</if>
|
||||
<if test="ngHe != null">#{ngHe},</if>
|
||||
<if test="ngAr != null">#{ngAr},</if>
|
||||
<if test="sum != null">#{sum},</if>
|
||||
<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>
|
||||
|
||||
<update id="updateNgComponents" parameterType="NgComponents">
|
||||
update ng_components
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="createName != null">create_name = #{createName},</if>
|
||||
<if test="createBy != null">create_by = #{createBy},</if>
|
||||
<if test="createTime != null">create_time = #{createTime},</if>
|
||||
<if test="updateName != null">update_name = #{updateName},</if>
|
||||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
<if test="ngC1 != null">NG_C1 = #{ngC1},</if>
|
||||
<if test="ngN2 != null">NG_N2 = #{ngN2},</if>
|
||||
<if test="ngCo2 != null">NG_CO2 = #{ngCo2},</if>
|
||||
<if test="ngC2 != null">NG_C2 = #{ngC2},</if>
|
||||
<if test="ngC3 != null">NG_C3 = #{ngC3},</if>
|
||||
<if test="ngH2o != null">NG_H2O = #{ngH2o},</if>
|
||||
<if test="ngH2s != null">NG_H2S = #{ngH2s},</if>
|
||||
<if test="ngH2 != null">NG_H2 = #{ngH2},</if>
|
||||
<if test="ngCo != null">NG_CO = #{ngCo},</if>
|
||||
<if test="ngO2 != null">NG_O2 = #{ngO2},</if>
|
||||
<if test="ngIc4 != null">NG_iC4 = #{ngIc4},</if>
|
||||
<if test="ngNc4 != null">NG_nC4 = #{ngNc4},</if>
|
||||
<if test="ngIc5 != null">NG_iC5 = #{ngIc5},</if>
|
||||
<if test="ngNc5 != null">NG_nC5 = #{ngNc5},</if>
|
||||
<if test="ngC6 != null">NG_C6 = #{ngC6},</if>
|
||||
<if test="ngC7 != null">NG_C7 = #{ngC7},</if>
|
||||
<if test="ngC8 != null">NG_C8 = #{ngC8},</if>
|
||||
<if test="ngC9 != null">NG_C9 = #{ngC9},</if>
|
||||
<if test="ngC10 != null">NG_C10 = #{ngC10},</if>
|
||||
<if test="ngHe != null">NG_He = #{ngHe},</if>
|
||||
<if test="ngAr != null">NG_Ar = #{ngAr},</if>
|
||||
<if test="sum != null">sum = #{sum},</if>
|
||||
<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 ng_components.id = #{id}
|
||||
</update>
|
||||
|
||||
<delete id="deleteNgComponentsById" parameterType="String">
|
||||
delete from ng_components where id = #{id}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteNgComponentsByIds" parameterType="String">
|
||||
delete from ng_components where id in
|
||||
<foreach item="id" collection="array" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</delete>
|
||||
</mapper>
|
||||
@ -0,0 +1,411 @@
|
||||
<?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.system.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="tenantId" column="tenant_id" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectNgMeterparVo">
|
||||
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 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 nm.id = #{id}
|
||||
</select>
|
||||
|
||||
<insert id="insertNgMeterpar" parameterType="NgMeterpar">
|
||||
insert into ng_meterpar
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null">id,</if>
|
||||
<if test="createName != null">create_name,</if>
|
||||
<if test="createBy != null">create_by,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
<if test="updateName != null">update_name,</if>
|
||||
<if test="updateBy != null">update_by,</if>
|
||||
<if test="updateTime != null">update_time,</if>
|
||||
<if test="dFlowCalbz != null">dFlowCalbz,</if>
|
||||
<if test="dZcalbz != null">dZcalbz,</if>
|
||||
<if test="dCbtj != null">dCbtj,</if>
|
||||
<if test="dpbM != null">dPb_M,</if>
|
||||
<if test="dtbM != null">dTb_M,</if>
|
||||
<if test="dpbE != null">dPb_E,</if>
|
||||
<if test="dtbE != null">dTb_E,</if>
|
||||
<if test="dPatm != null">dPatm,</if>
|
||||
<if test="dPatmUnit != null">dPatmUnit,</if>
|
||||
<if test="dngCompents != null">dNG_Compents,</if>
|
||||
<if test="dMeterType != null">dMeterType,</if>
|
||||
<if test="dCoreType != null">dCoreType,</if>
|
||||
<if test="dPtmode != null">dPtmode,</if>
|
||||
<if test="dPipeType != null">dPipeType,</if>
|
||||
<if test="dPipeD != null">dPipeD,</if>
|
||||
<if test="dLenUnit != null">dLenUnit,</if>
|
||||
<if test="dPipeDtemp != null">dPipeDtemp,</if>
|
||||
<if test="dPileDtempU != null">dPileDtempU,</if>
|
||||
<if test="dPipeMaterial != null">dPipeMaterial,</if>
|
||||
<if test="dOrificeD != null">dOrificeD,</if>
|
||||
<if test="dOrificeUnit != null">dOrificeUnit,</if>
|
||||
<if test="dOrificeDtemp != null">dOrificeDtemp,</if>
|
||||
<if test="dOrificeDtempUnit != null">dOrificeDtempUnit,</if>
|
||||
<if test="dOrificeMaterial != null">dOrificeMaterial,</if>
|
||||
<if test="dOrificeSharpness != null">dOrificeSharpness,</if>
|
||||
<if test="dOrificeRk != null">dOrificeRk,</if>
|
||||
<if test="dOrificeRkLenU != null">dOrificeRkLenU,</if>
|
||||
<if test="dPf != null">dPf,</if>
|
||||
<if test="dPfUnit != null">dPfUnit,</if>
|
||||
<if test="dPfType != null">dPfType,</if>
|
||||
<if test="dTf != null">dTf,</if>
|
||||
<if test="dTfUnit != null">dTfUnit,</if>
|
||||
<if test="dDp != null">dDp,</if>
|
||||
<if test="dDpUnit != null">dDpUnit,</if>
|
||||
<if test="dVFlowUnit != null">dVFlowUnit,</if>
|
||||
<if test="dMFlowUnit != null">dMFlowUnit,</if>
|
||||
<if test="dEFlowUnit != null">dEFlowUnit,</if>
|
||||
<if test="dCd != null">dCd,</if>
|
||||
<if test="dCdCalMethod != null">dCdCalMethod,</if>
|
||||
<if test="dMeterFactor != null">dMeterFactor,</if>
|
||||
<if test="dPulseNum != null">dPulseNum,</if>
|
||||
<if test="dVFlowMax != null">dVFlowMax,</if>
|
||||
<if test="dVFlowMin != null">dVFlowMin,</if>
|
||||
<if test="dVFlowCon != null">dVFlowCon,</if>
|
||||
<if test="dPfRangeMin != null">dPfRangeMin,</if>
|
||||
<if test="dPfRangeMax != null">dPfRangeMax,</if>
|
||||
<if test="dDpRangeMin != null">dDpRangeMin,</if>
|
||||
<if test="dDpRangeMax != null">dDpRangeMax,</if>
|
||||
<if test="dTfRangeMin != null">dTfRangeMin,</if>
|
||||
<if test="dTfRangeMax != null">dTfRangeMax,</if>
|
||||
<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>
|
||||
<if test="createName != null">#{createName},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
<if test="updateName != null">#{updateName},</if>
|
||||
<if test="updateBy != null">#{updateBy},</if>
|
||||
<if test="updateTime != null">#{updateTime},</if>
|
||||
<if test="dFlowCalbz != null">#{dFlowCalbz},</if>
|
||||
<if test="dZcalbz != null">#{dZcalbz},</if>
|
||||
<if test="dCbtj != null">#{dCbtj},</if>
|
||||
<if test="dpbM != null">#{dpbM},</if>
|
||||
<if test="dtbM != null">#{dtbM},</if>
|
||||
<if test="dpbE != null">#{dpbE},</if>
|
||||
<if test="dtbE != null">#{dtbE},</if>
|
||||
<if test="dPatm != null">#{dPatm},</if>
|
||||
<if test="dPatmUnit != null">#{dPatmUnit},</if>
|
||||
<if test="dngCompents != null">#{dngCompents},</if>
|
||||
<if test="dMeterType != null">#{dMeterType},</if>
|
||||
<if test="dCoreType != null">#{dCoreType},</if>
|
||||
<if test="dPtmode != null">#{dPtmode},</if>
|
||||
<if test="dPipeType != null">#{dPipeType},</if>
|
||||
<if test="dPipeD != null">#{dPipeD},</if>
|
||||
<if test="dLenUnit != null">#{dLenUnit},</if>
|
||||
<if test="dPipeDtemp != null">#{dPipeDtemp},</if>
|
||||
<if test="dPileDtempU != null">#{dPileDtempU},</if>
|
||||
<if test="dPipeMaterial != null">#{dPipeMaterial},</if>
|
||||
<if test="dOrificeD != null">#{dOrificeD},</if>
|
||||
<if test="dOrificeUnit != null">#{dOrificeUnit},</if>
|
||||
<if test="dOrificeDtemp != null">#{dOrificeDtemp},</if>
|
||||
<if test="dOrificeDtempUnit != null">#{dOrificeDtempUnit},</if>
|
||||
<if test="dOrificeMaterial != null">#{dOrificeMaterial},</if>
|
||||
<if test="dOrificeSharpness != null">#{dOrificeSharpness},</if>
|
||||
<if test="dOrificeRk != null">#{dOrificeRk},</if>
|
||||
<if test="dOrificeRkLenU != null">#{dOrificeRkLenU},</if>
|
||||
<if test="dPf != null">#{dPf},</if>
|
||||
<if test="dPfUnit != null">#{dPfUnit},</if>
|
||||
<if test="dPfType != null">#{dPfType},</if>
|
||||
<if test="dTf != null">#{dTf},</if>
|
||||
<if test="dTfUnit != null">#{dTfUnit},</if>
|
||||
<if test="dDp != null">#{dDp},</if>
|
||||
<if test="dDpUnit != null">#{dDpUnit},</if>
|
||||
<if test="dVFlowUnit != null">#{dVFlowUnit},</if>
|
||||
<if test="dMFlowUnit != null">#{dMFlowUnit},</if>
|
||||
<if test="dEFlowUnit != null">#{dEFlowUnit},</if>
|
||||
<if test="dCd != null">#{dCd},</if>
|
||||
<if test="dCdCalMethod != null">#{dCdCalMethod},</if>
|
||||
<if test="dMeterFactor != null">#{dMeterFactor},</if>
|
||||
<if test="dPulseNum != null">#{dPulseNum},</if>
|
||||
<if test="dVFlowMax != null">#{dVFlowMax},</if>
|
||||
<if test="dVFlowMin != null">#{dVFlowMin},</if>
|
||||
<if test="dVFlowCon != null">#{dVFlowCon},</if>
|
||||
<if test="dPfRangeMin != null">#{dPfRangeMin},</if>
|
||||
<if test="dPfRangeMax != null">#{dPfRangeMax},</if>
|
||||
<if test="dDpRangeMin != null">#{dDpRangeMin},</if>
|
||||
<if test="dDpRangeMax != null">#{dDpRangeMax},</if>
|
||||
<if test="dTfRangeMin != null">#{dTfRangeMin},</if>
|
||||
<if test="dTfRangeMax != null">#{dTfRangeMax},</if>
|
||||
<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>
|
||||
|
||||
<update id="updateNgMeterpar" parameterType="NgMeterpar">
|
||||
update ng_meterpar
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="createName != null">create_name = #{createName},</if>
|
||||
<if test="createBy != null">create_by = #{createBy},</if>
|
||||
<if test="createTime != null">create_time = #{createTime},</if>
|
||||
<if test="updateName != null">update_name = #{updateName},</if>
|
||||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
<if test="dFlowCalbz != null">dFlowCalbz = #{dFlowCalbz},</if>
|
||||
<if test="dZcalbz != null">dZcalbz = #{dZcalbz},</if>
|
||||
<if test="dCbtj != null">dCbtj = #{dCbtj},</if>
|
||||
<if test="dpbM != null">dPb_M = #{dpbM},</if>
|
||||
<if test="dtbM != null">dTb_M = #{dtbM},</if>
|
||||
<if test="dpbE != null">dPb_E = #{dpbE},</if>
|
||||
<if test="dtbE != null">dTb_E = #{dtbE},</if>
|
||||
<if test="dPatm != null">dPatm = #{dPatm},</if>
|
||||
<if test="dPatmUnit != null">dPatmUnit = #{dPatmUnit},</if>
|
||||
<if test="dngCompents != null">dNG_Compents = #{dngCompents},</if>
|
||||
<if test="dMeterType != null">dMeterType = #{dMeterType},</if>
|
||||
<if test="dCoreType != null">dCoreType = #{dCoreType},</if>
|
||||
<if test="dPtmode != null">dPtmode = #{dPtmode},</if>
|
||||
<if test="dPipeType != null">dPipeType = #{dPipeType},</if>
|
||||
<if test="dPipeD != null">dPipeD = #{dPipeD},</if>
|
||||
<if test="dLenUnit != null">dLenUnit = #{dLenUnit},</if>
|
||||
<if test="dPipeDtemp != null">dPipeDtemp = #{dPipeDtemp},</if>
|
||||
<if test="dPileDtempU != null">dPileDtempU = #{dPileDtempU},</if>
|
||||
<if test="dPipeMaterial != null">dPipeMaterial = #{dPipeMaterial},</if>
|
||||
<if test="dOrificeD != null">dOrificeD = #{dOrificeD},</if>
|
||||
<if test="dOrificeUnit != null">dOrificeUnit = #{dOrificeUnit},</if>
|
||||
<if test="dOrificeDtemp != null">dOrificeDtemp = #{dOrificeDtemp},</if>
|
||||
<if test="dOrificeDtempUnit != null">dOrificeDtempUnit = #{dOrificeDtempUnit},</if>
|
||||
<if test="dOrificeMaterial != null">dOrificeMaterial = #{dOrificeMaterial},</if>
|
||||
<if test="dOrificeSharpness != null">dOrificeSharpness = #{dOrificeSharpness},</if>
|
||||
<if test="dOrificeRk != null">dOrificeRk = #{dOrificeRk},</if>
|
||||
<if test="dOrificeRkLenU != null">dOrificeRkLenU = #{dOrificeRkLenU},</if>
|
||||
<if test="dPf != null">dPf = #{dPf},</if>
|
||||
<if test="dPfUnit != null">dPfUnit = #{dPfUnit},</if>
|
||||
<if test="dPfType != null">dPfType = #{dPfType},</if>
|
||||
<if test="dTf != null">dTf = #{dTf},</if>
|
||||
<if test="dTfUnit != null">dTfUnit = #{dTfUnit},</if>
|
||||
<if test="dDp != null">dDp = #{dDp},</if>
|
||||
<if test="dDpUnit != null">dDpUnit = #{dDpUnit},</if>
|
||||
<if test="dVFlowUnit != null">dVFlowUnit = #{dVFlowUnit},</if>
|
||||
<if test="dMFlowUnit != null">dMFlowUnit = #{dMFlowUnit},</if>
|
||||
<if test="dEFlowUnit != null">dEFlowUnit = #{dEFlowUnit},</if>
|
||||
<if test="dCd != null">dCd = #{dCd},</if>
|
||||
<if test="dCdCalMethod != null">dCdCalMethod = #{dCdCalMethod},</if>
|
||||
<if test="dMeterFactor != null">dMeterFactor = #{dMeterFactor},</if>
|
||||
<if test="dPulseNum != null">dPulseNum = #{dPulseNum},</if>
|
||||
<if test="dVFlowMax != null">dVFlowMax = #{dVFlowMax},</if>
|
||||
<if test="dVFlowMin != null">dVFlowMin = #{dVFlowMin},</if>
|
||||
<if test="dVFlowCon != null">dVFlowCon = #{dVFlowCon},</if>
|
||||
<if test="dPfRangeMin != null">dPfRangeMin = #{dPfRangeMin},</if>
|
||||
<if test="dPfRangeMax != null">dPfRangeMax = #{dPfRangeMax},</if>
|
||||
<if test="dDpRangeMin != null">dDpRangeMin = #{dDpRangeMin},</if>
|
||||
<if test="dDpRangeMax != null">dDpRangeMax = #{dDpRangeMax},</if>
|
||||
<if test="dTfRangeMin != null">dTfRangeMin = #{dTfRangeMin},</if>
|
||||
<if test="dTfRangeMax != null">dTfRangeMax = #{dTfRangeMax},</if>
|
||||
<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 ng_meterpar.id = #{id}
|
||||
</update>
|
||||
|
||||
<delete id="deleteNgMeterparById" parameterType="String">
|
||||
delete from ng_meterpar where id = #{id}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteNgMeterparByIds" parameterType="String">
|
||||
delete from ng_meterpar where id in
|
||||
<foreach item="id" collection="array" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</delete>
|
||||
</mapper>
|
||||
@ -0,0 +1,219 @@
|
||||
<?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.system.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="tenantId" column="tenant_id" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectNgMeterresultVo">
|
||||
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 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 nm.id = #{id}
|
||||
</select>
|
||||
|
||||
<insert id="insertNgMeterresult" parameterType="NgMeterresult">
|
||||
insert into ng_meterresult
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null">id,</if>
|
||||
<if test="createName != null">create_name,</if>
|
||||
<if test="createBy != null">create_by,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
<if test="updateName != null">update_name,</if>
|
||||
<if test="updateBy != null">update_by,</if>
|
||||
<if test="updateTime != null">update_time,</if>
|
||||
<if test="ybbh != null">ybbh,</if>
|
||||
<if test="dE != null">dE,</if>
|
||||
<if test="dFG != null">dFG,</if>
|
||||
<if test="dFT != null">dFT,</if>
|
||||
<if test="dDViscosity != null">dDViscosity,</if>
|
||||
<if test="dDExpCoefficient != null">dDExpCoefficient,</if>
|
||||
<if test="dRnPipe != null">dRnPipe,</if>
|
||||
<if test="dBk != null">dBk,</if>
|
||||
<if test="dRoughNessPipe != null">dRoughNessPipe,</if>
|
||||
<if test="dCdCorrect != null">dCdCorrect,</if>
|
||||
<if test="dCdNozell != null">dCdNozell,</if>
|
||||
<if test="dVFlowb != null">dVFlowb,</if>
|
||||
<if test="dVFlowf != null">dVFlowf,</if>
|
||||
<if test="dMFlowb != null">dMFlowb,</if>
|
||||
<if test="dEFlowb != null">dEFlowb,</if>
|
||||
<if test="dVelocityFlow != null">dVelocityFlow,</if>
|
||||
<if test="dPressLost != null">dPressLost,</if>
|
||||
<if test="dBeta != null">dBeta,</if>
|
||||
<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>
|
||||
<if test="createName != null">#{createName},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
<if test="updateName != null">#{updateName},</if>
|
||||
<if test="updateBy != null">#{updateBy},</if>
|
||||
<if test="updateTime != null">#{updateTime},</if>
|
||||
<if test="ybbh != null">#{ybbh},</if>
|
||||
<if test="dE != null">#{dE},</if>
|
||||
<if test="dFG != null">#{dFG},</if>
|
||||
<if test="dFT != null">#{dFT},</if>
|
||||
<if test="dDViscosity != null">#{dDViscosity},</if>
|
||||
<if test="dDExpCoefficient != null">#{dDExpCoefficient},</if>
|
||||
<if test="dRnPipe != null">#{dRnPipe},</if>
|
||||
<if test="dBk != null">#{dBk},</if>
|
||||
<if test="dRoughNessPipe != null">#{dRoughNessPipe},</if>
|
||||
<if test="dCdCorrect != null">#{dCdCorrect},</if>
|
||||
<if test="dCdNozell != null">#{dCdNozell},</if>
|
||||
<if test="dVFlowb != null">#{dVFlowb},</if>
|
||||
<if test="dVFlowf != null">#{dVFlowf},</if>
|
||||
<if test="dMFlowb != null">#{dMFlowb},</if>
|
||||
<if test="dEFlowb != null">#{dEFlowb},</if>
|
||||
<if test="dVelocityFlow != null">#{dVelocityFlow},</if>
|
||||
<if test="dPressLost != null">#{dPressLost},</if>
|
||||
<if test="dBeta != null">#{dBeta},</if>
|
||||
<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>
|
||||
|
||||
<update id="updateNgMeterresult" parameterType="NgMeterresult">
|
||||
update ng_meterresult
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="createName != null">create_name = #{createName},</if>
|
||||
<if test="createBy != null">create_by = #{createBy},</if>
|
||||
<if test="createTime != null">create_time = #{createTime},</if>
|
||||
<if test="updateName != null">update_name = #{updateName},</if>
|
||||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
<if test="ybbh != null">ybbh = #{ybbh},</if>
|
||||
<if test="dE != null">dE = #{dE},</if>
|
||||
<if test="dFG != null">dFG = #{dFG},</if>
|
||||
<if test="dFT != null">dFT = #{dFT},</if>
|
||||
<if test="dDViscosity != null">dDViscosity = #{dDViscosity},</if>
|
||||
<if test="dDExpCoefficient != null">dDExpCoefficient = #{dDExpCoefficient},</if>
|
||||
<if test="dRnPipe != null">dRnPipe = #{dRnPipe},</if>
|
||||
<if test="dBk != null">dBk = #{dBk},</if>
|
||||
<if test="dRoughNessPipe != null">dRoughNessPipe = #{dRoughNessPipe},</if>
|
||||
<if test="dCdCorrect != null">dCdCorrect = #{dCdCorrect},</if>
|
||||
<if test="dCdNozell != null">dCdNozell = #{dCdNozell},</if>
|
||||
<if test="dVFlowb != null">dVFlowb = #{dVFlowb},</if>
|
||||
<if test="dVFlowf != null">dVFlowf = #{dVFlowf},</if>
|
||||
<if test="dMFlowb != null">dMFlowb = #{dMFlowb},</if>
|
||||
<if test="dEFlowb != null">dEFlowb = #{dEFlowb},</if>
|
||||
<if test="dVelocityFlow != null">dVelocityFlow = #{dVelocityFlow},</if>
|
||||
<if test="dPressLost != null">dPressLost = #{dPressLost},</if>
|
||||
<if test="dBeta != null">dBeta = #{dBeta},</if>
|
||||
<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 ng_meterresult.id = #{id}
|
||||
</update>
|
||||
|
||||
<delete id="deleteNgMeterresultById" parameterType="String">
|
||||
delete from ng_meterresult where id = #{id}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteNgMeterresultByIds" parameterType="String">
|
||||
delete from ng_meterresult where id in
|
||||
<foreach item="id" collection="array" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</delete>
|
||||
</mapper>
|
||||
423
ruoyi-ngtools/src/main/resources/mapper/system/NgNgparMapper.xml
Normal file
423
ruoyi-ngtools/src/main/resources/mapper/system/NgNgparMapper.xml
Normal file
@ -0,0 +1,423 @@
|
||||
<?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.system.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="dPfType" column="dPfType" />
|
||||
<result property="tenantId" column="tenant_id" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectNgNgparVo">
|
||||
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 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 nn.id = #{id}
|
||||
</select>
|
||||
|
||||
<insert id="insertNgNgpar" parameterType="NgNgpar">
|
||||
insert into ng_ngpar
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null">id,</if>
|
||||
<if test="createName != null">create_name,</if>
|
||||
<if test="createBy != null">create_by,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
<if test="updateName != null">update_name,</if>
|
||||
<if test="updateBy != null">update_by,</if>
|
||||
<if test="updateTime != null">update_time,</if>
|
||||
<if test="adMixture != null">adMixture,</if>
|
||||
<if test="adMixtureV != null">adMixtureV,</if>
|
||||
<if test="adMixtureD != null">adMixtureD,</if>
|
||||
<if test="dCbtj != null">dCbtj,</if>
|
||||
<if test="dPb != null">dPb,</if>
|
||||
<if test="dTb != null">dTb,</if>
|
||||
<if test="dPf != null">dPf,</if>
|
||||
<if test="dTf != null">dTf,</if>
|
||||
<if test="dMrx != null">dMrx,</if>
|
||||
<if test="dZb != null">dZb,</if>
|
||||
<if test="dZf != null">dZf,</if>
|
||||
<if test="dFpv != null">dFpv,</if>
|
||||
<if test="dDb != null">dDb,</if>
|
||||
<if test="dDf != null">dDf,</if>
|
||||
<if test="dRhob != null">dRhob,</if>
|
||||
<if test="dRhof != null">dRhof,</if>
|
||||
<if test="drdIdeal != null">dRD_Ideal,</if>
|
||||
<if test="drdReal != null">dRD_Real,</if>
|
||||
<if test="dHo != null">dHo,</if>
|
||||
<if test="dH != null">dH,</if>
|
||||
<if test="dS != null">dS,</if>
|
||||
<if test="dCpi != null">dCpi,</if>
|
||||
<if test="dCp != null">dCp,</if>
|
||||
<if test="dCv != null">dCv,</if>
|
||||
<if test="dk != null">dk,</if>
|
||||
<if test="dKappa != null">dKappa,</if>
|
||||
<if test="dSOS != null">dSOS,</if>
|
||||
<if test="dCstar != null">dCstar,</if>
|
||||
<if test="dHhvMol != null">dHhvMol,</if>
|
||||
<if test="dLhvMol != null">dLhvMol,</if>
|
||||
<if test="dHhvv != null">dHhvv,</if>
|
||||
<if test="dLhvv != null">dLhvv,</if>
|
||||
<if test="dHhvm != null">dHhvm,</if>
|
||||
<if test="dLhvm != null">dLhvm,</if>
|
||||
<if test="dZb11062 != null">dZb11062,</if>
|
||||
<if test="dRhob11062 != null">dRhob11062,</if>
|
||||
<if test="dRhof11062 != null">dRhof11062,</if>
|
||||
<if test="drdIdeal11062 != null">dRD_Ideal11062,</if>
|
||||
<if test="drdReal11062 != null">dRD_Real11062,</if>
|
||||
<if test="dWobbeIndex != null">dWobbeIndex,</if>
|
||||
<if test="dPc != null">dPc,</if>
|
||||
<if test="dTC != null">dTC,</if>
|
||||
<if test="dBzsx != null">dBzsx,</if>
|
||||
<if test="dBzxx != null">dBzxx,</if>
|
||||
<if test="dTotalC != null">dTotalC,</if>
|
||||
<if test="dC2 != null">dC2,</if>
|
||||
<if test="dC2j != null">dC2j,</if>
|
||||
<if test="dC3j != null">dC3j,</if>
|
||||
<if test="dC4j != null">dC4j,</if>
|
||||
<if test="dC5j != null">dC5j,</if>
|
||||
<if test="dC6j != null">dC6j,</if>
|
||||
<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>
|
||||
<if test="createName != null">#{createName},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
<if test="updateName != null">#{updateName},</if>
|
||||
<if test="updateBy != null">#{updateBy},</if>
|
||||
<if test="updateTime != null">#{updateTime},</if>
|
||||
<if test="adMixture != null">#{adMixture},</if>
|
||||
<if test="adMixtureV != null">#{adMixtureV},</if>
|
||||
<if test="adMixtureD != null">#{adMixtureD},</if>
|
||||
<if test="dCbtj != null">#{dCbtj},</if>
|
||||
<if test="dPb != null">#{dPb},</if>
|
||||
<if test="dTb != null">#{dTb},</if>
|
||||
<if test="dPf != null">#{dPf},</if>
|
||||
<if test="dTf != null">#{dTf},</if>
|
||||
<if test="dMrx != null">#{dMrx},</if>
|
||||
<if test="dZb != null">#{dZb},</if>
|
||||
<if test="dZf != null">#{dZf},</if>
|
||||
<if test="dFpv != null">#{dFpv},</if>
|
||||
<if test="dDb != null">#{dDb},</if>
|
||||
<if test="dDf != null">#{dDf},</if>
|
||||
<if test="dRhob != null">#{dRhob},</if>
|
||||
<if test="dRhof != null">#{dRhof},</if>
|
||||
<if test="drdIdeal != null">#{drdIdeal},</if>
|
||||
<if test="drdReal != null">#{drdReal},</if>
|
||||
<if test="dHo != null">#{dHo},</if>
|
||||
<if test="dH != null">#{dH},</if>
|
||||
<if test="dS != null">#{dS},</if>
|
||||
<if test="dCpi != null">#{dCpi},</if>
|
||||
<if test="dCp != null">#{dCp},</if>
|
||||
<if test="dCv != null">#{dCv},</if>
|
||||
<if test="dk != null">#{dk},</if>
|
||||
<if test="dKappa != null">#{dKappa},</if>
|
||||
<if test="dSOS != null">#{dSOS},</if>
|
||||
<if test="dCstar != null">#{dCstar},</if>
|
||||
<if test="dHhvMol != null">#{dHhvMol},</if>
|
||||
<if test="dLhvMol != null">#{dLhvMol},</if>
|
||||
<if test="dHhvv != null">#{dHhvv},</if>
|
||||
<if test="dLhvv != null">#{dLhvv},</if>
|
||||
<if test="dHhvm != null">#{dHhvm},</if>
|
||||
<if test="dLhvm != null">#{dLhvm},</if>
|
||||
<if test="dZb11062 != null">#{dZb11062},</if>
|
||||
<if test="dRhob11062 != null">#{dRhob11062},</if>
|
||||
<if test="dRhof11062 != null">#{dRhof11062},</if>
|
||||
<if test="drdIdeal11062 != null">#{drdIdeal11062},</if>
|
||||
<if test="drdReal11062 != null">#{drdReal11062},</if>
|
||||
<if test="dWobbeIndex != null">#{dWobbeIndex},</if>
|
||||
<if test="dPc != null">#{dPc},</if>
|
||||
<if test="dTC != null">#{dTC},</if>
|
||||
<if test="dBzsx != null">#{dBzsx},</if>
|
||||
<if test="dBzxx != null">#{dBzxx},</if>
|
||||
<if test="dTotalC != null">#{dTotalC},</if>
|
||||
<if test="dC2 != null">#{dC2},</if>
|
||||
<if test="dC2j != null">#{dC2j},</if>
|
||||
<if test="dC3j != null">#{dC3j},</if>
|
||||
<if test="dC4j != null">#{dC4j},</if>
|
||||
<if test="dC5j != null">#{dC5j},</if>
|
||||
<if test="dC6j != null">#{dC6j},</if>
|
||||
<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>
|
||||
|
||||
<update id="updateNgNgpar" parameterType="NgNgpar">
|
||||
update ng_ngpar
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="createName != null">create_name = #{createName},</if>
|
||||
<if test="createBy != null">create_by = #{createBy},</if>
|
||||
<if test="createTime != null">create_time = #{createTime},</if>
|
||||
<if test="updateName != null">update_name = #{updateName},</if>
|
||||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
<if test="adMixture != null">adMixture = #{adMixture},</if>
|
||||
<if test="adMixtureV != null">adMixtureV = #{adMixtureV},</if>
|
||||
<if test="adMixtureD != null">adMixtureD = #{adMixtureD},</if>
|
||||
<if test="dCbtj != null">dCbtj = #{dCbtj},</if>
|
||||
<if test="dPb != null">dPb = #{dPb},</if>
|
||||
<if test="dTb != null">dTb = #{dTb},</if>
|
||||
<if test="dPf != null">dPf = #{dPf},</if>
|
||||
<if test="dTf != null">dTf = #{dTf},</if>
|
||||
<if test="dMrx != null">dMrx = #{dMrx},</if>
|
||||
<if test="dZb != null">dZb = #{dZb},</if>
|
||||
<if test="dZf != null">dZf = #{dZf},</if>
|
||||
<if test="dFpv != null">dFpv = #{dFpv},</if>
|
||||
<if test="dDb != null">dDb = #{dDb},</if>
|
||||
<if test="dDf != null">dDf = #{dDf},</if>
|
||||
<if test="dRhob != null">dRhob = #{dRhob},</if>
|
||||
<if test="dRhof != null">dRhof = #{dRhof},</if>
|
||||
<if test="drdIdeal != null">dRD_Ideal = #{drdIdeal},</if>
|
||||
<if test="drdReal != null">dRD_Real = #{drdReal},</if>
|
||||
<if test="dHo != null">dHo = #{dHo},</if>
|
||||
<if test="dH != null">dH = #{dH},</if>
|
||||
<if test="dS != null">dS = #{dS},</if>
|
||||
<if test="dCpi != null">dCpi = #{dCpi},</if>
|
||||
<if test="dCp != null">dCp = #{dCp},</if>
|
||||
<if test="dCv != null">dCv = #{dCv},</if>
|
||||
<if test="dk != null">dk = #{dk},</if>
|
||||
<if test="dKappa != null">dKappa = #{dKappa},</if>
|
||||
<if test="dSOS != null">dSOS = #{dSOS},</if>
|
||||
<if test="dCstar != null">dCstar = #{dCstar},</if>
|
||||
<if test="dHhvMol != null">dHhvMol = #{dHhvMol},</if>
|
||||
<if test="dLhvMol != null">dLhvMol = #{dLhvMol},</if>
|
||||
<if test="dHhvv != null">dHhvv = #{dHhvv},</if>
|
||||
<if test="dLhvv != null">dLhvv = #{dLhvv},</if>
|
||||
<if test="dHhvm != null">dHhvm = #{dHhvm},</if>
|
||||
<if test="dLhvm != null">dLhvm = #{dLhvm},</if>
|
||||
<if test="dZb11062 != null">dZb11062 = #{dZb11062},</if>
|
||||
<if test="dRhob11062 != null">dRhob11062 = #{dRhob11062},</if>
|
||||
<if test="dRhof11062 != null">dRhof11062 = #{dRhof11062},</if>
|
||||
<if test="drdIdeal11062 != null">dRD_Ideal11062 = #{drdIdeal11062},</if>
|
||||
<if test="drdReal11062 != null">dRD_Real11062 = #{drdReal11062},</if>
|
||||
<if test="dWobbeIndex != null">dWobbeIndex = #{dWobbeIndex},</if>
|
||||
<if test="dPc != null">dPc = #{dPc},</if>
|
||||
<if test="dTC != null">dTC = #{dTC},</if>
|
||||
<if test="dBzsx != null">dBzsx = #{dBzsx},</if>
|
||||
<if test="dBzxx != null">dBzxx = #{dBzxx},</if>
|
||||
<if test="dTotalC != null">dTotalC = #{dTotalC},</if>
|
||||
<if test="dC2 != null">dC2 = #{dC2},</if>
|
||||
<if test="dC2j != null">dC2j = #{dC2j},</if>
|
||||
<if test="dC3j != null">dC3j = #{dC3j},</if>
|
||||
<if test="dC4j != null">dC4j = #{dC4j},</if>
|
||||
<if test="dC5j != null">dC5j = #{dC5j},</if>
|
||||
<if test="dC6j != null">dC6j = #{dC6j},</if>
|
||||
<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 ng_ngpar.id = #{id}
|
||||
</update>
|
||||
|
||||
<delete id="deleteNgNgparById" parameterType="String">
|
||||
delete from ng_ngpar where id = #{id}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteNgNgparByIds" parameterType="String">
|
||||
delete from ng_ngpar where id in
|
||||
<foreach item="id" collection="array" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</delete>
|
||||
</mapper>
|
||||
@ -1,93 +0,0 @@
|
||||
package com.ruoyi.pay.alipay.controller;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import com.alipay.easysdk.factory.Factory;
|
||||
import com.alipay.easysdk.payment.page.models.AlipayTradePagePayResponse;
|
||||
import com.ruoyi.common.annotation.Anonymous;
|
||||
import com.ruoyi.common.core.controller.BaseController;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.pay.alipay.service.IAliPayService;
|
||||
import com.ruoyi.pay.domain.PayOrder;
|
||||
import com.ruoyi.pay.service.IPayOrderService;
|
||||
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.Parameters;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
|
||||
/**
|
||||
* @author zlh
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/pay/alipay")
|
||||
@ConditionalOnProperty(prefix = "pay.alipay", name = "enabled", havingValue = "true")
|
||||
@Tag(name = "【支付宝】管理")
|
||||
public class AliPayController extends BaseController {
|
||||
|
||||
@Autowired
|
||||
private IPayOrderService payOrderService;
|
||||
|
||||
@Autowired(required = false)
|
||||
private IAliPayService aliPayService;
|
||||
|
||||
@Anonymous
|
||||
@Operation(summary = "支付宝支付")
|
||||
@Parameters({
|
||||
@Parameter(name = "orderId", description = "订单号", required = true)
|
||||
})
|
||||
@GetMapping("/url/{orderNumber}")
|
||||
public AjaxResult pay(@PathVariable(name = "orderNumber") String orderNumber) {
|
||||
AlipayTradePagePayResponse response;
|
||||
PayOrder aliPay = payOrderService.selectPayOrderByOrderNumber(orderNumber);
|
||||
try {
|
||||
// 发起API调用（以创建当面付收款二维码为例）
|
||||
response = Factory.Payment.Page().pay(
|
||||
aliPay.getOrderContent(),
|
||||
aliPay.getOrderNumber(),
|
||||
aliPay.getActualAmount(),
|
||||
"");
|
||||
} catch (Exception e) {
|
||||
return error(e.getMessage());
|
||||
}
|
||||
return success(response.getBody());
|
||||
}
|
||||
|
||||
@Anonymous
|
||||
@Operation(summary = "支付宝支付回调")
|
||||
@Transactional
|
||||
@PostMapping("/notify")
|
||||
public AjaxResult notify(HttpServletRequest request) throws Exception {
|
||||
if (request.getParameter("trade_status").equals("TRADE_SUCCESS")) {
|
||||
|
||||
Map<String, String> params = new HashMap<>();
|
||||
Map<String, String[]> requestParams = request.getParameterMap();
|
||||
for (String name : requestParams.keySet()) {
|
||||
params.put(name, request.getParameter(name));
|
||||
}
|
||||
|
||||
String orderNumber = params.get("out_trade_no");
|
||||
// 支付宝验签
|
||||
if (Factory.Payment.Common().verifyNotify(params)) {
|
||||
|
||||
// // 更新订单未已支付
|
||||
payOrderService.updateStatus(orderNumber, "已支付");
|
||||
if (aliPayService != null) {
|
||||
aliPayService.callback(params);
|
||||
}
|
||||
}
|
||||
}
|
||||
return success("success");
|
||||
}
|
||||
}
|
||||
@ -2,6 +2,8 @@ package com.ruoyi.pay.alipay.service;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
public interface IAliPayService {
|
||||
import com.ruoyi.pay.service.PayService;
|
||||
|
||||
public interface IAliPayService extends PayService {
|
||||
public void callback(Map<String, String> params);
|
||||
}
|
||||
|
||||
@ -0,0 +1,126 @@
|
||||
package com.ruoyi.pay.alipay.service.Impl;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.alipay.easysdk.factory.Factory;
|
||||
import com.alipay.easysdk.payment.common.models.AlipayTradeRefundResponse;
|
||||
import com.alipay.easysdk.payment.page.models.AlipayTradePagePayResponse;
|
||||
import com.ruoyi.common.exception.ServiceException;
|
||||
import com.ruoyi.pay.alipay.service.IAliPayService;
|
||||
import com.ruoyi.pay.domain.PayOrder;
|
||||
import com.ruoyi.pay.service.IPayOrderService;
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
|
||||
@Service("alipayPayService")
|
||||
@ConditionalOnProperty(prefix = "pay.alipay", name = "enabled", havingValue = "true")
|
||||
public class AliPayService implements IAliPayService {
|
||||
public void callback(Map<String, String> params) {
|
||||
}
|
||||
|
||||
@Autowired
|
||||
private IPayOrderService payOrderService;
|
||||
|
||||
public String payUrl(PayOrder payOrder) {
|
||||
|
||||
try {
|
||||
AlipayTradePagePayResponse response = Factory.Payment.Page().pay(
|
||||
payOrder.getOrderContent(),
|
||||
payOrder.getOrderNumber(),
|
||||
payOrder.getActualAmount(),
|
||||
"");
|
||||
return response.getBody();
|
||||
} catch (Exception e) {
|
||||
throw new ServiceException("创建支付宝支付URL失败");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public String notify(HttpServletRequest request, HttpServletResponse response) {
|
||||
if (request.getParameter("trade_status").equals("TRADE_SUCCESS")) {
|
||||
|
||||
Map<String, String> params = new HashMap<>();
|
||||
Map<String, String[]> requestParams = request.getParameterMap();
|
||||
for (String name : requestParams.keySet()) {
|
||||
params.put(name, request.getParameter(name));
|
||||
}
|
||||
String orderNumber = params.get("out_trade_no");
|
||||
try {
|
||||
if (Factory.Payment.Common().verifyNotify(params)) {
|
||||
payOrderService.updateStatus(orderNumber, "已支付");
|
||||
}
|
||||
return "success";
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
return "fail";
|
||||
}
|
||||
|
||||
@Override
|
||||
public PayOrder query(PayOrder payOrder) {
|
||||
try {
|
||||
// 使用支付宝SDK查询订单状态
|
||||
com.alipay.easysdk.payment.common.models.AlipayTradeQueryResponse response = Factory.Payment.Common()
|
||||
.query(payOrder.getOrderNumber());
|
||||
|
||||
// 根据查询结果更新订单状态
|
||||
if ("10000".equals(response.code)) {
|
||||
String tradeStatus = response.tradeStatus;
|
||||
String orderStatus = "";
|
||||
|
||||
// 根据支付宝交易状态映射到系统订单状态
|
||||
switch (tradeStatus) {
|
||||
case "TRADE_SUCCESS":
|
||||
case "TRADE_FINISHED":
|
||||
orderStatus = "已支付";
|
||||
break;
|
||||
case "WAIT_BUYER_PAY":
|
||||
orderStatus = "待支付";
|
||||
break;
|
||||
case "TRADE_CLOSED":
|
||||
orderStatus = "已关闭";
|
||||
break;
|
||||
default:
|
||||
orderStatus = "未知状态";
|
||||
}
|
||||
|
||||
// 更新订单信息
|
||||
payOrderService.updateStatus(payOrder.getOrderNumber(), orderStatus);
|
||||
} else {
|
||||
throw new ServiceException("查询支付宝订单失败：" + response.subMsg);
|
||||
}
|
||||
|
||||
return payOrder;
|
||||
} catch (Exception e) {
|
||||
throw new ServiceException("查询支付宝订单异常：" + e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public PayOrder refund(PayOrder payOrder) {
|
||||
try {
|
||||
// 使用支付宝SDK进行退款
|
||||
AlipayTradeRefundResponse response = Factory.Payment.Common().refund(
|
||||
payOrder.getOrderNumber(),
|
||||
payOrder.getActualAmount());
|
||||
|
||||
// 处理退款结果
|
||||
if ("10000".equals(response.code)) {
|
||||
payOrderService.updateStatus(payOrder.getOrderNumber(), "已退款");
|
||||
} else {
|
||||
throw new ServiceException("支付宝退款失败：" + response.subMsg);
|
||||
}
|
||||
|
||||
return payOrder;
|
||||
} catch (Exception e) {
|
||||
throw new ServiceException("支付宝退款异常：" + e.getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,29 @@
|
||||
{
|
||||
"properties": [
|
||||
{
|
||||
"name": "pay.alipay.enabled",
|
||||
"type": "java.lang.Boolean",
|
||||
"description": "是否启用支付宝支付"
|
||||
},
|
||||
{
|
||||
"name": "pay.alipay.appId",
|
||||
"type": "java.lang.String",
|
||||
"description": "支付宝appid"
|
||||
},
|
||||
{
|
||||
"name": "pay.alipay.appPrivateKey",
|
||||
"type": "java.lang.String",
|
||||
"description": "支付宝应用私钥，可以直接用字符串，也可以是基于classpath的文件路径"
|
||||
},
|
||||
{
|
||||
"name": "pay.alipay.alipayPublicKey",
|
||||
"type": "java.lang.String",
|
||||
"description": "支付宝应用公钥，可以直接用字符串，也可以是基于classpath的文件路径"
|
||||
},
|
||||
{
|
||||
"name": "pay.alipay.notifyUrl",
|
||||
"type": "java.lang.String",
|
||||
"description": "支付宝支付回调地址"
|
||||
}
|
||||
]
|
||||
}
|
||||
@ -23,10 +23,15 @@ public class PayOrder extends BaseEntity {
|
||||
private Long orderId;
|
||||
|
||||
/** 订单号 */
|
||||
@Schema(title = "订单号")
|
||||
@Excel(name = "订单号")
|
||||
@Schema(title = "商户订单号")
|
||||
@Excel(name = "商户订单号")
|
||||
private String orderNumber;
|
||||
|
||||
/** 第三方订单号 */
|
||||
@Schema(title = "第三方订单号")
|
||||
@Excel(name = "第三方订单号")
|
||||
private String thirdNumber;
|
||||
|
||||
/** 订单状态 */
|
||||
@Schema(title = "订单状态")
|
||||
@Excel(name = "订单状态")
|
||||
@ -68,6 +73,14 @@ public class PayOrder extends BaseEntity {
|
||||
return orderNumber;
|
||||
}
|
||||
|
||||
public void setThirdNumber(String thirdNumber) {
|
||||
this.thirdNumber = thirdNumber;
|
||||
}
|
||||
|
||||
public String getThirdNumber() {
|
||||
return thirdNumber;
|
||||
}
|
||||
|
||||
public void setOrderStatus(String orderStatus) {
|
||||
this.orderStatus = orderStatus;
|
||||
}
|
||||
|
||||
@ -0,0 +1,16 @@
|
||||
package com.ruoyi.pay.service;
|
||||
|
||||
import com.ruoyi.pay.domain.PayOrder;
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
|
||||
public interface PayService {
|
||||
String payUrl(PayOrder payOrder);
|
||||
|
||||
String notify(HttpServletRequest servletRequest, HttpServletResponse response);
|
||||
|
||||
PayOrder query(PayOrder payOrder);
|
||||
|
||||
PayOrder refund(PayOrder payOrder);
|
||||
}
|
||||
@ -3,20 +3,21 @@
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.ruoyi.pay.mapper.PayOrderMapper">
|
||||
|
||||
|
||||
<resultMap type="PayOrder" id="PayOrderResult">
|
||||
<result property="orderId" column="order_id" />
|
||||
<result property="orderNumber" column="order_number" />
|
||||
<result property="orderStatus" column="order_status" />
|
||||
<result property="totalAmount" column="total_amount" />
|
||||
<result property="actualAmount" column="actual_amount" />
|
||||
<result property="orderContent" column="order_content" />
|
||||
<result property="orderMessage" column="order_message" />
|
||||
<result property="createBy" column="create_by" />
|
||||
<result property="createTime" column="create_time" />
|
||||
<result property="updateBy" column="update_by" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
<result property="remark" column="remark" />
|
||||
<result property="orderId" column="order_id" />
|
||||
<result property="orderNumber" column="order_number" />
|
||||
<result property="thirdNumber" column="third_number" />
|
||||
<result property="orderStatus" column="order_status" />
|
||||
<result property="totalAmount" column="total_amount" />
|
||||
<result property="actualAmount" column="actual_amount" />
|
||||
<result property="orderContent" column="order_content" />
|
||||
<result property="orderMessage" column="order_message" />
|
||||
<result property="createBy" column="create_by" />
|
||||
<result property="createTime" column="create_time" />
|
||||
<result property="updateBy" column="update_by" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
<result property="remark" column="remark" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectPayOrderVo">
|
||||
@ -25,8 +26,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
|
||||
<select id="selectPayOrderList" parameterType="PayOrder" resultMap="PayOrderResult">
|
||||
<include refid="selectPayOrderVo"/>
|
||||
<where>
|
||||
<where>
|
||||
<if test="orderNumber != null and orderNumber != ''"> and order_number = #{orderNumber}</if>
|
||||
<if test="thirdNumber != null and thirdNumber != ''"> and third_number = #{thirdNumber}</if>
|
||||
<if test="orderStatus != null and orderStatus != ''"> and order_status = #{orderStatus}</if>
|
||||
<if test="totalAmount != null and totalAmount != ''"> and total_amount = #{totalAmount}</if>
|
||||
<if test="actualAmount != null and actualAmount != ''"> and actual_amount = #{actualAmount}</if>
|
||||
@ -34,16 +36,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="orderMessage != null and orderMessage != ''"> and order_message = #{orderMessage}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
|
||||
<select id="selectPayOrderByOrderId" parameterType="Long" resultMap="PayOrderResult">
|
||||
<include refid="selectPayOrderVo"/>
|
||||
where pay_order.order_id = #{orderId}
|
||||
</select>
|
||||
|
||||
|
||||
<select id="selectPayOrderByOrderNumber" parameterType="String" resultMap="PayOrderResult">
|
||||
<include refid="selectPayOrderVo"/>
|
||||
where pay_order.order_number = #{orderNumber}
|
||||
</select>
|
||||
|
||||
<insert id="insertPayOrder" parameterType="PayOrder" useGeneratedKeys="true" keyProperty="orderId">
|
||||
insert into pay_order
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="orderNumber != null">order_number,</if>
|
||||
<if test="thirdNumber != null">third_number,</if>
|
||||
<if test="orderStatus != null">order_status,</if>
|
||||
<if test="totalAmount != null">total_amount,</if>
|
||||
<if test="actualAmount != null">actual_amount,</if>
|
||||
@ -54,9 +62,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="updateBy != null">update_by,</if>
|
||||
<if test="updateTime != null">update_time,</if>
|
||||
<if test="remark != null">remark,</if>
|
||||
</trim>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="orderNumber != null">#{orderNumber},</if>
|
||||
<if test="thirdNumber != null">#{thirdNumber},</if>
|
||||
<if test="orderStatus != null">#{orderStatus},</if>
|
||||
<if test="totalAmount != null">#{totalAmount},</if>
|
||||
<if test="actualAmount != null">#{actualAmount},</if>
|
||||
@ -67,13 +76,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="updateBy != null">#{updateBy},</if>
|
||||
<if test="updateTime != null">#{updateTime},</if>
|
||||
<if test="remark != null">#{remark},</if>
|
||||
</trim>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updatePayOrder" parameterType="PayOrder">
|
||||
update pay_order
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="orderNumber != null">order_number = #{orderNumber},</if>
|
||||
<if test="thirdNumber != null">third_number = #{thirdNumber},</if>
|
||||
<if test="orderStatus != null">order_status = #{orderStatus},</if>
|
||||
<if test="totalAmount != null">total_amount = #{totalAmount},</if>
|
||||
<if test="actualAmount != null">actual_amount = #{actualAmount},</if>
|
||||
|
||||
@ -1,7 +1,15 @@
|
||||
package com.ruoyi.pay.sqb.config;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.InputStream;
|
||||
import java.io.InputStreamReader;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||
import org.springframework.context.ApplicationContext;
|
||||
import org.springframework.core.io.Resource;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
@Component
|
||||
@ -26,36 +34,36 @@ public class SqbConfig {
|
||||
private String vendorKey;
|
||||
|
||||
@Value("${pay.sqb.notifyUrl}")
|
||||
private String defaultNotifyUrl;
|
||||
private String notifyUrl;
|
||||
|
||||
@Value("${pay.sqb.notifyBaseUrl}")
|
||||
private String defaultNotifyBaseUrl;
|
||||
@Value("${pay.sqb.publicKey}")
|
||||
private String publicKey;
|
||||
|
||||
@Value("${pay.sqb.proxy}")
|
||||
private String proxyPath;
|
||||
@Autowired
|
||||
private ApplicationContext applicationContext;
|
||||
|
||||
public String getDefaultNotifyUrl() {
|
||||
return defaultNotifyUrl;
|
||||
public String getPublicKey() throws Exception {
|
||||
if (publicKey.startsWith("classpath")) {
|
||||
Resource resource = applicationContext.getResource(publicKey);
|
||||
InputStream inputStream = resource.getInputStream();
|
||||
BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
|
||||
String alipayPublicKeyValue = bufferedReader.lines().collect(Collectors.joining(System.lineSeparator()));
|
||||
bufferedReader.close();
|
||||
publicKey = alipayPublicKeyValue;
|
||||
}
|
||||
return publicKey;
|
||||
}
|
||||
|
||||
public void setDefaultNotifyUrl(String defaultNotifyUrl) {
|
||||
this.defaultNotifyUrl = defaultNotifyUrl;
|
||||
public void setPublicKey(String publicKey) {
|
||||
this.publicKey = publicKey;
|
||||
}
|
||||
|
||||
public String getDefaultNotifyBaseUrl() {
|
||||
return defaultNotifyBaseUrl;
|
||||
public String getNotifyUrl() {
|
||||
return notifyUrl;
|
||||
}
|
||||
|
||||
public void setDefaultNotifyBaseUrl(String defaultNotifyBaseUrl) {
|
||||
this.defaultNotifyBaseUrl = defaultNotifyBaseUrl;
|
||||
}
|
||||
|
||||
public String getProxyPath() {
|
||||
return proxyPath;
|
||||
}
|
||||
|
||||
public void setProxyPath(String proxyPath) {
|
||||
this.proxyPath = proxyPath;
|
||||
public void setNotifyUrl(String notifyUrl) {
|
||||
this.notifyUrl = notifyUrl;
|
||||
}
|
||||
|
||||
public String getApiDomain() {
|
||||
|
||||
@ -1,87 +0,0 @@
|
||||
package com.ruoyi.pay.sqb.controller;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
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 com.alibaba.fastjson2.JSON;
|
||||
import com.alibaba.fastjson2.JSONObject;
|
||||
import com.ruoyi.common.annotation.Anonymous;
|
||||
import com.ruoyi.common.core.controller.BaseController;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.common.core.domain.R;
|
||||
import com.ruoyi.pay.domain.PayOrder;
|
||||
import com.ruoyi.pay.service.IPayOrderService;
|
||||
import com.ruoyi.pay.sqb.service.ISqbPayService;
|
||||
import com.ruoyi.pay.sqb.service.Impl.SQBServiceImpl;
|
||||
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.Parameters;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
|
||||
@Tag(name = "sqb支付")
|
||||
@RestController
|
||||
@RequestMapping("/pay/sqb")
|
||||
@ConditionalOnProperty(prefix = "pay.sqb", name = "enabled", havingValue = "true")
|
||||
public class SQBController extends BaseController {
|
||||
@Autowired
|
||||
private SQBServiceImpl sqbServiceImpl;
|
||||
@Autowired
|
||||
private IPayOrderService payOrderServicer;
|
||||
|
||||
@Autowired(required = false)
|
||||
private ISqbPayService sqbPayService;
|
||||
|
||||
@Operation(summary = "获取支付url")
|
||||
@Parameters(value = {
|
||||
@Parameter(name = "orderNumber", description = "订单号", required = true)
|
||||
})
|
||||
@PostMapping("/url/{orderNumber}")
|
||||
@Anonymous
|
||||
public R<String> url(@PathVariable(name = "orderNumber") String orderNumber) throws Exception {
|
||||
PayOrder payOrder = payOrderServicer.selectPayOrderByOrderNumber(orderNumber);
|
||||
String url = sqbServiceImpl.payUrl(payOrder);
|
||||
return R.ok(url);
|
||||
}
|
||||
|
||||
@Operation(summary = "查询支付状态")
|
||||
@Parameters(value = {
|
||||
@Parameter(name = "orderNumber", description = "订单号", required = true)
|
||||
})
|
||||
@PostMapping("/query/{orderNumber}")
|
||||
public AjaxResult query(@PathVariable(name = "orderNumber") String orderNumber) throws Exception {
|
||||
PayOrder payOrder = payOrderServicer.selectPayOrderByOrderNumber(orderNumber);
|
||||
return success(sqbServiceImpl.query(payOrder));
|
||||
}
|
||||
|
||||
@PostMapping("/refund")
|
||||
public AjaxResult refund(@RequestBody PayOrder payOrder) {
|
||||
String refund = sqbServiceImpl.refund(payOrder);
|
||||
if (refund == null) {
|
||||
return error("退款失败");
|
||||
}
|
||||
Object parse = JSON.parse(refund);
|
||||
return success(parse);
|
||||
}
|
||||
|
||||
@PostMapping("/notify")
|
||||
@Anonymous
|
||||
@Operation(summary = "支付回调")
|
||||
public AjaxResult notify(@RequestBody JSONObject jsonObject) throws IOException {
|
||||
// 验签
|
||||
// 修改订单状态
|
||||
// 用户自定义行为
|
||||
if (sqbPayService != null) {
|
||||
sqbPayService.callback(jsonObject);
|
||||
}
|
||||
return AjaxResult.success();
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,7 +1,6 @@
|
||||
package com.ruoyi.pay.sqb.service;
|
||||
|
||||
import com.alibaba.fastjson2.JSONObject;
|
||||
import com.ruoyi.pay.service.PayService;
|
||||
|
||||
public interface ISqbPayService {
|
||||
public void callback(JSONObject param);
|
||||
public interface ISqbPayService extends PayService {
|
||||
}
|
||||
|
||||
@ -1,33 +1,51 @@
|
||||
package com.ruoyi.pay.sqb.service.Impl;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.net.URLEncoder;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.security.KeyFactory;
|
||||
import java.security.KeyManagementException;
|
||||
import java.security.KeyStoreException;
|
||||
import java.security.NoSuchAlgorithmException;
|
||||
import java.security.PublicKey;
|
||||
import java.security.Signature;
|
||||
import java.security.UnrecoverableKeyException;
|
||||
import java.security.spec.X509EncodedKeySpec;
|
||||
import java.util.Base64;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.util.StreamUtils;
|
||||
|
||||
import com.alibaba.fastjson2.JSON;
|
||||
import com.alibaba.fastjson2.JSONObject;
|
||||
import com.ruoyi.common.exception.ServiceException;
|
||||
import com.ruoyi.common.utils.SecurityUtils;
|
||||
import com.ruoyi.common.utils.ServletUtils;
|
||||
import com.ruoyi.common.utils.http.HttpClientUtil;
|
||||
import com.ruoyi.common.utils.sign.Md5Utils;
|
||||
import com.ruoyi.pay.domain.PayOrder;
|
||||
import com.ruoyi.pay.service.IPayOrderService;
|
||||
import com.ruoyi.pay.sqb.config.SqbConfig;
|
||||
import com.ruoyi.pay.sqb.service.ISqbPayService;
|
||||
|
||||
@Service
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
@Slf4j
|
||||
@Service("sqbPayService")
|
||||
@ConditionalOnProperty(prefix = "pay.sqb", name = "enabled", havingValue = "true")
|
||||
public class SQBServiceImpl {
|
||||
public class SQBServiceImpl implements ISqbPayService {
|
||||
@Autowired
|
||||
private SqbConfig sqbConfig;
|
||||
|
||||
@Autowired
|
||||
private IPayOrderService payOrderService;
|
||||
|
||||
/**
|
||||
* http POST 请求
|
||||
*
|
||||
@ -115,12 +133,12 @@ public class SQBServiceImpl {
|
||||
String result = httpPost(url, params.toString(), sign, sqbConfig.getTerminalSn());
|
||||
JSONObject retObj = JSON.parseObject(result);
|
||||
String resCode = retObj.get("result_code").toString();
|
||||
if (!"200".equals(resCode)){
|
||||
if (!"200".equals(resCode)) {
|
||||
return null;
|
||||
}
|
||||
String responseStr = retObj.get("biz_response").toString();
|
||||
JSONObject terminal = JSON.parseObject(responseStr);
|
||||
if (terminal.get("terminal_sn") == null || terminal.get("terminal_key") == null){
|
||||
if (terminal.get("terminal_sn") == null || terminal.get("terminal_key") == null) {
|
||||
return null;
|
||||
}
|
||||
return terminal;
|
||||
@ -134,7 +152,7 @@ public class SQBServiceImpl {
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
public String refund(PayOrder payOrder) {
|
||||
public PayOrder refund(PayOrder payOrder) {
|
||||
String url = sqbConfig.getApiDomain() + "/upay/v2/refund";
|
||||
JSONObject params = new JSONObject();
|
||||
try {
|
||||
@ -146,8 +164,14 @@ public class SQBServiceImpl {
|
||||
|
||||
String sign = getSign(params.toString() + sqbConfig.getTerminalKey());
|
||||
String result = httpPost(url, params, sign, sqbConfig.getTerminalSn());
|
||||
|
||||
return result;
|
||||
JSONObject retObj = JSON.parseObject(result);
|
||||
JSONObject bizResponse = retObj.getJSONObject("biz_response");
|
||||
if ("REFUNDED".equals(bizResponse.getString("order_status"))) {
|
||||
payOrderService.updateStatus(payOrder.getOrderNumber(), "已退款");
|
||||
} else {
|
||||
log.error("退款失败");
|
||||
}
|
||||
return payOrder;
|
||||
} catch (Exception e) {
|
||||
return null;
|
||||
}
|
||||
@ -158,8 +182,8 @@ public class SQBServiceImpl {
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
|
||||
public JSONObject query(PayOrder payOrder) {
|
||||
@Override
|
||||
public PayOrder query(PayOrder payOrder) {
|
||||
String url = sqbConfig.getApiDomain() + "/upay/v2/query";
|
||||
JSONObject params = new JSONObject();
|
||||
try {
|
||||
@ -170,37 +194,28 @@ public class SQBServiceImpl {
|
||||
String result = httpPost(url, params, sign, sqbConfig.getTerminalSn());
|
||||
JSONObject retObj = JSON.parseObject(result);
|
||||
String resCode = retObj.get("result_code").toString();
|
||||
if (!"200".equals(resCode)){
|
||||
return null;
|
||||
if (!"200".equals(resCode)) {
|
||||
throw new ServiceException("查询支付订单失败");
|
||||
} else {
|
||||
JSONObject response = retObj.getJSONObject("biz_response");
|
||||
System.out.println(response);
|
||||
}
|
||||
String responseStr = retObj.get("biz_response").toString();
|
||||
return JSONObject.parseObject(responseStr);
|
||||
return payOrder;
|
||||
} catch (Exception e) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public String payUrl(PayOrder payOrder) throws UnsupportedEncodingException {
|
||||
@Override
|
||||
public String payUrl(PayOrder payOrder) {
|
||||
return payUrl(payOrder, null);
|
||||
}
|
||||
|
||||
public String payUrl(PayOrder payOrder, String notifyBaseUrl) throws UnsupportedEncodingException {
|
||||
public String payUrl(PayOrder payOrder, String notifyBaseUrl) {
|
||||
if (payOrder.getRemark() == null) {
|
||||
payOrder.setRemark("支付");
|
||||
}
|
||||
String orderNotifyUrl;
|
||||
String defaultNotifyUrl = sqbConfig.getDefaultNotifyUrl();
|
||||
String defaultNotifyBaseUrl = sqbConfig.getDefaultNotifyBaseUrl();
|
||||
String proxyPath = sqbConfig.getProxyPath();
|
||||
if (notifyBaseUrl != null && !notifyBaseUrl.trim().equals("")) {
|
||||
orderNotifyUrl = notifyBaseUrl + defaultNotifyUrl;
|
||||
} else {
|
||||
if (defaultNotifyBaseUrl != null && !defaultNotifyBaseUrl.trim().equals("")) {
|
||||
orderNotifyUrl = defaultNotifyBaseUrl + proxyPath + defaultNotifyUrl;
|
||||
} else {
|
||||
orderNotifyUrl = "http://" + ServletUtils.getRequest().getServerName() + proxyPath + defaultNotifyUrl;
|
||||
}
|
||||
}
|
||||
String orderNotifyUrl = sqbConfig.getNotifyUrl();
|
||||
String param = "" +
|
||||
"client_sn=" + payOrder.getOrderNumber() +
|
||||
"¬ify_url=" + orderNotifyUrl +
|
||||
@ -209,16 +224,22 @@ public class SQBServiceImpl {
|
||||
"&subject=" + payOrder.getRemark() +
|
||||
"&terminal_sn=" + sqbConfig.getTerminalSn() +
|
||||
"&total_amount=" + Long.valueOf(payOrder.getTotalAmount().toString());
|
||||
String urlParam = "" +
|
||||
"client_sn=" + payOrder.getOrderNumber() +
|
||||
"¬ify_url=" + URLEncoder.encode(orderNotifyUrl, "UTF-8") +
|
||||
"&operator=" + URLEncoder.encode(payOrder.getCreateBy(), "UTF-8") +
|
||||
"&return_url=" + "https://www.shouqianba.com/" +
|
||||
"&subject=" + URLEncoder.encode(payOrder.getRemark(), "UTF-8") +
|
||||
"&terminal_sn=" + sqbConfig.getTerminalSn() +
|
||||
"&total_amount=" + Long.valueOf(payOrder.getTotalAmount().toString());
|
||||
String sign = getSign(param + "&key=" + sqbConfig.getTerminalKey());
|
||||
return "https://qr.shouqianba.com/gateway?" + urlParam + "&sign=" + sign.toUpperCase();
|
||||
String urlParam;
|
||||
try {
|
||||
urlParam = "" +
|
||||
"client_sn=" + payOrder.getOrderNumber() +
|
||||
"¬ify_url=" + URLEncoder.encode(orderNotifyUrl, "UTF-8") +
|
||||
"&operator=" + URLEncoder.encode(payOrder.getCreateBy(), "UTF-8") +
|
||||
"&return_url=" + "https://www.shouqianba.com/" +
|
||||
"&subject=" + URLEncoder.encode(payOrder.getRemark(), "UTF-8") +
|
||||
"&terminal_sn=" + sqbConfig.getTerminalSn() +
|
||||
"&total_amount=" + Long.valueOf(payOrder.getTotalAmount().toString());
|
||||
|
||||
String sign = getSign(param + "&key=" + sqbConfig.getTerminalKey());
|
||||
return "https://qr.shouqianba.com/gateway?" + urlParam + "&sign=" + sign.toUpperCase();
|
||||
} catch (Exception e) {
|
||||
throw new ServiceException("生成收钱吧支付链接失败");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@ -268,4 +289,45 @@ public class SQBServiceImpl {
|
||||
}
|
||||
}
|
||||
|
||||
public boolean validateSign(String data, String sign) {
|
||||
try {
|
||||
// 使用SHA256WithRSA算法
|
||||
Signature signature = Signature.getInstance("SHA256WithRSA");
|
||||
|
||||
// 获取公钥
|
||||
KeyFactory keyFactory = KeyFactory.getInstance("RSA");
|
||||
PublicKey localPublicKey = keyFactory
|
||||
.generatePublic(new X509EncodedKeySpec(Base64.getDecoder().decode(sqbConfig.getPublicKey())));
|
||||
// 初始化验证过程
|
||||
signature.initVerify(localPublicKey);
|
||||
signature.update(data.getBytes());
|
||||
|
||||
// 解码签名
|
||||
byte[] bytesSign = Base64.getDecoder().decode(sign);
|
||||
|
||||
// 验证签名
|
||||
return signature.verify(bytesSign);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public String notify(HttpServletRequest request, HttpServletResponse response) {
|
||||
try {
|
||||
String requestBody = StreamUtils.copyToString(request.getInputStream(), StandardCharsets.UTF_8);
|
||||
JSONObject jsonObject = JSONObject.parseObject(requestBody);
|
||||
String sign = request.getHeader("Authorization");
|
||||
if (!validateSign(requestBody, sign)) {
|
||||
throw new ServiceException("收钱吧支付回调验签失败");
|
||||
}
|
||||
System.out.println(jsonObject);
|
||||
return "success";
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
return "fail";
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -0,0 +1,49 @@
|
||||
{
|
||||
"properties": [
|
||||
{
|
||||
"name": "pay.sqb.enabled",
|
||||
"type": "java.lang.Boolean",
|
||||
"description": "启用收钱吧支付"
|
||||
},
|
||||
{
|
||||
"name": "pay.sqb.appId",
|
||||
"type": "java.lang.String",
|
||||
"description": "收钱吧appId"
|
||||
},
|
||||
{
|
||||
"name": "pay.sqb.apiDomain",
|
||||
"type": "java.lang.String",
|
||||
"description": "收钱吧apiDomain"
|
||||
},
|
||||
{
|
||||
"name": "pay.sqb.terminalSn",
|
||||
"type": "java.lang.String",
|
||||
"description": "收钱吧terminalSn"
|
||||
},
|
||||
{
|
||||
"name": "pay.sqb.terminalKey",
|
||||
"type": "java.lang.String",
|
||||
"description": "收钱吧terminalKey"
|
||||
},
|
||||
{
|
||||
"name": "pay.sqb.vendorSn",
|
||||
"type": "java.lang.String",
|
||||
"description": "收钱吧vendorSn"
|
||||
},
|
||||
{
|
||||
"name": "pay.sqb.vendorKey",
|
||||
"type": "java.lang.String",
|
||||
"description": "收钱吧vendorKey"
|
||||
},
|
||||
{
|
||||
"name": "pay.sqb.publicKey",
|
||||
"type": "java.lang.String",
|
||||
"description": "收钱吧公钥，可以直接用字符串，也可以是基于classpath的文件路径"
|
||||
},
|
||||
{
|
||||
"name": "pay.sqb.notifyUrl",
|
||||
"type": "java.lang.String",
|
||||
"description": "收钱吧支付回调地址"
|
||||
}
|
||||
]
|
||||
}
|
||||
@ -0,0 +1,95 @@
|
||||
package com.ruoyi.pay.controller;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
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 com.ruoyi.common.annotation.Anonymous;
|
||||
import com.ruoyi.common.core.controller.BaseController;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.pay.domain.PayOrder;
|
||||
import com.ruoyi.pay.service.IPayOrderService;
|
||||
import com.ruoyi.pay.service.PayService;
|
||||
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.Parameters;
|
||||
import jakarta.annotation.PostConstruct;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
|
||||
@RequestMapping("/pay/{channel}")
|
||||
@RestController
|
||||
public class PayController extends BaseController {
|
||||
|
||||
@Autowired(required = false)
|
||||
private Map<String, PayService> payServiceMap; // alipay wechat sqb
|
||||
|
||||
@PostConstruct
|
||||
public void init() {
|
||||
if (payServiceMap == null) {
|
||||
payServiceMap = new HashMap<>();
|
||||
logger.warn("请注意，没有加载任何支付服务");
|
||||
} else {
|
||||
payServiceMap.forEach((k, v) -> {
|
||||
logger.info("已加载支付服务 {}", k);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@Autowired
|
||||
private IPayOrderService payOrderService;
|
||||
|
||||
@Operation(summary = "微信支付")
|
||||
@Parameters({
|
||||
@Parameter(name = "channel", description = "支付方式", required = true),
|
||||
@Parameter(name = "orderNumber", description = "订单号", required = true)
|
||||
})
|
||||
@GetMapping("/url/{orderNumber}")
|
||||
public AjaxResult url(@PathVariable String channel, @PathVariable String orderNumber) throws Exception {
|
||||
PayService payService = payServiceMap.get(channel + "PayService");
|
||||
PayOrder payOrder = payOrderService.selectPayOrderByOrderNumber(orderNumber);
|
||||
return success(payService.payUrl(payOrder));
|
||||
}
|
||||
|
||||
@Anonymous
|
||||
@Operation(summary = "微信支付查询订单")
|
||||
@Parameters({
|
||||
@Parameter(name = "channel", description = "支付方式", required = true)
|
||||
})
|
||||
@PostMapping("/notify")
|
||||
public String notify(@PathVariable String channel, HttpServletRequest request, HttpServletResponse response)
|
||||
throws Exception {
|
||||
PayService payService = payServiceMap.get(channel + "PayService");
|
||||
return payService.notify(request, response);
|
||||
}
|
||||
|
||||
@Operation(summary = "查询支付状态")
|
||||
@Parameters({
|
||||
@Parameter(name = "channel", description = "支付方式", required = true),
|
||||
@Parameter(name = "orderNumber", description = "订单号", required = true)
|
||||
})
|
||||
@PostMapping("/query/{orderNumber}")
|
||||
public AjaxResult query(@PathVariable String channel, @PathVariable(name = "orderNumber") String orderNumber)
|
||||
throws Exception {
|
||||
PayService payService = payServiceMap.get(channel + "PayService");
|
||||
PayOrder payOrder = payOrderService.selectPayOrderByOrderNumber(orderNumber);
|
||||
return success(payService.query(payOrder));
|
||||
}
|
||||
|
||||
@PostMapping("/refund")
|
||||
@Parameters({
|
||||
@Parameter(name = "channel", description = "支付方式", required = true),
|
||||
})
|
||||
public AjaxResult refund(@PathVariable String channel, @RequestBody PayOrder payOrder) {
|
||||
PayService payService = payServiceMap.get(channel + "PayService");
|
||||
return success(payService.refund(payOrder));
|
||||
}
|
||||
}
|
||||
@ -16,6 +16,7 @@ import org.springframework.core.io.Resource;
|
||||
import com.wechat.pay.java.core.RSAAutoCertificateConfig;
|
||||
import com.wechat.pay.java.core.notification.NotificationParser;
|
||||
import com.wechat.pay.java.service.payments.nativepay.NativePayService;
|
||||
import com.wechat.pay.java.service.refund.RefundService;
|
||||
|
||||
/**
|
||||
* 配置我们自己的信息
|
||||
@ -26,79 +27,54 @@ import com.wechat.pay.java.service.payments.nativepay.NativePayService;
|
||||
@ConditionalOnProperty(prefix = "pay.wechat", name = "enabled", havingValue = "true")
|
||||
public class WxPayConfig {
|
||||
|
||||
/** 商户号 */
|
||||
@Value("${pay.wechat.merchantId}")
|
||||
private String wxchantId;
|
||||
private String merchantId;
|
||||
|
||||
/** 商户证书序列号 */
|
||||
@Value("${pay.wechat.merchantSerialNumber}")
|
||||
private String wxchantSerialNumber;
|
||||
private String merchantSerialNumber;
|
||||
|
||||
/** 商户APIV3密钥 */
|
||||
@Value("${pay.wechat.apiV3Key}")
|
||||
private String wxapiV3Key;
|
||||
private String apiV3Key;
|
||||
|
||||
/** 商户API私钥路径 */
|
||||
@Value("${pay.wechat.privateKeyPath}")
|
||||
private String wxcertPath;
|
||||
private String privateKeyPath;
|
||||
|
||||
@Value("${pay.wechat.appId}")
|
||||
private String appId;
|
||||
|
||||
@Value("${pay.wechat.notifyUrl}")
|
||||
private String notifyUrl;
|
||||
|
||||
@Bean
|
||||
public RSAAutoCertificateConfig wxpayBaseConfig() throws Exception {
|
||||
return new RSAAutoCertificateConfig.Builder()
|
||||
.merchantId(getWxchantId())
|
||||
.privateKeyFromPath(getWxcertPath())
|
||||
.merchantSerialNumber(getWxchantSerialNumber())
|
||||
.apiV3Key(getWxapiV3Key())
|
||||
.build();
|
||||
public String getMerchantId() {
|
||||
return merchantId;
|
||||
}
|
||||
|
||||
@Bean
|
||||
public NativePayService nativePayService() throws Exception {
|
||||
return new NativePayService.Builder().config(wxpayBaseConfig()).build();
|
||||
public void setMerchantId(String merchantId) {
|
||||
this.merchantId = merchantId;
|
||||
}
|
||||
|
||||
@Bean
|
||||
public NotificationParser notificationParser() throws Exception {
|
||||
return new NotificationParser(wxpayBaseConfig());
|
||||
public String getMerchantSerialNumber() {
|
||||
return merchantSerialNumber;
|
||||
}
|
||||
|
||||
@Autowired
|
||||
private ApplicationContext applicationContext;
|
||||
|
||||
public String getWxcertPath() throws Exception {
|
||||
if (wxcertPath.startsWith("classpath:")) {
|
||||
Resource resource = applicationContext.getResource(wxcertPath);
|
||||
String tempFilePath = System.getProperty("java.io.tmpdir") + "/temp_wxcert.pem";
|
||||
try (InputStream inputStream = resource.getInputStream()) {
|
||||
Files.copy(inputStream, Paths.get(tempFilePath), StandardCopyOption.REPLACE_EXISTING);
|
||||
wxcertPath = tempFilePath;
|
||||
} catch (Exception e) {
|
||||
Files.deleteIfExists(Paths.get(tempFilePath));
|
||||
throw new RuntimeException("微信支付证书文件读取失败", e);
|
||||
}
|
||||
}
|
||||
return wxcertPath;
|
||||
public void setMerchantSerialNumber(String merchantSerialNumber) {
|
||||
this.merchantSerialNumber = merchantSerialNumber;
|
||||
}
|
||||
|
||||
public String getWxchantId() {
|
||||
return wxchantId;
|
||||
public String getApiV3Key() {
|
||||
return apiV3Key;
|
||||
}
|
||||
|
||||
public void setWxchantId(String wxchantId) {
|
||||
this.wxchantId = wxchantId;
|
||||
public void setApiV3Key(String apiV3Key) {
|
||||
this.apiV3Key = apiV3Key;
|
||||
}
|
||||
|
||||
public String getWxchantSerialNumber() {
|
||||
return wxchantSerialNumber;
|
||||
}
|
||||
|
||||
public void setWxchantSerialNumber(String wxchantSerialNumber) {
|
||||
this.wxchantSerialNumber = wxchantSerialNumber;
|
||||
}
|
||||
|
||||
public String getWxapiV3Key() {
|
||||
return wxapiV3Key;
|
||||
}
|
||||
|
||||
public void setWxapiV3Key(String wxapiV3Key) {
|
||||
this.wxapiV3Key = wxapiV3Key;
|
||||
public void setPrivateKeyPath(String privateKeyPath) {
|
||||
this.privateKeyPath = privateKeyPath;
|
||||
}
|
||||
|
||||
public String getAppId() {
|
||||
@ -116,4 +92,48 @@ public class WxPayConfig {
|
||||
public void setNotifyUrl(String notifyUrl) {
|
||||
this.notifyUrl = notifyUrl;
|
||||
}
|
||||
|
||||
@Bean
|
||||
public RSAAutoCertificateConfig wxpayBaseConfig() throws Exception {
|
||||
return new RSAAutoCertificateConfig.Builder()
|
||||
.merchantId(getMerchantId())
|
||||
.privateKeyFromPath(getPrivateKeyPath())
|
||||
.merchantSerialNumber(getMerchantSerialNumber())
|
||||
.apiV3Key(getApiV3Key())
|
||||
.build();
|
||||
}
|
||||
|
||||
@Bean
|
||||
public NativePayService nativePayService() throws Exception {
|
||||
return new NativePayService.Builder().config(wxpayBaseConfig()).build();
|
||||
}
|
||||
|
||||
@Bean
|
||||
public RefundService refundService() throws Exception {
|
||||
return new RefundService.Builder().config(wxpayBaseConfig()).build();
|
||||
}
|
||||
|
||||
@Bean
|
||||
public NotificationParser notificationParser() throws Exception {
|
||||
return new NotificationParser(wxpayBaseConfig());
|
||||
}
|
||||
|
||||
@Autowired
|
||||
private ApplicationContext applicationContext;
|
||||
|
||||
public String getPrivateKeyPath() throws Exception {
|
||||
if (privateKeyPath.startsWith("classpath:")) {
|
||||
Resource resource = applicationContext.getResource(privateKeyPath);
|
||||
String tempFilePath = System.getProperty("java.io.tmpdir") + "/temp_wxcert.pem";
|
||||
try (InputStream inputStream = resource.getInputStream()) {
|
||||
Files.copy(inputStream, Paths.get(tempFilePath), StandardCopyOption.REPLACE_EXISTING);
|
||||
privateKeyPath = tempFilePath;
|
||||
} catch (Exception e) {
|
||||
Files.deleteIfExists(Paths.get(tempFilePath));
|
||||
throw new RuntimeException("微信支付证书文件读取失败", e);
|
||||
}
|
||||
}
|
||||
return privateKeyPath;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -1,113 +0,0 @@
|
||||
package com.ruoyi.pay.wx.controller;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||
import org.springframework.util.StreamUtils;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import com.ruoyi.common.annotation.Anonymous;
|
||||
import com.ruoyi.common.core.controller.BaseController;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.common.core.domain.R;
|
||||
import com.ruoyi.pay.domain.PayOrder;
|
||||
import com.ruoyi.pay.service.IPayOrderService;
|
||||
import com.ruoyi.pay.wx.config.WxPayConfig;
|
||||
import com.ruoyi.pay.wx.service.IWxPayService;
|
||||
import com.wechat.pay.java.core.exception.ValidationException;
|
||||
import com.wechat.pay.java.core.notification.NotificationParser;
|
||||
import com.wechat.pay.java.core.notification.RequestParam;
|
||||
import com.wechat.pay.java.service.payments.nativepay.NativePayService;
|
||||
import com.wechat.pay.java.service.payments.nativepay.model.Amount;
|
||||
import com.wechat.pay.java.service.payments.nativepay.model.PrepayRequest;
|
||||
import com.wechat.pay.java.service.payments.nativepay.model.PrepayResponse;
|
||||
import com.wechat.pay.java.service.wexinpayscoreparking.model.Transaction;
|
||||
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.Parameters;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
|
||||
/**
|
||||
* @author zlh
|
||||
*/
|
||||
@RestController
|
||||
@ConditionalOnProperty(prefix = "pay.wechat", name = "enabled", havingValue = "true")
|
||||
@RequestMapping("/pay/wechat")
|
||||
public class WxPayController extends BaseController {
|
||||
@Autowired
|
||||
private WxPayConfig wxPayAppConfig;
|
||||
|
||||
@Autowired(required = false)
|
||||
private IWxPayService wxPayService;
|
||||
|
||||
@Autowired
|
||||
private IPayOrderService payOrderService;
|
||||
|
||||
@Autowired
|
||||
private NativePayService nativePayService;
|
||||
@Autowired
|
||||
private NotificationParser notificationParser;
|
||||
|
||||
@Operation(summary = "微信支付")
|
||||
@Parameters({
|
||||
@Parameter(name = "orderNumber", description = "订单号", required = true)
|
||||
})
|
||||
@GetMapping("/url/{orderNumber}")
|
||||
public R<String> url(@PathVariable(name = "orderNumber") String orderNumber) throws Exception {
|
||||
PayOrder aliPay = payOrderService.selectPayOrderByOrderNumber(orderNumber);
|
||||
PrepayRequest request = new PrepayRequest();
|
||||
Amount amount = new Amount();
|
||||
amount.setTotal(Integer.parseInt(aliPay.getActualAmount()));
|
||||
request.setAmount(amount);
|
||||
request.setAppid(wxPayAppConfig.getAppId());
|
||||
request.setMchid(wxPayAppConfig.getWxchantId());
|
||||
request.setDescription(aliPay.getOrderContent());
|
||||
request.setNotifyUrl(wxPayAppConfig.getNotifyUrl());
|
||||
request.setOutTradeNo(aliPay.getOrderNumber());
|
||||
PrepayResponse response = nativePayService.prepay(request);
|
||||
return R.ok(response.getCodeUrl());
|
||||
}
|
||||
|
||||
@Anonymous
|
||||
@Operation(summary = "微信支付查询订单")
|
||||
@PostMapping("/notify")
|
||||
public AjaxResult notify(HttpServletRequest servletRequest, HttpServletResponse response)
|
||||
throws Exception {
|
||||
String timeStamp = servletRequest.getHeader("Wechatpay-Timestamp");
|
||||
String nonce = servletRequest.getHeader("Wechatpay-Nonce");
|
||||
String signature = servletRequest.getHeader("Wechatpay-Signature");
|
||||
String certSn = servletRequest.getHeader("Wechatpay-Serial");
|
||||
|
||||
try {
|
||||
String requestBody = StreamUtils.copyToString(servletRequest.getInputStream(), StandardCharsets.UTF_8);
|
||||
RequestParam requestParam = new RequestParam.Builder()
|
||||
.serialNumber(certSn)
|
||||
.nonce(nonce)
|
||||
.signature(signature)
|
||||
.timestamp(timeStamp)
|
||||
.body(requestBody)
|
||||
.build();
|
||||
|
||||
try {
|
||||
Transaction transaction = notificationParser.parse(requestParam, Transaction.class);
|
||||
if (wxPayService != null) {
|
||||
wxPayService.callback(transaction);
|
||||
}
|
||||
return success();
|
||||
} catch (ValidationException e) {
|
||||
return error();
|
||||
}
|
||||
} catch (IOException e) {
|
||||
return error(e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,7 +1,6 @@
|
||||
package com.ruoyi.pay.wx.service;
|
||||
|
||||
import com.wechat.pay.java.service.wexinpayscoreparking.model.Transaction;
|
||||
import com.ruoyi.pay.service.PayService;
|
||||
|
||||
public interface IWxPayService {
|
||||
public void callback(Transaction transaction);
|
||||
public interface IWxPayService extends PayService {
|
||||
}
|
||||
|
||||
@ -0,0 +1,124 @@
|
||||
package com.ruoyi.pay.wx.service.Impl;
|
||||
|
||||
import java.nio.charset.StandardCharsets;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.util.StreamUtils;
|
||||
|
||||
import com.ruoyi.pay.domain.PayOrder;
|
||||
import com.ruoyi.pay.service.IPayOrderService;
|
||||
import com.ruoyi.pay.wx.config.WxPayConfig;
|
||||
import com.ruoyi.pay.wx.service.IWxPayService;
|
||||
import com.wechat.pay.java.core.exception.ServiceException;
|
||||
import com.wechat.pay.java.core.notification.NotificationParser;
|
||||
import com.wechat.pay.java.core.notification.RequestParam;
|
||||
import com.wechat.pay.java.service.payments.model.Transaction;
|
||||
import com.wechat.pay.java.service.payments.model.Transaction.TradeStateEnum;
|
||||
import com.wechat.pay.java.service.payments.nativepay.NativePayService;
|
||||
import com.wechat.pay.java.service.payments.nativepay.model.Amount;
|
||||
import com.wechat.pay.java.service.payments.nativepay.model.PrepayRequest;
|
||||
import com.wechat.pay.java.service.payments.nativepay.model.PrepayResponse;
|
||||
import com.wechat.pay.java.service.payments.nativepay.model.QueryOrderByIdRequest;
|
||||
import com.wechat.pay.java.service.refund.RefundService;
|
||||
import com.wechat.pay.java.service.refund.model.CreateRequest;
|
||||
import com.wechat.pay.java.service.refund.model.Refund;
|
||||
import com.wechat.pay.java.service.refund.model.Status;
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
|
||||
@Service("wechatPayService")
|
||||
@ConditionalOnProperty(prefix = "pay.wechat", name = "enabled", havingValue = "true")
|
||||
public class WxPayService implements IWxPayService {
|
||||
|
||||
@Autowired
|
||||
private IPayOrderService payOrderService;
|
||||
|
||||
@Autowired
|
||||
private NativePayService nativePayService;
|
||||
|
||||
@Autowired
|
||||
private WxPayConfig wxPayAppConfig;
|
||||
|
||||
@Autowired
|
||||
private NotificationParser notificationParser;
|
||||
|
||||
@Autowired
|
||||
private RefundService refundService;
|
||||
|
||||
@Override
|
||||
public String payUrl(PayOrder payOrder) {
|
||||
PrepayRequest request = new PrepayRequest();
|
||||
Amount amount = new Amount();
|
||||
amount.setTotal(Integer.parseInt(payOrder.getActualAmount()));
|
||||
request.setAmount(amount);
|
||||
request.setAppid(wxPayAppConfig.getAppId());
|
||||
request.setMchid(wxPayAppConfig.getMerchantId());
|
||||
request.setDescription(payOrder.getOrderContent());
|
||||
request.setNotifyUrl(wxPayAppConfig.getNotifyUrl());
|
||||
request.setOutTradeNo(payOrder.getOrderNumber());
|
||||
PrepayResponse response = nativePayService.prepay(request);
|
||||
return response.getCodeUrl();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String notify(HttpServletRequest request, HttpServletResponse response) {
|
||||
String timeStamp = request.getHeader("Wechatpay-Timestamp");
|
||||
String nonce = request.getHeader("Wechatpay-Nonce");
|
||||
String signature = request.getHeader("Wechatpay-Signature");
|
||||
String certSn = request.getHeader("Wechatpay-Serial");
|
||||
try {
|
||||
String requestBody = StreamUtils.copyToString(request.getInputStream(), StandardCharsets.UTF_8);
|
||||
RequestParam requestParam = new RequestParam.Builder()
|
||||
.serialNumber(certSn)
|
||||
.nonce(nonce)
|
||||
.signature(signature)
|
||||
.timestamp(timeStamp)
|
||||
.body(requestBody)
|
||||
.build();
|
||||
Transaction transaction = notificationParser.parse(requestParam, Transaction.class);
|
||||
String orderNumber = transaction.getOutTradeNo();
|
||||
String otherOrderNumber = transaction.getTransactionId();
|
||||
TradeStateEnum orderState = transaction.getTradeState();
|
||||
System.out.println("orderNumber: " + orderNumber);
|
||||
System.out.println("otherOrderNumber: " + otherOrderNumber);
|
||||
System.out.println("orderState: " + orderState);
|
||||
return "success";
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return "fail";
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public PayOrder query(PayOrder payOrder) {
|
||||
QueryOrderByIdRequest queryRequest = new QueryOrderByIdRequest();
|
||||
queryRequest.setMchid(wxPayAppConfig.getMerchantId());
|
||||
queryRequest.setTransactionId(payOrder.getOrderNumber());
|
||||
try {
|
||||
Transaction result = nativePayService.queryOrderById(queryRequest);
|
||||
System.out.println(result.getTradeState());
|
||||
} catch (ServiceException e) {
|
||||
System.out.printf("code=[%s], message=[%s]\n", e.getErrorCode(), e.getErrorMessage());
|
||||
System.out.printf("reponse body=[%s]\n", e.getResponseBody());
|
||||
}
|
||||
return payOrder;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PayOrder refund(PayOrder payOrder) {
|
||||
CreateRequest request = new CreateRequest();
|
||||
request.setTransactionId(payOrder.getOrderNumber());
|
||||
request.setOutRefundNo(payOrder.getOrderNumber());
|
||||
request.setOutTradeNo(payOrder.getOrderNumber());
|
||||
Refund refund = refundService.create(request);
|
||||
Status status = refund.getStatus();
|
||||
if (status.equals(Status.SUCCESS)) {
|
||||
payOrderService.updateStatus(payOrder.getOrderNumber(), "已退款");
|
||||
}
|
||||
return payOrder;
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,39 @@
|
||||
{
|
||||
"properties": [
|
||||
{
|
||||
"name": "pay.wechat.enabled",
|
||||
"type": "java.lang.Boolean",
|
||||
"description": "是否启用微信支付"
|
||||
},
|
||||
{
|
||||
"name": "pay.wechat.appId",
|
||||
"type": "java.lang.String",
|
||||
"description": "微信支付appid"
|
||||
},
|
||||
{
|
||||
"name": "pay.wechat.apiV3Key",
|
||||
"type": "java.lang.String",
|
||||
"description": "微信支付apiV3Key"
|
||||
},
|
||||
{
|
||||
"name": "pay.wechat.privateKeyPath",
|
||||
"type": "java.lang.String",
|
||||
"description": "微信支付私钥，可以直接用字符串，也可以是基于classpath的文件路径"
|
||||
},
|
||||
{
|
||||
"name": "pay.wechat.merchantId",
|
||||
"type": "java.lang.String",
|
||||
"description": "微信支付merchantId"
|
||||
},
|
||||
{
|
||||
"name": "pay.wechat.merchantSerialNumber",
|
||||
"type": "java.lang.String",
|
||||
"description": "微信支付merchantSerialNumber"
|
||||
},
|
||||
{
|
||||
"name": "pay.wechat.notifyUrl",
|
||||
"type": "java.lang.String",
|
||||
"description": "微信支付回调地址"
|
||||
}
|
||||
]
|
||||
}
|
||||
@ -0,0 +1,113 @@
|
||||
package com.ruoyi.system.controller;
|
||||
|
||||
import java.util.List;
|
||||
import jakarta.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.system.domain.SysUnitConvert;
|
||||
import com.ruoyi.system.service.ISysUnitConvertService;
|
||||
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
|
||||
/**
|
||||
* 单位转换Controller
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-03-20
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/system/SysUnitConvert")
|
||||
@Tag(name = "【单位转换】管理")
|
||||
public class SysUnitConvertController extends BaseController
|
||||
{
|
||||
@Autowired
|
||||
private ISysUnitConvertService sysUnitConvertService;
|
||||
|
||||
/**
|
||||
* 查询单位转换列表
|
||||
*/
|
||||
@Operation(summary = "查询单位转换列表")
|
||||
@PreAuthorize("@ss.hasPermi('system:SysUnitConvert:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(SysUnitConvert sysUnitConvert)
|
||||
{
|
||||
startPage();
|
||||
List<SysUnitConvert> list = sysUnitConvertService.selectSysUnitConvertList(sysUnitConvert);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出单位转换列表
|
||||
*/
|
||||
@Operation(summary = "导出单位转换列表")
|
||||
@PreAuthorize("@ss.hasPermi('system:SysUnitConvert:export')")
|
||||
@Log(title = "单位转换", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, SysUnitConvert sysUnitConvert)
|
||||
{
|
||||
List<SysUnitConvert> list = sysUnitConvertService.selectSysUnitConvertList(sysUnitConvert);
|
||||
ExcelUtil<SysUnitConvert> util = new ExcelUtil<SysUnitConvert>(SysUnitConvert.class);
|
||||
util.exportExcel(response, list, "单位转换数据");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取单位转换详细信息
|
||||
*/
|
||||
@Operation(summary = "获取单位转换详细信息")
|
||||
@PreAuthorize("@ss.hasPermi('system:SysUnitConvert:query')")
|
||||
@GetMapping(value = "/{id}")
|
||||
public AjaxResult getInfo(@PathVariable("id") Long id)
|
||||
{
|
||||
return success(sysUnitConvertService.selectSysUnitConvertById(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增单位转换
|
||||
*/
|
||||
@Operation(summary = "新增单位转换")
|
||||
@PreAuthorize("@ss.hasPermi('system:SysUnitConvert:add')")
|
||||
@Log(title = "单位转换", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody SysUnitConvert sysUnitConvert)
|
||||
{
|
||||
return toAjax(sysUnitConvertService.insertSysUnitConvert(sysUnitConvert));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改单位转换
|
||||
*/
|
||||
@Operation(summary = "修改单位转换")
|
||||
@PreAuthorize("@ss.hasPermi('system:SysUnitConvert:edit')")
|
||||
@Log(title = "单位转换", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody SysUnitConvert sysUnitConvert)
|
||||
{
|
||||
return toAjax(sysUnitConvertService.updateSysUnitConvert(sysUnitConvert));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除单位转换
|
||||
*/
|
||||
@Operation(summary = "删除单位转换")
|
||||
@PreAuthorize("@ss.hasPermi('system:SysUnitConvert:remove')")
|
||||
@Log(title = "单位转换", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public AjaxResult remove(@PathVariable( name = "ids" ) Long[] ids)
|
||||
{
|
||||
return toAjax(sysUnitConvertService.deleteSysUnitConvertByIds(ids));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,100 @@
|
||||
package com.ruoyi.system.controller;
|
||||
|
||||
import com.ruoyi.system.domain.SysUnitConvert;
|
||||
import com.ruoyi.system.service.ISysUnitConvertService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.math.RoundingMode;
|
||||
|
||||
@Component
|
||||
public class UnitConvert {
|
||||
|
||||
private final ISysUnitConvertService sysUnitConvertService;
|
||||
|
||||
@Autowired
|
||||
public UnitConvert(ISysUnitConvertService sysUnitConvertService) {
|
||||
this.sysUnitConvertService = sysUnitConvertService;
|
||||
}
|
||||
|
||||
public double ConvertUniter(String unitType, double oldValue, int oldUnit, int newUnit) {
|
||||
// 查询旧单位信息
|
||||
if ("temperature".equalsIgnoreCase(unitType)) {
|
||||
return handleTemperatureConversion(BigDecimal.valueOf(oldValue), (long) oldUnit, (long) newUnit).doubleValue();
|
||||
} else {
|
||||
SysUnitConvert tempUnit = new SysUnitConvert();
|
||||
tempUnit.setUnitType(unitType);
|
||||
tempUnit.setUnitOrder((long) oldUnit);
|
||||
|
||||
SysUnitConvert oldUnitInfo = sysUnitConvertService.selectSysUnitConvertUnitByTypeOrder(tempUnit);
|
||||
if (oldUnitInfo == null) {
|
||||
throw new IllegalArgumentException("旧单位 '" + oldUnit + "' 不存在或不可用");
|
||||
}
|
||||
tempUnit=new SysUnitConvert();;
|
||||
tempUnit.setUnitType(unitType);
|
||||
tempUnit.setBaseUnit("Y");
|
||||
|
||||
SysUnitConvert baseUnitInfo = sysUnitConvertService.selectSysUnitConvertUnitByTypeOrder(tempUnit);
|
||||
if (baseUnitInfo == null) {
|
||||
throw new IllegalArgumentException("基准单位 不存在或不可用");
|
||||
}
|
||||
tempUnit=new SysUnitConvert();
|
||||
tempUnit.setUnitType(unitType);
|
||||
tempUnit.setUnitOrder((long) newUnit);
|
||||
// 查询新单位信息
|
||||
SysUnitConvert newUnitInfo = sysUnitConvertService.selectSysUnitConvertUnitByTypeOrder(tempUnit);
|
||||
if (newUnitInfo == null) {
|
||||
throw new IllegalArgumentException("新单位 '" + newUnit + "' 不存在或不可用");
|
||||
}
|
||||
|
||||
BigDecimal oldFactor = oldUnitInfo.getConversionFactor();
|
||||
BigDecimal newFactor = newUnitInfo.getConversionFactor();
|
||||
|
||||
// 检查旧单位转换因子是否为零
|
||||
if (oldFactor.compareTo(BigDecimal.ZERO) == 0) {
|
||||
throw new ArithmeticException("旧单位 '" + oldUnit + "' 的转换因子为零，无法进行转换");
|
||||
}
|
||||
|
||||
// 计算基准值：oldValue / oldFactor
|
||||
int scale = 20; // 设置足够大的精度以避免精度丢失
|
||||
BigDecimal baseValue = BigDecimal.valueOf(oldValue).divide(oldFactor, scale, RoundingMode.HALF_UP);
|
||||
|
||||
// 计算新值：baseValue * newFactor
|
||||
BigDecimal newValue = baseValue.multiply(newFactor);
|
||||
|
||||
// 四舍五入到合理的小数位数（例如10位）
|
||||
newValue = newValue.setScale(10, RoundingMode.HALF_UP);
|
||||
|
||||
return newValue.doubleValue();
|
||||
}
|
||||
}
|
||||
|
||||
// 温度转换方法
|
||||
public BigDecimal handleTemperatureConversion(BigDecimal oldValue, Long oldUnit, Long newUnit) {
|
||||
final BigDecimal THIRTY_TWO = BigDecimal.valueOf(32);
|
||||
final BigDecimal FIVE = BigDecimal.valueOf(5);
|
||||
final BigDecimal NINE = BigDecimal.valueOf(9);
|
||||
final BigDecimal TWO_HUNDRED_SEVENTY_THREE_POINT_ONE_FIVE = BigDecimal.valueOf(273.15);
|
||||
// 使用原始值计算
|
||||
BigDecimal celsius;
|
||||
if (oldUnit == 0) {
|
||||
celsius = oldValue;
|
||||
} else if (oldUnit == 1) {
|
||||
celsius = oldValue.subtract(THIRTY_TWO).multiply(FIVE).divide(NINE, 10, RoundingMode.HALF_UP);
|
||||
} else if (oldUnit == 2) {
|
||||
celsius = oldValue.subtract(TWO_HUNDRED_SEVENTY_THREE_POINT_ONE_FIVE);
|
||||
} else {
|
||||
throw new IllegalArgumentException("无效温度单位");
|
||||
}
|
||||
|
||||
if (newUnit == 0) {
|
||||
return celsius;
|
||||
} else if (newUnit == 1) {
|
||||
return celsius.multiply(NINE).divide(FIVE, 10, RoundingMode.HALF_UP).add(THIRTY_TWO);
|
||||
} else if (newUnit == 2) {
|
||||
return celsius.add(TWO_HUNDRED_SEVENTY_THREE_POINT_ONE_FIVE);
|
||||
}
|
||||
throw new IllegalArgumentException("无效温度单位");
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,162 @@
|
||||
package com.ruoyi.system.domain;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
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;
|
||||
|
||||
/**
|
||||
* 单位转换对象 sys_unit_convert
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-03-20
|
||||
*/
|
||||
@Schema(description = "单位转换对象")
|
||||
public class SysUnitConvert extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
|
||||
/** $column.columnComment */
|
||||
@Schema(title = "$column.columnComment")
|
||||
private Long id;
|
||||
|
||||
/** 单位类型 */
|
||||
@Schema(title = "单位类型")
|
||||
@Excel(name = "单位类型")
|
||||
private String unitType;
|
||||
|
||||
/** 单位名称 */
|
||||
@Schema(title = "单位名称")
|
||||
@Excel(name = "单位名称")
|
||||
private String unitName;
|
||||
|
||||
/** 是否基准 */
|
||||
@Schema(title = "是否基准")
|
||||
@Excel(name = "是否基准")
|
||||
private String baseUnit;
|
||||
|
||||
/** 换算因子 */
|
||||
@Schema(title = "换算因子")
|
||||
@Excel(name = "换算因子")
|
||||
private BigDecimal conversionFactor;
|
||||
|
||||
/** 类型名称 */
|
||||
@Schema(title = "类型名称")
|
||||
@Excel(name = "类型名称")
|
||||
private String unitTypeName;
|
||||
|
||||
/** 状态 */
|
||||
@Schema(title = "状态")
|
||||
@Excel(name = "状态")
|
||||
private String status;
|
||||
|
||||
/** 单位序号 */
|
||||
@Schema(title = "单位序号")
|
||||
@Excel(name = "单位序号")
|
||||
private Long unitOrder;
|
||||
public void setId(Long id)
|
||||
{
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public Long getId()
|
||||
{
|
||||
return id;
|
||||
}
|
||||
|
||||
|
||||
public void setUnitType(String unitType)
|
||||
{
|
||||
this.unitType = unitType;
|
||||
}
|
||||
|
||||
public String getUnitType()
|
||||
{
|
||||
return unitType;
|
||||
}
|
||||
|
||||
|
||||
public void setUnitName(String unitName)
|
||||
{
|
||||
this.unitName = unitName;
|
||||
}
|
||||
|
||||
public String getUnitName()
|
||||
{
|
||||
return unitName;
|
||||
}
|
||||
|
||||
|
||||
public void setBaseUnit(String baseUnit)
|
||||
{
|
||||
this.baseUnit = baseUnit;
|
||||
}
|
||||
|
||||
public String getBaseUnit()
|
||||
{
|
||||
return baseUnit;
|
||||
}
|
||||
|
||||
|
||||
public void setConversionFactor(BigDecimal conversionFactor)
|
||||
{
|
||||
this.conversionFactor = conversionFactor;
|
||||
}
|
||||
|
||||
public BigDecimal getConversionFactor()
|
||||
{
|
||||
return conversionFactor;
|
||||
}
|
||||
|
||||
|
||||
public void setUnitTypeName(String unitTypeName)
|
||||
{
|
||||
this.unitTypeName = unitTypeName;
|
||||
}
|
||||
|
||||
public String getUnitTypeName()
|
||||
{
|
||||
return unitTypeName;
|
||||
}
|
||||
|
||||
|
||||
public void setStatus(String status)
|
||||
{
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public String getStatus()
|
||||
{
|
||||
return status;
|
||||
}
|
||||
|
||||
|
||||
public void setUnitOrder(Long unitOrder)
|
||||
{
|
||||
this.unitOrder = unitOrder;
|
||||
}
|
||||
|
||||
public Long getUnitOrder()
|
||||
{
|
||||
return unitOrder;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("id", getId())
|
||||
.append("unitType", getUnitType())
|
||||
.append("unitName", getUnitName())
|
||||
.append("baseUnit", getBaseUnit())
|
||||
.append("conversionFactor", getConversionFactor())
|
||||
.append("unitTypeName", getUnitTypeName())
|
||||
.append("status", getStatus())
|
||||
.append("unitOrder", getUnitOrder())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,74 @@
|
||||
package com.ruoyi.system.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.system.domain.SysUnitConvert;
|
||||
|
||||
/**
|
||||
* 单位转换Mapper接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-03-20
|
||||
*/
|
||||
public interface SysUnitConvertMapper
|
||||
{
|
||||
/**
|
||||
* 查询单位转换
|
||||
*
|
||||
* @param id 单位转换主键
|
||||
* @return 单位转换
|
||||
*/
|
||||
public SysUnitConvert selectSysUnitConvertById(Long id);
|
||||
|
||||
/**
|
||||
* 查询单位转换列表
|
||||
*
|
||||
* @param sysUnitConvert 单位转换
|
||||
* @return 单位转换集合
|
||||
*/
|
||||
public List<SysUnitConvert> selectSysUnitConvertList(SysUnitConvert sysUnitConvert);
|
||||
|
||||
/**
|
||||
* 新增单位转换
|
||||
*
|
||||
* @param sysUnitConvert 单位转换
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertSysUnitConvert(SysUnitConvert sysUnitConvert);
|
||||
|
||||
/**
|
||||
* 修改单位转换
|
||||
*
|
||||
* @param sysUnitConvert 单位转换
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateSysUnitConvert(SysUnitConvert sysUnitConvert);
|
||||
|
||||
/**
|
||||
* 删除单位转换
|
||||
*
|
||||
* @param id 单位转换主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteSysUnitConvertById(Long id);
|
||||
|
||||
/**
|
||||
* 批量删除单位转换
|
||||
*
|
||||
* @param ids 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteSysUnitConvertByIds(Long[] ids);
|
||||
|
||||
/**
|
||||
* 查询单位换算
|
||||
*
|
||||
* @param sysUnitConvert 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public SysUnitConvert selectSysUnitConvertUnitByTypeOrder(SysUnitConvert sysUnitConvert);
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user