yangjun
/
nursing_unit_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加客户端类型

This commit is contained in:
yangjun 2025-12-03 15:18:13 +08:00
parent 5fa6c07ed3
commit 30b4758153
3 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java
View File

@ -49,7 +49,7 @@ public class InvoicingApi {
@ApiOperation(value="请购单-请购信息-添加", notes="请购单-请购信息-添加")
@AutoLog(value = "请购单-请购信息-添加")
@AutoLog(value = "请购单-请购信息-添加",clientType="app")
@PostMapping(value = "/addShoppingCartList")
public Result<String> addShoppingCartList(@RequestBody List<QgdInfoEntity> infoList) {
Integer maxCount = 100;//购物车最大数量
@ -69,7 +69,7 @@ public class InvoicingApi {
}
@ApiOperation(value="修改购物车请购信息", notes="修改购物车请购信息")
@AutoLog(value = "修改购物车请购信息")
@AutoLog(value = "修改购物车请购信息",clientType="app")
@PostMapping(value = "/eddShoppingCartList")
public Result<String> eddShoppingCartList(@RequestBody QgdInfoEntity qgdInfoEntity) {
String result = invoicingApi.eddShoppingCartList(qgdInfoEntity);
@ -82,7 +82,7 @@ public class InvoicingApi {
}
@ApiOperation(value="生成采购单预览信息", notes="生成采购单预览信息")
@AutoLog(value = "生成采购单预览信息")
@AutoLog(value = "生成采购单预览信息",clientType="app")
@PostMapping(value = "/generatedPurchaseViewOrder")
public Result<Object> generatedPurchaseViewOrder(@RequestBody List<QgdInfoEntity> infoList, HttpServletRequest req) {
Map<String,Object> list = invoicingApi.generatedPurchaseViewOrder(infoList);
@ -92,7 +92,7 @@ public class InvoicingApi {
return Result.OK(list.get("data"));
}
@ApiOperation(value="生成采购单信息", notes="生成采购单信息")
@AutoLog(value = "生成采购单信息")
@AutoLog(value = "生成采购单信息",clientType="app")
@PostMapping(value = "/generatedPurchaseOrder")
public Result<List<CgdMainEntity>> generatedPurchaserder(@RequestBody List<CgdMainEntity> cgdMainList, HttpServletRequest req) {
List<CgdMainEntity> list = invoicingApi.generatedPurchaserder(cgdMainList);
@ -129,7 +129,7 @@ public class InvoicingApi {
@ApiOperation(value="审核采购单信息", notes="审核采购单信息")
@AutoLog(value = "审核采购单信息")
@AutoLog(value = "审核采购单信息",clientType="app")
@PostMapping(value = "/reviewPurchaseOrder")
public Result<String> reviewPurchaseOrder(CgdMainEntity cgdMainEntity, HttpServletRequest req) {
invoicingApi.reviewPurchaseOrder(cgdMainEntity);
@ -173,7 +173,7 @@ public class InvoicingApi {
@ApiOperation(value="修改库房启用停用", notes="修改库房启用停用")
@AutoLog(value = "修改库房启用停用")
@AutoLog(value = "修改库房启用停用",clientType="app")
@PostMapping(value = "/updateKfstatus")
public Result<String> updateKfstatus(@RequestBody NuBaseInfoEntity nuBaseInfoEntity) {
invoicingApi.updateKfstatus(nuBaseInfoEntity);
@ -197,7 +197,7 @@ public class InvoicingApi {
return Result.OK(info);
}
@AutoLog(value = "通过id删除请购信息")
@AutoLog(value = "通过id删除请购信息",clientType="app")
@ApiOperation(value="通过id删除请购信息", notes="通过id删除请购信息")
@DeleteMapping(value = "/deleteQgInfoById")
public Result<String> deleteQgInfoById(@RequestParam(name="id",required=true) String id) {
@ -205,7 +205,7 @@ public class InvoicingApi {
return Result.OK("删除成功!");
}
@AutoLog(value = "清空全部请购信息")
@AutoLog(value = "清空全部请购信息",clientType="app")
@ApiOperation(value="清空全部请购信息", notes="清空全部请购信息")
@DeleteMapping(value = "/emptiedQgInfo")
public Result<String> emptiedQgInfo() {
@ -214,7 +214,7 @@ public class InvoicingApi {
}
@ApiOperation(value="作废采购单信息", notes="作废采购单信息")
@AutoLog(value = "作废采购单信息")
@AutoLog(value = "作废采购单信息",clientType="app")
@PostMapping(value = "/voidedCgdMain")
public Result<String> voidedCgdMain(@RequestBody CgdMainEntity cgdMainEntity, HttpServletRequest req) {
String result = invoicingApi.voidedCgdMain(cgdMainEntity);
@ -225,7 +225,7 @@ public class InvoicingApi {
}
@ApiOperation(value="修改库房物料是否启用", notes="修改库房物料是否启用")
@AutoLog(value = "修改库房物料是否启用")
@AutoLog(value = "修改库房物料是否启用",clientType="app")
@PostMapping(value = "/updateWarehouserEnabled")
public Result<String> updateWarehouserEnabled(@RequestBody MaterialInfoEntity materialInfoEntity, HttpServletRequest req) {
invoicingApi.updateWarehouserEnabled(materialInfoEntity);
@ -307,7 +307,7 @@ public class InvoicingApi {
@ApiOperation(value="请购单-随行单-添加", notes="请购单-随行单-添加")
@AutoLog(value = "请购单-随行单-添加")
@AutoLog(value = "请购单-随行单-添加",clientType="app")
@PostMapping(value = "/addSxd")
public Result<String> addSxd(@RequestBody CgdSxdEntity cgdSxdEntityDto) {
if(StringUtils.isEmpty(cgdSxdEntityDto.getCgdId())){
@ -332,7 +332,7 @@ public class InvoicingApi {
}
@ApiOperation(value="库存预警添加全部物料", notes="库存预警添加全部物料")
@AutoLog(value = "库存预警添加全部物料")
@AutoLog(value = "库存预警添加全部物料",clientType="app")
@PostMapping(value = "/addWaringAll")
public Result<String> addWaringAll(@RequestBody CgdInfoEntity cgdInfoEntityDto) {
if(StringUtils.isEmpty(cgdInfoEntityDto.getNuId())){
@ -347,7 +347,7 @@ public class InvoicingApi {
}
@ApiOperation(value="拣货物料", notes="拣货物料")
@AutoLog(value = "拣货物料")
@AutoLog(value = "拣货物料",clientType="app")
@PostMapping(value = "/pickingInfo")
public Result<Map<String,Object>> pickingInfo(@RequestBody CgdInfoEntity cgdInfoEntityDto) {
Map<String,Object> result = invoicingApi.pickingInfo(cgdInfoEntityDto);

5
nursing-unit-base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java
View File

@ -2,6 +2,7 @@ package org.jeecg.common.aspect;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.PropertyFilter;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.ProceedingJoinPoint;
@ -80,6 +81,9 @@ public class AutoLogAspect {
//注解上的描述,操作日志内容
dto.setLogType(syslog.logType());
dto.setLogContent(content);
if(StringUtils.isNotBlank(syslog.clientType())){
dto.setClientType(syslog.clientType());
}
}
//请求的方法名
@ -109,6 +113,7 @@ public class AutoLogAspect {
//耗时
dto.setCostTime(time);
dto.setCreateTime(new Date());
//保存系统日志
baseCommonService.addLog(dto);
}

6
nursing-unit-base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoLog.java
View File

@ -43,4 +43,10 @@ public @interface AutoLog {
* @return
*/
ModuleType module() default ModuleType.COMMON;
/**
* 客户端类型
* @return
*/
String clientType() default "";
}