Merge remote-tracking branch 'origin/dev' into dev
commit
695ceaaacf
|
|
@ -11,7 +11,6 @@ import org.springframework.validation.annotation.Validated;
|
|||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* 人员信息适配层（Controller）
|
||||
|
|
@ -61,16 +60,4 @@ public class OrgPersonnelController {
|
|||
public SingleResponse<Void> resetPassword(@ApiParam("主键ID") @RequestBody Req<Long> req) {
|
||||
return orgPersonnelApi.resetPassword(req.getData());
|
||||
}
|
||||
|
||||
@ApiOperation("更新人员原始人像地址")
|
||||
@PostMapping("/update-origin-face")
|
||||
public SingleResponse<OrgPersonnelCO> updateOriginFace(@RequestBody OrgPersonnelUpdateOriginFaceCmd cmd) {
|
||||
return orgPersonnelApi.updateOriginFace(cmd);
|
||||
}
|
||||
|
||||
@ApiOperation("人脸比对（传入待比对图片base64，与人员原始人像比对）")
|
||||
@PostMapping("/compare-face")
|
||||
public SingleResponse<BigDecimal> compareFace(@RequestBody OrgPersonnelCompareFaceCmd cmd) {
|
||||
return orgPersonnelApi.compareFace(cmd);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,13 +4,14 @@ import io.swagger.annotations.Api;
|
|||
import io.swagger.annotations.ApiOperation;
|
||||
import org.qinan.safetyeval.client.api.OrgPersonnelApi;
|
||||
import org.qinan.safetyeval.client.co.OrgPersonnelCO;
|
||||
import org.qinan.safetyeval.client.dto.OrgPersonnelCompareFaceCmd;
|
||||
import org.qinan.safetyeval.client.dto.OrgPersonnelUpdateOriginFaceCmd;
|
||||
import org.qinan.safetyeval.client.dto.SingleResponse;
|
||||
import org.qinan.safetyeval.infrastructure.adapter.auth.AuthUserContextAdapter;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* 人员信息适配层（Controller）
|
||||
|
|
@ -19,7 +20,7 @@ import javax.annotation.Resource;
|
|||
*/
|
||||
@Api(tags = "移动端人员信息管理")
|
||||
@RestController
|
||||
@RequestMapping("/safetyEval/app/org-personnel")
|
||||
@RequestMapping("/safetyEval/app/app/org-personnel")
|
||||
public class AppOrgPersonnelController {
|
||||
|
||||
@Resource
|
||||
|
|
@ -31,4 +32,16 @@ public class AppOrgPersonnelController {
|
|||
return orgPersonnelApi.get(AuthUserContextAdapter.getCurrentUserId());
|
||||
}
|
||||
|
||||
@ApiOperation("更新人员原始人像地址")
|
||||
@PostMapping("/update-origin-face")
|
||||
public SingleResponse<OrgPersonnelCO> updateOriginFace(@RequestBody OrgPersonnelUpdateOriginFaceCmd cmd) {
|
||||
return orgPersonnelApi.updateOriginFace(cmd);
|
||||
}
|
||||
|
||||
@ApiOperation("人脸比对（传入待比对图片base64，与人员原始人像比对）")
|
||||
@PostMapping("/compare-face")
|
||||
public SingleResponse<BigDecimal> compareFace(@RequestBody OrgPersonnelCompareFaceCmd cmd) {
|
||||
return orgPersonnelApi.compareFace(cmd);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<!doctype html><html lang="zh"><head data-built-info="@cqsjjb/scripts@2.0.0-rspack.1 Frontend_Env[production] Build_Date[2026/7/29 09:19:40] App_Identifier[safetyEval]"><meta charset="UTF-8"/><meta name="renderer" content="webkit"/><meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1"/><meta name="viewport" content="width=device-width,minimum-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover"><title>--</title><script>(function () {
|
||||
<!doctype html><html lang="zh"><head data-built-info="@cqsjjb/scripts@2.0.0-rspack.1 Frontend_Env[production] Build_Date[2026/7/30 08:59:39] App_Identifier[safetyEval]"><meta charset="UTF-8"/><meta name="renderer" content="webkit"/><meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1"/><meta name="viewport" content="width=device-width,minimum-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover"><title>--</title><script>(function () {
|
||||
const APP_ENV = {
|
||||
antd: {
|
||||
'ant-prefix': 'micro-temp',
|
||||
|
|
@ -89,4 +89,4 @@
|
|||
},
|
||||
|
||||
}
|
||||
}</script><script defer="defer" src="/safetyEval/static/js/338.1b66d6d63e1b5322.js"></script><script defer="defer" src="/safetyEval/static/js/121.ae75e71830bf4ae0.js"></script><script defer="defer" src="/safetyEval/static/js/289.7986b98192d94918.js"></script><script defer="defer" src="/safetyEval/static/js/main.dd7ecb5f742e3668.js"></script><link href="/safetyEval/static/css/main.fd0f74d150393310.css" rel="stylesheet"></head><body><noscript>此网页需要开启JavaScript功能。</noscript><div id="root" style="width: 100%; height: 100%; position: relative;overflow-y: auto"></div><script type="text/javascript">/* @cqsjjb/script 输出当前应用基本信息 */console.log("%c@cqsjjb/scripts@2.0.0-rspack.1 Frontend_Env[production] Build_Date[2026/7/29 09:19:40] App_Identifier[safetyEval] Frontend_Branch[dev] Backend_Branch[dev]", "color: #1890ff; border-radius: 2px; padding: 0 4px; border: 1px solid #1890ff; background: #f9fcff")</script></body></html>
|
||||
}</script><script defer="defer" src="/safetyEval/static/js/338.1b66d6d63e1b5322.js"></script><script defer="defer" src="/safetyEval/static/js/121.ae75e71830bf4ae0.js"></script><script defer="defer" src="/safetyEval/static/js/289.7986b98192d94918.js"></script><script defer="defer" src="/safetyEval/static/js/main.e63b3f4a22bc3f69.js"></script><link href="/safetyEval/static/css/main.b94e92056490c228.css" rel="stylesheet"></head><body><noscript>此网页需要开启JavaScript功能。</noscript><div id="root" style="width: 100%; height: 100%; position: relative;overflow-y: auto"></div><script type="text/javascript">/* @cqsjjb/script 输出当前应用基本信息 */console.log("%c@cqsjjb/scripts@2.0.0-rspack.1 Frontend_Env[production] Build_Date[2026/7/30 08:59:39] App_Identifier[safetyEval] Frontend_Branch[dev] Backend_Branch[dev]", "color: #1890ff; border-radius: 2px; padding: 0 4px; border: 1px solid #1890ff; background: #f9fcff")</script></body></html>
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1 +1 @@
|
|||
module.exports={javaGit:"http://47.92.113.182:3000/cq_anquan/safety-eval-service.git",javaGitName:"safety-eval-service",environment:{development:{javaGitBranch:"dev",API_HOST:"http://192.168.0.150"},production:{javaGitBranch:"dev",API_HOST:""}},appIdentifier:"safetyEval",contextInject:{appKey:"",fileUrl:"https://skqhdg.porthebei.com:9004/file/uploadFiles2/"},windowInject:{title:"微应用模板",links:[],element:{root:{id:"root"}},scripts:[]},server:{port:"8081",host:"192.168.0.187",open:!1},framework:{antd:{"ant-prefix":"micro-temp",fontFamily:"PingFangSC-Regular",colorPrimary:"#1677ff",borderRadius:2}},webpackConfig:{htmlWebpackPluginOption:{inject:!0},resolve:{fallback:{stream:!1}}}};
|
||||
module.exports={javaGit:"http://47.92.113.182:3000/cq_anquan/safety-eval-service.git",javaGitName:"safety-eval-service",environment:{development:{javaGitBranch:"dev",API_HOST:"https://gbs-gateway.qhdsafety.com"},production:{javaGitBranch:"dev",API_HOST:""}},appIdentifier:"safetyEval",contextInject:{appKey:"",fileUrl:"https://skqhdg.porthebei.com:9004/file/uploadFiles2/"},windowInject:{title:"微应用模板",links:[],element:{root:{id:"root"}},scripts:[]},server:{port:"8081",host:"192.168.0.187",open:!1},framework:{antd:{"ant-prefix":"micro-temp",fontFamily:"PingFangSC-Regular",colorPrimary:"#1677ff",borderRadius:2}},webpackConfig:{htmlWebpackPluginOption:{inject:!0},resolve:{fallback:{stream:!1}}}};
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue