复制角色，字典数据，菜单

pengcheng
1 parent 4b567a4b
Showing 19 changed files with 169 additions and 19 deletions
src/main/java/com/huaheng/pc/config/FilterConfigHeader/service/FilterConfigHeaderService.java
src/main/java/com/huaheng/pc/config/shipmentType/config/shipmentTypeController.java → src/main/java/com/huaheng/pc/config/shipmentType/controller/shipmentTypeController.java
src/main/java/com/huaheng/pc/config/statusFlow/service/StatusFlowHeaderService.java
src/main/java/com/huaheng/pc/config/warehouse/service/WarehouseServiceImpl.java
src/main/java/com/huaheng/pc/config/waveMaster/service/WaveMasterService.java
src/main/java/com/huaheng/pc/system/dict/mapper/DictDataMapper.java
src/main/java/com/huaheng/pc/system/dict/mapper/DictTypeMapper.java
src/main/java/com/huaheng/pc/system/dict/service/DictTypeServiceImpl.java
src/main/java/com/huaheng/pc/system/dict/service/IDictTypeService.java
src/main/java/com/huaheng/pc/system/menu/service/IMenuService.java
src/main/java/com/huaheng/pc/system/menu/service/MenuServiceImpl.java
src/main/java/com/huaheng/pc/system/role/mapper/RoleMapper.java
src/main/java/com/huaheng/pc/system/role/service/IRoleService.java
src/main/java/com/huaheng/pc/system/role/service/RoleServiceImpl.java
src/main/resources/mybatis/system/DictDataMapper.xml
src/main/resources/mybatis/system/DictTypeMapper.xml
src/main/resources/mybatis/system/RoleMapper.xml
src/main/resources/templates/config/shipmentType/add.html
src/main/resources/templates/config/shipmentType/edit.html
@@ -22,4 +22,10 @@ public class FilterConfigHeaderService extends ServiceImpl&lt;FilterConfigHeaderMap
                 .eq(FilterConfigHeader::getWarehouseCode, ShiroUtils.getWarehouseCode());
         return this.list(lam);
     }
+
+
+    //复制规则配置
+    public Boolean filterConfigCopy(String code,String newCode){
+        return null;
+    }
 }
-package com.huaheng.pc.config.shipmentType.config;
+package com.huaheng.pc.config.shipmentType.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -30,4 +30,10 @@ public class StatusFlowHeaderService extends ServiceImpl&lt;StatusFlowHeaderMapper,
                 .eq(StatusFlowHeader::getWarehouseCode, ShiroUtils.getWarehouseCode());
         return this.list(lambda);
     }
+
+
+    //复制流程
+    public Boolean statusFlowCopy(String code,String newCode){
+        return null;
+    }
 }
@@ -4,27 +4,30 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huaheng.common.exception.service.ServiceException;
-import com.huaheng.pc.config.address.domain.Address;
+import com.huaheng.pc.config.FilterConfigHeader.service.FilterConfigHeaderService;
 import com.huaheng.pc.config.address.service.AddressService;
-import com.huaheng.pc.config.configValue.domain.ConfigValue;
 import com.huaheng.pc.config.configValue.service.ConfigValueService;
 import com.huaheng.pc.config.containerType.service.ContainerTypeService;
-import com.huaheng.pc.config.cycleCountPreference.domain.CycleCountPreference;
 import com.huaheng.pc.config.cycleCountPreference.service.CycleCountPreferenceService;
-import com.huaheng.pc.config.locationType.domain.LocationType;
 import com.huaheng.pc.config.locationType.service.LocationTypeService;
 import com.huaheng.pc.config.receiptPreference.service.ReceiptPreferenceService;
 import com.huaheng.pc.config.receiptType.service.ReceiptTypeService;
-import com.huaheng.pc.config.shipmentPreference.domain.ShipmentPreference;
 import com.huaheng.pc.config.shipmentPreference.service.ShipmentPreferenceService;
 import com.huaheng.pc.config.shipmentType.service.ShipmentTypeService;
+import com.huaheng.pc.config.statusFlow.service.StatusFlowHeaderService;
 import com.huaheng.pc.config.warehouse.domain.Warehouse;
 import com.huaheng.pc.config.warehouse.mapper.WarehouseMapper;
 import com.huaheng.pc.config.warehouseCompany.domain.WarehouseCompany;
 import com.huaheng.pc.config.warehouseCompany.service.WarehouseCompanyService;
+import com.huaheng.pc.config.waveMaster.service.WaveMasterService;
+import com.huaheng.pc.shipment.wave.service.WaveService;
+import com.huaheng.pc.system.dict.service.IDictTypeService;
+import com.huaheng.pc.system.menu.service.IMenuService;
+import com.huaheng.pc.system.menu.service.MenuServiceImpl;
+import com.huaheng.pc.system.role.service.IRoleService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import sun.util.resources.cldr.ext.CurrencyNames_rof;
 import javax.annotation.Resource;
 import java.util.List;
@@ -55,6 +58,18 @@ public class WarehouseServiceImpl extends ServiceImpl&lt;WarehouseMapper, Warehouse
     private WarehouseMapper warehouseMapper;
     @Resource
     private WarehouseCompanyService warehouseCompanyService;
+    @Autowired
+    private IRoleService roleService;
+    @Autowired
+    private IDictTypeService dictTypeService;
+    @Autowired
+    private IMenuService menuService;
+    @Autowired
+    private FilterConfigHeaderService filterConfigHeaderService;
+    @Autowired
+    private StatusFlowHeaderService statusFlowHeaderService;
+    @Autowired
+    private WaveMasterService waveMasterService;
     @Override
     public List<Map<String, Object>> getWarehouseList(Integer id) {
@@ -122,26 +137,54 @@ public class WarehouseServiceImpl extends ServiceImpl&lt;WarehouseMapper, Warehouse
         if (!containerTypeService.containerTypeCopy(warehouseCode, newWarehouseCode)){
             throw new ServiceException("复制容器类型表失败");
         }
-        /* 复制盘点首选项表*/
-        if (!cycleCountPreferenceService.cycleCountPreferenceCopy(warehouseCode, newWarehouseCode)){
-            throw new ServiceException("复制盘点首选项表失败");
-        }
         /* 复制库位类型表*/
         if (!locationTypeService.locationTypeCopy(warehouseCode, newWarehouseCode)){
             throw new ServiceException("复制库位类型表失败");
         }
+        /* 复制盘点首选项表*/
+        if (!cycleCountPreferenceService.cycleCountPreferenceCopy(warehouseCode, newWarehouseCode)){
+            throw new ServiceException("复制盘点首选项表失败");
+        }
+        /* 复制入库首选项*/
         if (!receiptPreferenceService.receiptPreferenceCopy(warehouseCode, newWarehouseCode)){
             throw new ServiceException("复制入库首选项表失败");
         }
-        if (!receiptTypeService.receiptTypeCopy(warehouseCode, newWarehouseCode)){
-            throw new ServiceException("复制入库类型表失败");
-        }
+        /* 复制出库首选项*/
         if (!shipmentPreferenceService.shipmentPreferenceCopy(warehouseCode, newWarehouseCode)){
             throw new ServiceException("复制出库首选项表失败");
         }
+        /* 复制入库类型*/
+        if (!receiptTypeService.receiptTypeCopy(warehouseCode, newWarehouseCode)){
+            throw new ServiceException("复制入库类型表失败");
+        }
+        /* 复制出库类型*/
         if (!shipmentTypeService.ShipmentTypeCopy(warehouseCode, newWarehouseCode)){
             throw new ServiceException("复制出库类型表失败");
         }
+        /* 复制角色*/
+        if (!roleService.roleCopy(warehouseCode, newWarehouseCode)){
+            throw new ServiceException("复制角色表失败");
+        }
+        /* 复制字典数据*/
+        if (!dictTypeService.dictTypeCopy(warehouseCode, newWarehouseCode)){
+            throw new ServiceException("复制字典数据表失败");
+        }
+        /* 复制菜单*/
+        if (!menuService.menuCopy(warehouseCode, newWarehouseCode)){
+            throw new ServiceException("复制菜单表失败");
+        }
+        /* 复制流程*/
+        if (!statusFlowHeaderService.statusFlowCopy(warehouseCode, newWarehouseCode)){
+            throw new ServiceException("复制流程表失败");
+        }
+        /* 复制规则配置*/
+        if (!filterConfigHeaderService.filterConfigCopy(warehouseCode, newWarehouseCode)){
+            throw new ServiceException("复制规则配置表失败");
+        }
+        /* 复制波次配置*/
+        if (!waveMasterService.waveMasterCopy(warehouseCode, newWarehouseCode)){
+            throw new ServiceException("复制波次配置表失败");
+        }
         return true;
     }
 }
@@ -8,4 +8,9 @@ import org.springframework.stereotype.Service;
 @Service
 public class WaveMasterService extends ServiceImpl<WaveMasterMapper, WaveMaster> {
+    //复制波次配置
+    public Boolean waveMasterCopy(String code,String newCode){
+        return null;
+    }
+
 }
@@ -115,4 +115,10 @@ public interface DictDataMapper
     DictData selectModel(DictData dictData);
+    //复制字典明细数据
+    int dictDateCopy(@Param("code")String code, @Param("newCode")String newCode);
+
+
+    //修改复制明细的父ID
+    int updateHeaderId(@Param("code")String code);
 }
@@ -94,4 +94,8 @@ public interface DictTypeMapper
     public int insertDictTypes(@Param("dictTypes") List<DictType> dictTypes);
+
+    //先复制字典主表数据
+     int dictTypeCopy(@Param("code")String code, @Param("newCode")String newCode);
+
 }
 package com.huaheng.pc.system.dict.service;
+import com.huaheng.common.exception.service.ServiceException;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -176,4 +177,26 @@ public class DictTypeServiceImpl  implements IDictTypeService
         return dictTypeMapper.insertDictTypes(dictTypeList);
     }
+
+    //复制字典数据
+    @Override
+    public Boolean dictTypeCopy(String code, String newCode) {
+        int i = 0;
+        //1、先复制字典主表数据
+        i = dictTypeMapper.dictTypeCopy(code,newCode);
+        if(i < 1){
+            throw new ServiceException("复制字典主表失败");
+        }
+        //2、复制字典明细数据
+        i = dictDataMapper.dictDateCopy(code,newCode);
+        if(i < 1){
+            throw new ServiceException("复制字典明细失败");
+        }
+        //3、修改复制明细的父ID
+        i = dictDataMapper.updateHeaderId(newCode);
+        if(i < 1){
+            throw new ServiceException("修改字典明细失败");
+        }
+        return null;
+    }
 }
@@ -96,4 +96,7 @@ public interface IDictTypeService
     public int insertDictTypes(List<DictType> dictTypes);
+
+    //复制字典数据
+    Boolean dictTypeCopy(String code,String newCode);
 }
@@ -138,4 +138,8 @@ public interface IMenuService
      * @return 菜单列表
      */
     List<Menu> selectMobileMenusByUserId(Integer userId);
+
+
+    //复制菜单
+    Boolean menuCopy(String code,String newCode);
 }
@@ -354,5 +354,11 @@ public class MenuServiceImpl implements IMenuService
         return menus;
     }
+    //复制菜单
+    @Override
+    public Boolean menuCopy(String code, String newCode) {
+        return null;
+    }
+
 }
@@ -91,4 +91,7 @@ public interface RoleMapper
      */
     public Role checkroleCodeUnique(@Param("warehouseCode") String warehouseCode, @Param("roleCode") String roleCode);
+
+    public int roleCopy(@Param("code")String code, @Param("newCode")String newCode);
+
 }
@@ -108,4 +108,8 @@ public interface IRoleService
      */
     public int countUserRoleByRoleId(Integer id);
+
+    //复制角色
+    Boolean roleCopy(String code,String newCode);
+
 }
@@ -259,4 +259,15 @@ public class RoleServiceImpl implements IRoleService
         return userRoleMapper.countUserRoleByRoleId(id);
     }
+
+    //复制角色
+    @Override
+    public Boolean roleCopy(String code, String newCode) {
+        int i = roleMapper.roleCopy(code,newCode);
+        if(i > 0){
+            return true;
+        }
+        return false;
+    }
+
 }
@@ -205,4 +205,18 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 		limit 1
 	</select>
+	<insert id="dictDateCopy">
+	insert into  sys_dict_data(warehouseCode,dictSort,dictLabel,dictValue,dictType,cssClass,listClass,isDefault,enable,deleted,remark)
+		SELECT #{newCode},dictSort,dictLabel,dictValue,dictType,cssClass,listClass,isDefault,enable,deleted,remark from sys_dict_data
+		where warehouseCode = {code}
+
+	</insert>
+
+	<update id="updateHeaderId">
+		update sys_dict_data d
+		inner join sys_dict_type t
+		on t.dictType=d.dictType and d.warehouseCode=t.warehouseCode and d.warehouseCode=#{code}
+		set d.headerId=t.id
+	</update>
+
 </mapper> 
 \ No newline at end of file
@@ -141,5 +141,12 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 		)
 		</foreach>
 	</insert>
+
+	<insert id="dictTypeCopy">
+		insert into sys_dict_type(warehouseCode,dictName,dictType,enable,deleted,remark)
+		select #{newCode},dictName,dictType,enable,deleted,remark from sys_dict_type
+		where warehouseCode=#{code}
+
+	</insert>
 </mapper> 
 \ No newline at end of file
@@ -124,5 +124,10 @@
  			sysdate()
  		)
 	</insert>
+
+	<insert id="roleCopy">
+		insert into sys_role(roleName,roleCode,roleSort,warehouseCode,enable,remark)
+		select roleName,roleCode,roleSort,#{newCode},enable,remark from sys_role where warehouseCode=#{code}
+	</insert>
 </mapper> 
 \ No newline at end of file
@@ -4,7 +4,7 @@
 <head th:include="include :: header"></head>
 <body class="white-bg">
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-    <form class="form-horizontal m" id="form-receiptType-add">
+    <form class="form-horizontal m" id="form-shipmentType-add">
         <div class="form-group">
             <label class="col-sm-3 control-label">编码：</label>
             <div class="col-sm-8">
@@ -46,7 +46,7 @@
         <div class="form-group">
             <label class="col-sm-3 control-label">出库流程：</label>
             <div class="col-sm-8">
-                <select id="receiptFlow" name="shipmentFlow" class="form-control" th:with="statusFlowList=${@StatusFlow.flowList()}">
+                <select id="shipmentFlow" name="shipmentFlow" class="form-control" th:with="statusFlowList=${@StatusFlow.flowList('shippingFlow')}">
                     <option th:each="flow : ${statusFlowList}" th:text="${flow['name']}" th:value="${flow['code']}"></option>
                 </select>
             </div>
@@ -153,7 +153,7 @@
 <div th:include="include::footer"></div>
 <script type="text/javascript">
     var prefix = ctx + "config/shipmentType";
-    $("#form-receiptType-add").validate({
+    $("#form-shipmentType-add").validate({
         rules:{
             code:{
                 required:true,
@@ -167,7 +167,7 @@
         },
         submitHandler: function(form) {
             // $.operate.save(prefix + "/add", $('#form-locationType-add').serialize());
-            var tableValue = $.common.getTableValue("#form-receiptType-add");
+            var tableValue = $.common.getTableValue("#form-shipmentType-add");
             tableValue = formValueReplace(tableValue, "companyCode", $("#companyCode option:selected").val());
             tableValue = formValueReplace(tableValue, "shipmentFlow", $("#shipmentFlow option:selected").val());
             tableValue = formValueReplace(tableValue, "enable", $("input[name='enable']").is(':checked'));
@@ -155,7 +155,7 @@
 <div th:include="include::footer"></div>
 <script type="text/javascript">
     var prefix = ctx + "config/shipmentType";
-    $("#form-receiptType-edit").validate({
+    $("#form-shipmentType-edit").validate({
         rules:{
             code:{
                 required:true,