优化日志的记录

src/main/java/com/jsh/erp/service/inOutItem/InOutItemService.java

@@ -89,6 +89,7 @@ public class InOutItemService {
         int result=0;
         try{
             result=inOutItemMapper.insertSelective(depot);
+            logService.insertLog("收支项目", BusinessConstants.LOG_OPERATION_TYPE_ADD, request);
         }catch(Exception e){
             JshException.writeFail(logger, e);
         }
@@ -96,12 +97,14 @@ public class InOutItemService {
     }
 
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int updateInOutItem(String beanJson, Long id)throws Exception {
+    public int updateInOutItem(String beanJson, Long id, HttpServletRequest request)throws Exception {
         InOutItem depot = JSONObject.parseObject(beanJson, InOutItem.class);
         depot.setId(id);
         int result=0;
         try{
             result=inOutItemMapper.updateByPrimaryKeySelective(depot);
+            logService.insertLog("收支项目",
+                    new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(id).toString(), request);
         }catch(Exception e){
             JshException.writeFail(logger, e);
         }
@@ -109,10 +112,12 @@ public class InOutItemService {
     }
 
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int deleteInOutItem(Long id)throws Exception {
+    public int deleteInOutItem(Long id, HttpServletRequest request)throws Exception {
         int result=0;
         try{
             result=inOutItemMapper.deleteByPrimaryKey(id);
+            logService.insertLog("收支项目",
+                    new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_DELETE).append(id).toString(), request);
         }catch(Exception e){
             JshException.writeFail(logger, e);
         }
@@ -120,13 +125,14 @@ public class InOutItemService {
     }
 
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int batchDeleteInOutItem(String ids)throws Exception {
+    public int batchDeleteInOutItem(String ids, HttpServletRequest request)throws Exception {
         List<Long> idList = StringUtil.strToLongList(ids);
         InOutItemExample example = new InOutItemExample();
         example.createCriteria().andIdIn(idList);
         int result=0;
         try{
             result=inOutItemMapper.deleteByExample(example);
+            logService.insertLog("收支项目", "批量删除,id集:" + ids, request);
         }catch(Exception e){
             JshException.writeFail(logger, e);
         }
@@ -164,7 +170,7 @@ public class InOutItemService {
     }
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
     public int batchDeleteInOutItemByIds(String ids)throws Exception {
-        logService.insertLog(BusinessConstants.LOG_INTERFACE_NAME_IN_OUT_ITEM,
+        logService.insertLog("收支项目",
                 new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_DELETE).append(ids).toString(),
                 ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
         User userInfo=userService.getCurrentUser();

src/main/java/com/jsh/erp/service/log/LogComponent.java

@@ -61,18 +61,18 @@ public class LogComponent implements ICommonQuery {
     }
 
     @Override
-    public int update(String beanJson, Long id)throws Exception {
-        return logService.updateLog(beanJson, id);
+    public int update(String beanJson, Long id, HttpServletRequest request)throws Exception {
+        return logService.updateLog(beanJson, id, request);
     }
 
     @Override
-    public int delete(Long id)throws Exception {
-        return logService.deleteLog(id);
+    public int delete(Long id, HttpServletRequest request)throws Exception {
+        return logService.deleteLog(id, request);
     }
 
     @Override
-    public int batchDelete(String ids)throws Exception {
-        return logService.batchDeleteLog(ids);
+    public int batchDelete(String ids, HttpServletRequest request)throws Exception {
+        return logService.batchDeleteLog(ids, request);
     }
 
     @Override

src/main/java/com/jsh/erp/service/log/LogService.java

@@ -96,7 +96,7 @@ public class LogService {
     }
 
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int updateLog(String beanJson, Long id)throws Exception {
+    public int updateLog(String beanJson, Long id, HttpServletRequest request)throws Exception {
         Log log = JSONObject.parseObject(beanJson, Log.class);
         log.setId(id);
         int result=0;
@@ -109,7 +109,7 @@ public class LogService {
     }
 
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int deleteLog(Long id)throws Exception {
+    public int deleteLog(Long id, HttpServletRequest request)throws Exception {
         int result=0;
         try{
             result=logMapper.deleteByPrimaryKey(id);
@@ -120,7 +120,7 @@ public class LogService {
     }
 
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int batchDeleteLog(String ids)throws Exception {
+    public int batchDeleteLog(String ids, HttpServletRequest request)throws Exception {
         List<Long> idList = StringUtil.strToLongList(ids);
         LogExample example = new LogExample();
         example.createCriteria().andIdIn(idList);
@@ -148,64 +148,15 @@ public class LogService {
         }
     }
 
-    public String getModule(String apiName)throws Exception{
-        String moduleName = null;
-        switch (apiName) {
-            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;
-            case BusinessConstants.LOG_INTERFACE_NAME_ORGANIZATION:
-                moduleName = BusinessConstants.LOG_MODULE_NAME_ORGANIZATION; break;
-        }
-        return moduleName;
-    }
-
-    public void insertLog(String apiName, String type, HttpServletRequest request)throws Exception{
+    public void insertLog(String moduleName, String type, HttpServletRequest request)throws Exception{
         Log log = new Log();
         log.setUserid(getUserId(request));
-        log.setOperation(getModule(apiName));
+        log.setOperation(moduleName);
         log.setClientip(getLocalIp(request));
         log.setCreatetime(new Date());
         Byte status = 0;
         log.setStatus(status);
-        log.setContentdetails(type + getModule(apiName));
+        log.setContentdetails(type + moduleName);
         try{
             logMapper.insertSelective(log);
         }catch(Exception e){

src/main/java/com/jsh/erp/service/material/MaterialComponent.java

@@ -56,18 +56,18 @@ public class MaterialComponent implements ICommonQuery {
     }
 
     @Override
-    public int update(String beanJson, Long id)throws Exception {
-        return materialService.updateMaterial(beanJson, id);
+    public int update(String beanJson, Long id, HttpServletRequest request)throws Exception {
+        return materialService.updateMaterial(beanJson, id, request);
     }
 
     @Override
-    public int delete(Long id)throws Exception {
-        return materialService.deleteMaterial(id);
+    public int delete(Long id, HttpServletRequest request)throws Exception {
+        return materialService.deleteMaterial(id, request);
     }
 
     @Override
-    public int batchDelete(String ids)throws Exception {
-        return materialService.batchDeleteMaterial(ids);
+    public int batchDelete(String ids, HttpServletRequest request)throws Exception {
+        return materialService.batchDeleteMaterial(ids, request);
     }
 
     @Override

src/main/java/com/jsh/erp/service/material/MaterialService.java

@@ -125,6 +125,7 @@ public class MaterialService {
         int result =0;
         try{
             result= materialMapper.insertSelective(material);
+            logService.insertLog("商品", BusinessConstants.LOG_OPERATION_TYPE_ADD, request);
         }catch(Exception e){
             JshException.writeFail(logger, e);
         }
@@ -132,7 +133,7 @@ public class MaterialService {
     }
 
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int updateMaterial(String beanJson, Long id) throws Exception{
+    public int updateMaterial(String beanJson, Long id, HttpServletRequest request) throws Exception{
         Material material = JSONObject.parseObject(beanJson, Material.class);
         material.setId(id);
         int res =0;
@@ -144,6 +145,8 @@ public class MaterialService {
             } else {
                 materialMapperEx.updateUnitIdNullByPrimaryKey(id); //将多单位置空
             }
+            logService.insertLog("商品",
+                    new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(id).toString(), request);
         }catch(Exception e){
             JshException.writeFail(logger, e);
         }
@@ -152,10 +155,12 @@ public class MaterialService {
     }
 
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int deleteMaterial(Long id)throws Exception {
+    public int deleteMaterial(Long id, HttpServletRequest request)throws Exception {
         int result =0;
         try{
             result= materialMapper.deleteByPrimaryKey(id);
+            logService.insertLog("商品",
+                    new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_DELETE).append(id).toString(), request);
         }catch(Exception e){
             JshException.writeFail(logger, e);
         }
@@ -163,13 +168,14 @@ public class MaterialService {
     }
 
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int batchDeleteMaterial(String ids)throws Exception {
+    public int batchDeleteMaterial(String ids, HttpServletRequest request)throws Exception {
         List<Long> idList = StringUtil.strToLongList(ids);
         MaterialExample example = new MaterialExample();
         example.createCriteria().andIdIn(idList);
         int result =0;
         try{
             result= materialMapper.deleteByExample(example);
+            logService.insertLog("商品", "批量删除,id集:" + ids, request);
         }catch(Exception e){
             JshException.writeFail(logger, e);
         }
@@ -215,7 +221,7 @@ public class MaterialService {
 
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
     public int batchSetEnable(Boolean enabled, String materialIDs)throws Exception {
-        logService.insertLog(BusinessConstants.LOG_INTERFACE_NAME_MATERIAL,
+        logService.insertLog("商品",
                 new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(materialIDs).toString(),
                 ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
         List<Long> ids = StringUtil.strToLongList(materialIDs);
@@ -292,7 +298,7 @@ public class MaterialService {
     }
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
     public BaseResponseInfo importExcel(List<Material> mList) throws Exception {
-        logService.insertLog(BusinessConstants.LOG_INTERFACE_NAME_MATERIAL,
+        logService.insertLog("商品",
                 new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_IMPORT).append(mList.size()).append(BusinessConstants.LOG_DATA_UNIT).toString(),
                 ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
         BaseResponseInfo info = new BaseResponseInfo();
@@ -324,7 +330,7 @@ public class MaterialService {
     }
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
     public int batchDeleteMaterialByIds(String ids) throws Exception{
-        logService.insertLog(BusinessConstants.LOG_INTERFACE_NAME_MATERIAL,
+        logService.insertLog("商品",
                 new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_DELETE).append(ids).toString(),
                 ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
         User userInfo=userService.getCurrentUser();

src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryComponent.java

@@ -52,18 +52,18 @@ public class MaterialCategoryComponent implements ICommonQuery {
     }
 
     @Override
-    public int update(String beanJson, Long id)throws Exception {
-        return materialCategoryService.updateMaterialCategory(beanJson, id);
+    public int update(String beanJson, Long id, HttpServletRequest request)throws Exception {
+        return materialCategoryService.updateMaterialCategory(beanJson, id, request);
     }
 
     @Override
-    public int delete(Long id)throws Exception {
-        return materialCategoryService.deleteMaterialCategory(id);
+    public int delete(Long id, HttpServletRequest request)throws Exception {
+        return materialCategoryService.deleteMaterialCategory(id, request);
     }
 
     @Override
-    public int batchDelete(String ids)throws Exception {
-        return materialCategoryService.batchDeleteMaterialCategory(ids);
+    public int batchDelete(String ids, HttpServletRequest request)throws Exception {
+        return materialCategoryService.batchDeleteMaterialCategory(ids, request);
     }
 
     @Override

src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryService.java

@@ -118,6 +118,7 @@ public class MaterialCategoryService {
         int result=0;
         try{
             result=materialCategoryMapper.insertSelective(materialCategory);
+            logService.insertLog("商品类型", BusinessConstants.LOG_OPERATION_TYPE_ADD, request);
         }catch(Exception e){
             JshException.writeFail(logger, e);
         }
@@ -125,12 +126,14 @@ public class MaterialCategoryService {
     }
 
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int updateMaterialCategory(String beanJson, Long id) throws Exception{
+    public int updateMaterialCategory(String beanJson, Long id, HttpServletRequest request) throws Exception{
         MaterialCategory materialCategory = JSONObject.parseObject(beanJson, MaterialCategory.class);
         materialCategory.setId(id);
         int result=0;
         try{
             result=materialCategoryMapper.updateByPrimaryKeySelective(materialCategory);
+            logService.insertLog("商品类型",
+                    new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(id).toString(), request);
         }catch(Exception e){
             JshException.writeFail(logger, e);
         }
@@ -138,10 +141,12 @@ public class MaterialCategoryService {
     }
 
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int deleteMaterialCategory(Long id)throws Exception {
+    public int deleteMaterialCategory(Long id, HttpServletRequest request)throws Exception {
         int result=0;
         try{
             result=materialCategoryMapper.deleteByPrimaryKey(id);
+            logService.insertLog("商品类型",
+                    new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_DELETE).append(id).toString(), request);
         }catch(Exception e){
             JshException.writeFail(logger, e);
         }
@@ -149,13 +154,14 @@ public class MaterialCategoryService {
     }
 
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int batchDeleteMaterialCategory(String ids)throws Exception {
+    public int batchDeleteMaterialCategory(String ids, HttpServletRequest request)throws Exception {
         List<Long> idList = StringUtil.strToLongList(ids);
         MaterialCategoryExample example = new MaterialCategoryExample();
         example.createCriteria().andIdIn(idList);
         int result=0;
         try{
             result=materialCategoryMapper.deleteByExample(example);
+            logService.insertLog("商品类型", "批量删除,id集:" + ids, request);
         }catch(Exception e){
             JshException.writeFail(logger, e);
         }
@@ -204,7 +210,7 @@ public class MaterialCategoryService {
      */
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
     public int addMaterialCategory(MaterialCategory mc) throws Exception {
-        logService.insertLog(BusinessConstants.LOG_INTERFACE_NAME_MATERIAL_CATEGORY,
+        logService.insertLog("商品类型",
                 BusinessConstants.LOG_OPERATION_TYPE_ADD,
                 ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
         if(mc==null){
@@ -238,7 +244,7 @@ public class MaterialCategoryService {
     }
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
     public int batchDeleteMaterialCategoryByIds(String ids) throws Exception {
-        logService.insertLog(BusinessConstants.LOG_INTERFACE_NAME_MATERIAL_CATEGORY,
+        logService.insertLog("商品类型",
                 new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_DELETE).append(ids).toString(),
                 ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
         //更新时间
@@ -260,7 +266,7 @@ public class MaterialCategoryService {
     }
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
     public int editMaterialCategory(MaterialCategory mc) throws Exception{
-        logService.insertLog(BusinessConstants.LOG_INTERFACE_NAME_MATERIAL_CATEGORY,
+        logService.insertLog("商品类型",
                 new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(mc.getId()).toString(),
                 ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
         if(mc.getParentid()==null){

src/main/java/com/jsh/erp/service/materialProperty/MaterialPropertyComponent.java

@@ -48,18 +48,18 @@ public class MaterialPropertyComponent implements ICommonQuery {
     }
 
     @Override
-    public int update(String beanJson, Long id)throws Exception {
-        return materialPropertyService.updateMaterialProperty(beanJson, id);
+    public int update(String beanJson, Long id, HttpServletRequest request)throws Exception {
+        return materialPropertyService.updateMaterialProperty(beanJson, id, request);
     }
 
     @Override
-    public int delete(Long id)throws Exception {
-        return materialPropertyService.deleteMaterialProperty(id);
+    public int delete(Long id, HttpServletRequest request)throws Exception {
+        return materialPropertyService.deleteMaterialProperty(id, request);
     }
 
     @Override
-    public int batchDelete(String ids)throws Exception {
-        return materialPropertyService.batchDeleteMaterialProperty(ids);
+    public int batchDelete(String ids, HttpServletRequest request)throws Exception {
+        return materialPropertyService.batchDeleteMaterialProperty(ids, request);
     }
 
     @Override

src/main/java/com/jsh/erp/service/materialProperty/MaterialPropertyService.java

@@ -87,6 +87,7 @@ public class MaterialPropertyService {
         int  result=0;
         try{
             result=materialPropertyMapper.insertSelective(materialProperty);
+            logService.insertLog("商品属性", BusinessConstants.LOG_OPERATION_TYPE_ADD, request);
         }catch(Exception e){
             JshException.writeFail(logger, e);
         }
@@ -94,12 +95,14 @@ public class MaterialPropertyService {
     }
 
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int updateMaterialProperty(String beanJson, Long id)throws Exception {
+    public int updateMaterialProperty(String beanJson, Long id, HttpServletRequest request)throws Exception {
         MaterialProperty materialProperty = JSONObject.parseObject(beanJson, MaterialProperty.class);
         materialProperty.setId(id);
         int  result=0;
         try{
             result=materialPropertyMapper.updateByPrimaryKeySelective(materialProperty);
+            logService.insertLog("商品属性",
+                    new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(id).toString(), request);
         }catch(Exception e){
             JshException.writeFail(logger, e);
         }
@@ -107,10 +110,12 @@ public class MaterialPropertyService {
     }
 
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int deleteMaterialProperty(Long id)throws Exception {
+    public int deleteMaterialProperty(Long id, HttpServletRequest request)throws Exception {
         int  result=0;
         try{
             result=materialPropertyMapper.deleteByPrimaryKey(id);
+            logService.insertLog("商品属性",
+                    new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_DELETE).append(id).toString(), request);
         }catch(Exception e){
             JshException.writeFail(logger, e);
         }
@@ -118,13 +123,14 @@ public class MaterialPropertyService {
     }
 
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int batchDeleteMaterialProperty(String ids)throws Exception {
+    public int batchDeleteMaterialProperty(String ids, HttpServletRequest request)throws Exception {
         List<Long> idList = StringUtil.strToLongList(ids);
         MaterialPropertyExample example = new MaterialPropertyExample();
         example.createCriteria().andIdIn(idList);
         int  result=0;
         try{
             result=materialPropertyMapper.deleteByExample(example);
+            logService.insertLog("商品属性", "批量删除,id集:" + ids, request);
         }catch(Exception e){
             JshException.writeFail(logger, e);
         }
@@ -136,7 +142,7 @@ public class MaterialPropertyService {
     }
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
     public int batchDeleteMaterialPropertyByIds(String ids) throws Exception{
-        logService.insertLog(BusinessConstants.LOG_INTERFACE_NAME_MATERIAL_PROPERTY,
+        logService.insertLog("商品属性",
                 new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_DELETE).append(ids).toString(),
                 ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
         User userInfo=userService.getCurrentUser();

src/main/java/com/jsh/erp/service/msg/MsgComponent.java

@@ -49,18 +49,18 @@ public class MsgComponent implements ICommonQuery {
     }
 
     @Override
-    public int update(String beanJson, Long id)throws Exception {
-        return msgService.updateMsg(beanJson, id);
+    public int update(String beanJson, Long id, HttpServletRequest request)throws Exception {
+        return msgService.updateMsg(beanJson, id, request);
     }
 
     @Override
-    public int delete(Long id)throws Exception {
-        return msgService.deleteMsg(id);
+    public int delete(Long id, HttpServletRequest request)throws Exception {
+        return msgService.deleteMsg(id, request);
     }
 
     @Override
-    public int batchDelete(String ids)throws Exception {
-        return msgService.batchDeleteMsg(ids);
+    public int batchDelete(String ids, HttpServletRequest request)throws Exception {
+        return msgService.batchDeleteMsg(ids, request);
     }
 
     @Override

src/main/java/com/jsh/erp/service/msg/MsgService.java

@@ -97,6 +97,7 @@ public class MsgService {
         int result=0;
         try{
             result=msgMapper.insertSelective(msg);
+            logService.insertLog("消息", BusinessConstants.LOG_OPERATION_TYPE_ADD, request);
         }catch(Exception e){
             logger.error("异常码[{}],异常提示[{}],异常[{}]",
                     ExceptionConstants.DATA_WRITE_FAIL_CODE, ExceptionConstants.DATA_WRITE_FAIL_MSG,e);
@@ -107,12 +108,14 @@ public class MsgService {
     }
 
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int updateMsg(String beanJson, Long id) throws Exception{
+    public int updateMsg(String beanJson, Long id, HttpServletRequest request) throws Exception{
         Msg msg = JSONObject.parseObject(beanJson, Msg.class);
         msg.setId(id);
         int result=0;
         try{
             result=msgMapper.updateByPrimaryKeySelective(msg);
+            logService.insertLog("消息",
+                    new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(id).toString(), request);
         }catch(Exception e){
             logger.error("异常码[{}],异常提示[{}],异常[{}]",
                     ExceptionConstants.DATA_WRITE_FAIL_CODE, ExceptionConstants.DATA_WRITE_FAIL_MSG,e);
@@ -123,10 +126,12 @@ public class MsgService {
     }
 
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int deleteMsg(Long id)throws Exception {
+    public int deleteMsg(Long id, HttpServletRequest request)throws Exception {
         int result=0;
         try{
             result=msgMapper.deleteByPrimaryKey(id);
+            logService.insertLog("消息",
+                    new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_DELETE).append(id).toString(), request);
         }catch(Exception e){
             logger.error("异常码[{}],异常提示[{}],异常[{}]",
                     ExceptionConstants.DATA_WRITE_FAIL_CODE, ExceptionConstants.DATA_WRITE_FAIL_MSG,e);
@@ -137,13 +142,14 @@ public class MsgService {
     }
 
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int batchDeleteMsg(String ids) throws Exception{
+    public int batchDeleteMsg(String ids, HttpServletRequest request) throws Exception{
         List<Long> idList = StringUtil.strToLongList(ids);
         MsgExample example = new MsgExample();
         example.createCriteria().andIdIn(idList);
         int result=0;
         try{
             result=msgMapper.deleteByExample(example);
+            logService.insertLog("消息", "批量删除,id集:" + ids, request);
         }catch(Exception e){
             logger.error("异常码[{}],异常提示[{}],异常[{}]",
                     ExceptionConstants.DATA_WRITE_FAIL_CODE, ExceptionConstants.DATA_WRITE_FAIL_MSG,e);
@@ -179,7 +185,7 @@ public class MsgService {
      */
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
     public int batchDeleteMsgByIds(String ids) throws Exception{
-        logService.insertLog(BusinessConstants.LOG_INTERFACE_NAME_SERIAL_NUMBER,
+        logService.insertLog("序列号",
                 new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_DELETE).append(ids).toString(),
                 ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
         String [] idArray=ids.split(",");

src/main/java/com/jsh/erp/service/orgaUserRel/OrgaUserRelComponent.java

@@ -45,18 +45,18 @@ public class OrgaUserRelComponent implements ICommonQuery {
     }
 
     @Override
-    public int update(String beanJson, Long id)throws Exception {
-        return orgaUserRelService.updateOrgaUserRel(beanJson,id);
+    public int update(String beanJson, Long id, HttpServletRequest request)throws Exception {
+        return orgaUserRelService.updateOrgaUserRel(beanJson,id, request);
     }
 
     @Override
-    public int delete(Long id)throws Exception {
-        return orgaUserRelService.deleteOrgaUserRel(id);
+    public int delete(Long id, HttpServletRequest request)throws Exception {
+        return orgaUserRelService.deleteOrgaUserRel(id, request);
     }
 
     @Override
-    public int batchDelete(String ids)throws Exception {
-        return orgaUserRelService.batchDeleteOrgaUserRel(ids);
+    public int batchDelete(String ids, HttpServletRequest request)throws Exception {
+        return orgaUserRelService.batchDeleteOrgaUserRel(ids, request);
     }
 
     @Override

src/main/java/com/jsh/erp/service/orgaUserRel/OrgaUserRelService.java

@@ -53,41 +53,47 @@ public class OrgaUserRelService {
         int result=0;
         try{
             result=orgaUserRelMapper.insertSelective(orgaUserRel);
+            logService.insertLog("用户与机构关系", BusinessConstants.LOG_OPERATION_TYPE_ADD, request);
         }catch(Exception e){
             JshException.writeFail(logger, e);
         }
         return result;
     }
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int updateOrgaUserRel(String beanJson, Long id) throws Exception{
+    public int updateOrgaUserRel(String beanJson, Long id, HttpServletRequest request) throws Exception{
         OrgaUserRel orgaUserRel = JSONObject.parseObject(beanJson, OrgaUserRel.class);
         orgaUserRel.setId(id);
         int result=0;
         try{
             result=orgaUserRelMapper.updateByPrimaryKeySelective(orgaUserRel);
+            logService.insertLog("用户与机构关系",
+                    new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(id).toString(), request);
         }catch(Exception e){
             JshException.writeFail(logger, e);
         }
         return result;
     }
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int deleteOrgaUserRel(Long id)throws Exception {
+    public int deleteOrgaUserRel(Long id, HttpServletRequest request)throws Exception {
         int result=0;
         try{
             result=orgaUserRelMapper.deleteByPrimaryKey(id);
+            logService.insertLog("用户与机构关系",
+                    new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_DELETE).append(id).toString(), request);
         }catch(Exception e){
             JshException.writeFail(logger, e);
         }
         return result;
     }
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int batchDeleteOrgaUserRel(String ids)throws Exception {
+    public int batchDeleteOrgaUserRel(String ids, HttpServletRequest request)throws Exception {
         List<Long> idList = StringUtil.strToLongList(ids);
         OrgaUserRelExample example = new OrgaUserRelExample();
         example.createCriteria().andIdIn(idList);
         int result=0;
         try{
             result=orgaUserRelMapper.deleteByExample(example);
+            logService.insertLog("用户与机构关系", "批量删除,id集:" + ids, request);
         }catch(Exception e){
             JshException.writeFail(logger, e);
         }

src/main/java/com/jsh/erp/service/organization/OrganizationComponent.java

@@ -46,18 +46,18 @@ public class OrganizationComponent implements ICommonQuery {
     }
 
     @Override
-    public int update(String beanJson, Long id)throws Exception {
-        return organizationService.updateOrganization(beanJson,id);
+    public int update(String beanJson, Long id, HttpServletRequest request)throws Exception {
+        return organizationService.updateOrganization(beanJson,id, request);
     }
 
     @Override
-    public int delete(Long id)throws Exception {
-        return organizationService.deleteOrganization(id);
+    public int delete(Long id, HttpServletRequest request)throws Exception {
+        return organizationService.deleteOrganization(id, request);
     }
 
     @Override
-    public int batchDelete(String ids)throws Exception {
-        return organizationService.batchDeleteOrganization(ids);
+    public int batchDelete(String ids, HttpServletRequest request)throws Exception {
+        return organizationService.batchDeleteOrganization(ids, request);
     }
 
     @Override

src/main/java/com/jsh/erp/service/organization/OrganizationService.java

@@ -56,41 +56,47 @@ public class OrganizationService {
         int result=0;
         try{
             result=organizationMapper.insertSelective(organization);
+            logService.insertLog("机构", BusinessConstants.LOG_OPERATION_TYPE_ADD, request);
         }catch(Exception e){
             JshException.writeFail(logger, e);
         }
         return result;
     }
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int updateOrganization(String beanJson, Long id)throws Exception {
+    public int updateOrganization(String beanJson, Long id, HttpServletRequest request)throws Exception {
         Organization organization = JSONObject.parseObject(beanJson, Organization.class);
         organization.setId(id);
         int result=0;
         try{
             result=organizationMapper.updateByPrimaryKeySelective(organization);
+            logService.insertLog("机构",
+                    new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(id).toString(), request);
         }catch(Exception e){
             JshException.writeFail(logger, e);
         }
         return result;
     }
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int deleteOrganization(Long id)throws Exception {
+    public int deleteOrganization(Long id, HttpServletRequest request)throws Exception {
         int result=0;
         try{
             result=organizationMapper.deleteByPrimaryKey(id);
+            logService.insertLog("机构",
+                    new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_DELETE).append(id).toString(), request);
         }catch(Exception e){
             JshException.writeFail(logger, e);
         }
         return result;
     }
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int batchDeleteOrganization(String ids)throws Exception {
+    public int batchDeleteOrganization(String ids, HttpServletRequest request)throws Exception {
         List<Long> idList = StringUtil.strToLongList(ids);
         OrganizationExample example = new OrganizationExample();
         example.createCriteria().andIdIn(idList);
         int result=0;
         try{
             result=organizationMapper.deleteByExample(example);
+            logService.insertLog("机构", "批量删除,id集:" + ids, request);
         }catch(Exception e){
             JshException.writeFail(logger, e);
         }
@@ -98,7 +104,7 @@ public class OrganizationService {
     }
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
     public int addOrganization(Organization org) throws Exception{
-        logService.insertLog(BusinessConstants.LOG_INTERFACE_NAME_ORGANIZATION,
+        logService.insertLog("机构",
                 BusinessConstants.LOG_OPERATION_TYPE_ADD,
                 ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
         //新增时间
@@ -133,7 +139,7 @@ public class OrganizationService {
     }
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
     public int editOrganization(Organization org)throws Exception {
-        logService.insertLog(BusinessConstants.LOG_INTERFACE_NAME_ORGANIZATION,
+        logService.insertLog("机构",
                new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(org.getId()).toString(),
                 ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
         //修改时间
@@ -233,7 +239,7 @@ public class OrganizationService {
     }
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
     public int batchDeleteOrganizationByIds(String ids) throws Exception{
-        logService.insertLog(BusinessConstants.LOG_INTERFACE_NAME_ORGANIZATION,
+        logService.insertLog("机构",
                 new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_DELETE).append(ids).toString(),
                 ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
         User userInfo=userService.getCurrentUser();

src/main/java/com/jsh/erp/service/person/PersonComponent.java

@@ -52,18 +52,18 @@ public class PersonComponent implements ICommonQuery {
     }
 
     @Override
-    public int update(String beanJson, Long id)throws Exception {
-        return personService.updatePerson(beanJson, id);
+    public int update(String beanJson, Long id, HttpServletRequest request)throws Exception {
+        return personService.updatePerson(beanJson, id, request);
     }
 
     @Override
-    public int delete(Long id)throws Exception {
-        return personService.deletePerson(id);
+    public int delete(Long id, HttpServletRequest request)throws Exception {
+        return personService.deletePerson(id, request);
     }
 
     @Override
-    public int batchDelete(String ids)throws Exception {
-        return personService.batchDeletePerson(ids);
+    public int batchDelete(String ids, HttpServletRequest request)throws Exception {
+        return personService.batchDeletePerson(ids, request);
     }
 
     @Override

src/main/java/com/jsh/erp/service/person/PersonService.java

@@ -92,6 +92,7 @@ public class PersonService {
         int result=0;
         try{
             result=personMapper.insertSelective(person);
+            logService.insertLog("经手人", BusinessConstants.LOG_OPERATION_TYPE_ADD, request);
         }catch(Exception e){
             JshException.writeFail(logger, e);
         }
@@ -99,12 +100,14 @@ public class PersonService {
     }
 
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int updatePerson(String beanJson, Long id)throws Exception {
+    public int updatePerson(String beanJson, Long id, HttpServletRequest request)throws Exception {
         Person person = JSONObject.parseObject(beanJson, Person.class);
         person.setId(id);
         int result=0;
         try{
             result=personMapper.updateByPrimaryKeySelective(person);
+            logService.insertLog("经手人",
+                    new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(id).toString(), request);
         }catch(Exception e){
             JshException.writeFail(logger, e);
         }
@@ -112,10 +115,12 @@ public class PersonService {
     }
 
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int deletePerson(Long id)throws Exception {
+    public int deletePerson(Long id, HttpServletRequest request)throws Exception {
         int result=0;
         try{
             result=personMapper.deleteByPrimaryKey(id);
+            logService.insertLog("经手人",
+                    new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_DELETE).append(id).toString(), request);
         }catch(Exception e){
             JshException.writeFail(logger, e);
         }
@@ -123,13 +128,14 @@ public class PersonService {
     }
 
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int batchDeletePerson(String ids) throws Exception{
+    public int batchDeletePerson(String ids, HttpServletRequest request) throws Exception{
         List<Long> idList = StringUtil.strToLongList(ids);
         PersonExample example = new PersonExample();
         example.createCriteria().andIdIn(idList);
         int result=0;
         try{
             result=personMapper.deleteByExample(example);
+            logService.insertLog("经手人", "批量删除,id集:" + ids, request);
         }catch(Exception e){
             JshException.writeFail(logger, e);
         }
@@ -183,7 +189,7 @@ public class PersonService {
 
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
     public int batchDeletePersonByIds(String ids)throws Exception {
-        logService.insertLog(BusinessConstants.LOG_INTERFACE_NAME_PERSON,
+        logService.insertLog("经手人",
                 new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_DELETE).append(ids).toString(),
                 ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
         User userInfo=userService.getCurrentUser();

src/main/java/com/jsh/erp/service/role/RoleComponent.java

@@ -49,18 +49,18 @@ public class RoleComponent implements ICommonQuery {
     }
 
     @Override
-    public int update(String beanJson, Long id)throws Exception {
-        return roleService.updateRole(beanJson, id);
+    public int update(String beanJson, Long id, HttpServletRequest request)throws Exception {
+        return roleService.updateRole(beanJson, id, request);
     }
 
     @Override
-    public int delete(Long id)throws Exception {
-        return roleService.deleteRole(id);
+    public int delete(Long id, HttpServletRequest request)throws Exception {
+        return roleService.deleteRole(id, request);
     }
 
     @Override
-    public int batchDelete(String ids)throws Exception {
-        return roleService.batchDeleteRole(ids);
+    public int batchDelete(String ids, HttpServletRequest request)throws Exception {
+        return roleService.batchDeleteRole(ids, request);
     }
 
     @Override

src/main/java/com/jsh/erp/service/role/RoleService.java

@@ -86,6 +86,7 @@ public class RoleService {
         int result=0;
         try{
             result=roleMapper.insertSelective(role);
+            logService.insertLog("角色", BusinessConstants.LOG_OPERATION_TYPE_ADD, request);
         }catch(Exception e){
             JshException.writeFail(logger, e);
         }
@@ -93,12 +94,14 @@ public class RoleService {
     }
 
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int updateRole(String beanJson, Long id) throws Exception{
+    public int updateRole(String beanJson, Long id, HttpServletRequest request) throws Exception{
         Role role = JSONObject.parseObject(beanJson, Role.class);
         role.setId(id);
         int result=0;
         try{
             result=roleMapper.updateByPrimaryKeySelective(role);
+            logService.insertLog("角色",
+                    new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(id).toString(), request);
         }catch(Exception e){
             JshException.writeFail(logger, e);
         }
@@ -106,10 +109,12 @@ public class RoleService {
     }
 
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int deleteRole(Long id)throws Exception {
+    public int deleteRole(Long id, HttpServletRequest request)throws Exception {
         int result=0;
         try{
             result=roleMapper.deleteByPrimaryKey(id);
+            logService.insertLog("角色",
+                    new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_DELETE).append(id).toString(), request);
         }catch(Exception e){
             JshException.writeFail(logger, e);
         }
@@ -117,13 +122,14 @@ public class RoleService {
     }
 
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int batchDeleteRole(String ids) throws Exception{
+    public int batchDeleteRole(String ids, HttpServletRequest request) throws Exception{
         List<Long> idList = StringUtil.strToLongList(ids);
         RoleExample example = new RoleExample();
         example.createCriteria().andIdIn(idList);
         int result=0;
         try{
             result=roleMapper.deleteByExample(example);
+            logService.insertLog("角色", "批量删除,id集:" + ids, request);
         }catch(Exception e){
             JshException.writeFail(logger, e);
         }
@@ -153,7 +159,7 @@ public class RoleService {
      */
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
     public int batchDeleteRoleByIds(String ids) throws Exception{
-        logService.insertLog(BusinessConstants.LOG_INTERFACE_NAME_SERIAL_NUMBER,
+        logService.insertLog("序列号",
                 new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_DELETE).append(ids).toString(),
                 ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
         User userInfo=userService.getCurrentUser();

src/main/java/com/jsh/erp/service/serialNumber/SerialNumberComponent.java

@@ -56,18 +56,18 @@ public class SerialNumberComponent implements ICommonQuery {
     }
 
     @Override
-    public int update(String beanJson, Long id)throws Exception {
-        return serialNumberService.updateSerialNumber(beanJson, id);
+    public int update(String beanJson, Long id, HttpServletRequest request)throws Exception {
+        return serialNumberService.updateSerialNumber(beanJson, id, request);
     }
 
     @Override
-    public int delete(Long id)throws Exception {
-        return serialNumberService.deleteSerialNumber(id);
+    public int delete(Long id, HttpServletRequest request)throws Exception {
+        return serialNumberService.deleteSerialNumber(id, request);
     }
 
     @Override
-    public int batchDelete(String ids)throws Exception {
-        return serialNumberService.batchDeleteSerialNumber(ids);
+    public int batchDelete(String ids, HttpServletRequest request)throws Exception {
+        return serialNumberService.batchDeleteSerialNumber(ids, request);
     }
 
     @Override