purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改日志记录功能

Browse Source
This commit is contained in:
qiankunpingtai
2019-03-21 17:09:18 +08:00
parent c1b7a36ccf
commit f151208981
3 changed files with 96 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/main/java/com/jsh/erp/constants/BusinessConstants.java
View File

@@ -135,6 +135,57 @@ public class BusinessConstants {
public static final byte USER_STATUS_NORMAL = 0; public static final byte USER_STATUS_NORMAL = 0;
public static final byte USER_STATUS_DELETE = 1; public static final byte USER_STATUS_DELETE = 1;
public static final byte USER_STATUS_BANNED = 2; 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";

79
src/main/java/com/jsh/erp/service/log/LogService.java
View File

@@ -1,6 +1,7 @@
package com.jsh.erp.service.log; package com.jsh.erp.service.log;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.jsh.erp.constants.BusinessConstants;
import com.jsh.erp.datasource.entities.Log; import com.jsh.erp.datasource.entities.Log;
import com.jsh.erp.datasource.entities.LogExample; import com.jsh.erp.datasource.entities.LogExample;
import com.jsh.erp.datasource.entities.User; import com.jsh.erp.datasource.entities.User;
@@ -97,44 +98,46 @@ public class LogService {
public String getModule(String apiName){ public String getModule(String apiName){
String moduleName = null; String moduleName = null;
switch (apiName) { switch (apiName) {
case "user": case BusinessConstants.LOG_INTERFACE_NAME_USER:
moduleName = "用户"; break; moduleName = BusinessConstants.LOG_MODULE_NAME_USER; break;
case "role": case BusinessConstants.LOG_INTERFACE_NAME_ROLE:
moduleName = "角色"; break; moduleName = BusinessConstants.LOG_MODULE_NAME_ROLE; break;
case "app": case BusinessConstants.LOG_INTERFACE_NAME_APP:
moduleName = "应用"; break; moduleName =BusinessConstants.LOG_MODULE_NAME_APP; break;
case "depot": case BusinessConstants.LOG_INTERFACE_NAME_DEPOT:
moduleName = "仓库"; break; moduleName = BusinessConstants.LOG_MODULE_NAME_DEPOT; break;
case "functions": case BusinessConstants.LOG_INTERFACE_NAME_FUNCTIONS:
moduleName = "功能"; break; moduleName = BusinessConstants.LOG_MODULE_NAME_FUNCTIONS; break;
case "inOutItem": case BusinessConstants.LOG_INTERFACE_NAME_IN_OUT_ITEM:
moduleName = "收支项目"; break; moduleName = BusinessConstants.LOG_MODULE_NAME_IN_OUT_ITEM; break;
case "unit": case BusinessConstants.LOG_INTERFACE_NAME_UNIT:
moduleName = "计量单位"; break; moduleName = BusinessConstants.LOG_MODULE_NAME_UNIT; break;
case "person": case BusinessConstants.LOG_INTERFACE_NAME_PERSON:
moduleName = "经手人"; break; moduleName = BusinessConstants.LOG_MODULE_NAME_PERSON; break;
case "userBusiness": case BusinessConstants.LOG_INTERFACE_NAME_USER_BUSINESS:
moduleName = "关联关系"; break; moduleName = BusinessConstants.LOG_MODULE_NAME_USER_BUSINESS; break;
case "systemConfig": case BusinessConstants.LOG_INTERFACE_NAME_SYSTEM_CONFIG:
moduleName = "系统配置"; break; moduleName = BusinessConstants.LOG_MODULE_NAME_SYSTEM_CONFIG; break;
case "materialProperty": case BusinessConstants.LOG_INTERFACE_NAME_MATERIAL_PROPERTY:
moduleName = "商品属性"; break; moduleName = BusinessConstants.LOG_MODULE_NAME_MATERIAL_PROPERTY; break;
case "account": case BusinessConstants.LOG_INTERFACE_NAME_ACCOUNT:
moduleName = "账户"; break; moduleName = BusinessConstants.LOG_MODULE_NAME_ACCOUNT; break;
case "supplier": case BusinessConstants.LOG_INTERFACE_NAME_SUPPLIER:
moduleName = "商家"; break; moduleName = BusinessConstants.LOG_MODULE_NAME_SUPPLIER; break;
case "materialCategory": case BusinessConstants.LOG_INTERFACE_NAME_MATERIAL_CATEGORY:
moduleName = "商品类型"; break; moduleName = BusinessConstants.LOG_MODULE_NAME_MATERIAL_CATEGORY; break;
case "material": case BusinessConstants.LOG_INTERFACE_NAME_MATERIAL:
moduleName = "商品"; break; moduleName = BusinessConstants.LOG_MODULE_NAME_MATERIAL; break;
case "depotHead": case BusinessConstants.LOG_INTERFACE_NAME_DEPOT_HEAD:
moduleName = "单据"; break; moduleName = BusinessConstants.LOG_MODULE_NAME_DEPOT_HEAD; break;
case "depotItem": case BusinessConstants.LOG_INTERFACE_NAME_DEPOT_ITEM:
moduleName = "单据明细"; break; moduleName = BusinessConstants.LOG_MODULE_NAME_DEPOT_ITEM; break;
case "accountHead": case BusinessConstants.LOG_INTERFACE_NAME_ACCOUNT_HEAD:
moduleName = "财务"; break; moduleName = BusinessConstants.LOG_MODULE_NAME_ACCOUNT_HEAD; break;
case "accountItem": case BusinessConstants.LOG_INTERFACE_NAME_ACCOUNT_ITEM:
moduleName = "财务明细"; break; 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; return moduleName;
} }

4
src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java
View File

@@ -7,6 +7,7 @@ import com.jsh.erp.datasource.entities.*;
import com.jsh.erp.datasource.mappers.*; import com.jsh.erp.datasource.mappers.*;
import com.jsh.erp.exception.BusinessRunTimeException; import com.jsh.erp.exception.BusinessRunTimeException;
import com.jsh.erp.service.depotItem.DepotItemService; 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.material.MaterialService;
import com.jsh.erp.service.user.UserService; import com.jsh.erp.service.user.UserService;
import com.jsh.erp.utils.StringUtil; import com.jsh.erp.utils.StringUtil;
@@ -45,6 +46,8 @@ public class SerialNumberService {
private UserService userService; private UserService userService;
@Resource @Resource
private DepotItemMapperEx depotItemMapperEx; private DepotItemMapperEx depotItemMapperEx;
@Resource
private LogService logService;
public SerialNumber getSerialNumber(long id) { public SerialNumber getSerialNumber(long id) {
@@ -68,6 +71,7 @@ public class SerialNumberService {
@Transactional(value = "transactionManager", rollbackFor = Exception.class) @Transactional(value = "transactionManager", rollbackFor = Exception.class)
public int insertSerialNumber(String beanJson, HttpServletRequest request) { public int insertSerialNumber(String beanJson, HttpServletRequest request) {
SerialNumber serialNumber = JSONObject.parseObject(beanJson, SerialNumber.class); 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); return serialNumberMapper.insertSelective(serialNumber);
} }