diff --git a/src/main/java/com/jsh/erp/constants/BusinessConstants.java b/src/main/java/com/jsh/erp/constants/BusinessConstants.java index 18b7a1ae..38d2279a 100644 --- a/src/main/java/com/jsh/erp/constants/BusinessConstants.java +++ b/src/main/java/com/jsh/erp/constants/BusinessConstants.java @@ -135,6 +135,57 @@ public class BusinessConstants { public static final byte USER_STATUS_NORMAL = 0; public static final byte USER_STATUS_DELETE = 1; public static final byte USER_STATUS_BANNED = 2; + /** + * 日志操作 + * 新增、修改、删除 + * */ + public static final String LOG_OPERATION_TYPE_ADD = "新增"; + public static final String LOG_OPERATION_TYPE_EDIT = "修改"; + public static final String LOG_OPERATION_TYPE_DELETE = "删除"; + /** + * 模块中文名称 + * 模块对应的标识 + * */ + public static final String LOG_MODULE_NAME_USER= "用户"; + public static final String LOG_INTERFACE_NAME_USER= "user"; + public static final String LOG_MODULE_NAME_ROLE= "角色"; + public static final String LOG_INTERFACE_NAME_ROLE= "role"; + public static final String LOG_MODULE_NAME_APP= "应用"; + public static final String LOG_INTERFACE_NAME_APP= "app"; + public static final String LOG_MODULE_NAME_DEPOT= "仓库"; + public static final String LOG_INTERFACE_NAME_DEPOT= "depot"; + public static final String LOG_MODULE_NAME_FUNCTIONS= "功能"; + public static final String LOG_INTERFACE_NAME_FUNCTIONS= "functions"; + public static final String LOG_MODULE_NAME_IN_OUT_ITEM= "收支项目"; + public static final String LOG_INTERFACE_NAME_IN_OUT_ITEM= "inOutItem"; + public static final String LOG_MODULE_NAME_UNIT= "计量单位"; + public static final String LOG_INTERFACE_NAME_UNIT= "unit"; + public static final String LOG_MODULE_NAME_PERSON= "经手人"; + public static final String LOG_INTERFACE_NAME_PERSON= "person"; + public static final String LOG_MODULE_NAME_USER_BUSINESS= "关联关系"; + public static final String LOG_INTERFACE_NAME_USER_BUSINESS= "userBusiness"; + public static final String LOG_MODULE_NAME_SYSTEM_CONFIG= "系统配置"; + public static final String LOG_INTERFACE_NAME_SYSTEM_CONFIG= "systemConfig"; + public static final String LOG_MODULE_NAME_MATERIAL_PROPERTY= "商品属性"; + public static final String LOG_INTERFACE_NAME_MATERIAL_PROPERTY= "materialProperty"; + public static final String LOG_MODULE_NAME_ACCOUNT= "账户"; + public static final String LOG_INTERFACE_NAME_ACCOUNT= "account"; + public static final String LOG_MODULE_NAME_SUPPLIER= "商家"; + public static final String LOG_INTERFACE_NAME_SUPPLIER= "supplier"; + public static final String LOG_MODULE_NAME_MATERIAL_CATEGORY= "商品类型"; + public static final String LOG_INTERFACE_NAME_MATERIAL_CATEGORY= "materialCategory"; + public static final String LOG_MODULE_NAME_MATERIAL= "商品"; + public static final String LOG_INTERFACE_NAME_MATERIAL= "material"; + public static final String LOG_MODULE_NAME_DEPOT_HEAD= "单据"; + public static final String LOG_INTERFACE_NAME_DEPOT_HEAD= "depotHead"; + public static final String LOG_MODULE_NAME_DEPOT_ITEM= "单据明细"; + public static final String LOG_INTERFACE_NAME_DEPOT_ITEM= "depotItem"; + public static final String LOG_MODULE_NAME_ACCOUNT_HEAD= "财务"; + public static final String LOG_INTERFACE_NAME_ACCOUNT_HEAD= "accountHead"; + public static final String LOG_MODULE_NAME_ACCOUNT_ITEM= "财务明细"; + public static final String LOG_INTERFACE_NAME_ACCOUNT_ITEM= "accountItem"; + public static final String LOG_MODULE_NAME_SERIAL_NUMBER= "序列号"; + public static final String LOG_INTERFACE_NAME_SERIAL_NUMBER= "serialNumber"; diff --git a/src/main/java/com/jsh/erp/service/log/LogService.java b/src/main/java/com/jsh/erp/service/log/LogService.java index c7fe433f..ddfaddd1 100644 --- a/src/main/java/com/jsh/erp/service/log/LogService.java +++ b/src/main/java/com/jsh/erp/service/log/LogService.java @@ -1,6 +1,7 @@ package com.jsh.erp.service.log; import com.alibaba.fastjson.JSONObject; +import com.jsh.erp.constants.BusinessConstants; import com.jsh.erp.datasource.entities.Log; import com.jsh.erp.datasource.entities.LogExample; import com.jsh.erp.datasource.entities.User; @@ -97,44 +98,46 @@ public class LogService { public String getModule(String apiName){ String moduleName = null; switch (apiName) { - case "user": - moduleName = "用户"; break; - case "role": - moduleName = "角色"; break; - case "app": - moduleName = "应用"; break; - case "depot": - moduleName = "仓库"; break; - case "functions": - moduleName = "功能"; break; - case "inOutItem": - moduleName = "收支项目"; break; - case "unit": - moduleName = "计量单位"; break; - case "person": - moduleName = "经手人"; break; - case "userBusiness": - moduleName = "关联关系"; break; - case "systemConfig": - moduleName = "系统配置"; break; - case "materialProperty": - moduleName = "商品属性"; break; - case "account": - moduleName = "账户"; break; - case "supplier": - moduleName = "商家"; break; - case "materialCategory": - moduleName = "商品类型"; break; - case "material": - moduleName = "商品"; break; - case "depotHead": - moduleName = "单据"; break; - case "depotItem": - moduleName = "单据明细"; break; - case "accountHead": - moduleName = "财务"; break; - case "accountItem": - moduleName = "财务明细"; break; + case BusinessConstants.LOG_INTERFACE_NAME_USER: + moduleName = BusinessConstants.LOG_MODULE_NAME_USER; break; + case BusinessConstants.LOG_INTERFACE_NAME_ROLE: + moduleName = BusinessConstants.LOG_MODULE_NAME_ROLE; break; + case BusinessConstants.LOG_INTERFACE_NAME_APP: + moduleName =BusinessConstants.LOG_MODULE_NAME_APP; break; + case BusinessConstants.LOG_INTERFACE_NAME_DEPOT: + moduleName = BusinessConstants.LOG_MODULE_NAME_DEPOT; break; + case BusinessConstants.LOG_INTERFACE_NAME_FUNCTIONS: + moduleName = BusinessConstants.LOG_MODULE_NAME_FUNCTIONS; break; + case BusinessConstants.LOG_INTERFACE_NAME_IN_OUT_ITEM: + moduleName = BusinessConstants.LOG_MODULE_NAME_IN_OUT_ITEM; break; + case BusinessConstants.LOG_INTERFACE_NAME_UNIT: + moduleName = BusinessConstants.LOG_MODULE_NAME_UNIT; break; + case BusinessConstants.LOG_INTERFACE_NAME_PERSON: + moduleName = BusinessConstants.LOG_MODULE_NAME_PERSON; break; + case BusinessConstants.LOG_INTERFACE_NAME_USER_BUSINESS: + moduleName = BusinessConstants.LOG_MODULE_NAME_USER_BUSINESS; break; + case BusinessConstants.LOG_INTERFACE_NAME_SYSTEM_CONFIG: + moduleName = BusinessConstants.LOG_MODULE_NAME_SYSTEM_CONFIG; break; + case BusinessConstants.LOG_INTERFACE_NAME_MATERIAL_PROPERTY: + moduleName = BusinessConstants.LOG_MODULE_NAME_MATERIAL_PROPERTY; break; + case BusinessConstants.LOG_INTERFACE_NAME_ACCOUNT: + moduleName = BusinessConstants.LOG_MODULE_NAME_ACCOUNT; break; + case BusinessConstants.LOG_INTERFACE_NAME_SUPPLIER: + moduleName = BusinessConstants.LOG_MODULE_NAME_SUPPLIER; break; + case BusinessConstants.LOG_INTERFACE_NAME_MATERIAL_CATEGORY: + moduleName = BusinessConstants.LOG_MODULE_NAME_MATERIAL_CATEGORY; break; + case BusinessConstants.LOG_INTERFACE_NAME_MATERIAL: + moduleName = BusinessConstants.LOG_MODULE_NAME_MATERIAL; break; + case BusinessConstants.LOG_INTERFACE_NAME_DEPOT_HEAD: + moduleName = BusinessConstants.LOG_MODULE_NAME_DEPOT_HEAD; break; + case BusinessConstants.LOG_INTERFACE_NAME_DEPOT_ITEM: + moduleName = BusinessConstants.LOG_MODULE_NAME_DEPOT_ITEM; break; + case BusinessConstants.LOG_INTERFACE_NAME_ACCOUNT_HEAD: + moduleName = BusinessConstants.LOG_MODULE_NAME_ACCOUNT_HEAD; break; + case BusinessConstants.LOG_INTERFACE_NAME_ACCOUNT_ITEM: + moduleName = BusinessConstants.LOG_MODULE_NAME_ACCOUNT_ITEM; break; + case BusinessConstants.LOG_INTERFACE_NAME_SERIAL_NUMBER: + moduleName = BusinessConstants.LOG_MODULE_NAME_SERIAL_NUMBER; break; } return moduleName; } diff --git a/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java b/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java index adfd97e7..9a16437e 100644 --- a/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java +++ b/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java @@ -7,6 +7,7 @@ import com.jsh.erp.datasource.entities.*; import com.jsh.erp.datasource.mappers.*; import com.jsh.erp.exception.BusinessRunTimeException; import com.jsh.erp.service.depotItem.DepotItemService; +import com.jsh.erp.service.log.LogService; import com.jsh.erp.service.material.MaterialService; import com.jsh.erp.service.user.UserService; import com.jsh.erp.utils.StringUtil; @@ -45,6 +46,8 @@ public class SerialNumberService { private UserService userService; @Resource private DepotItemMapperEx depotItemMapperEx; + @Resource + private LogService logService; public SerialNumber getSerialNumber(long id) { @@ -68,6 +71,7 @@ public class SerialNumberService { @Transactional(value = "transactionManager", rollbackFor = Exception.class) public int insertSerialNumber(String beanJson, HttpServletRequest request) { SerialNumber serialNumber = JSONObject.parseObject(beanJson, SerialNumber.class); + logService.insertLog(BusinessConstants.LOG_INTERFACE_NAME_SERIAL_NUMBER, BusinessConstants.LOG_OPERATION_TYPE_ADD, request); return serialNumberMapper.insertSelective(serialNumber); }