Merge branch 'feature-haoban-role' into developer

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/role/HaobanMenuApiService.java

@@ -46,4 +46,8 @@ public interface HaobanMenuApiService {
      */
     ServiceResponse<List<String>> getHaobanMenuList(String wxEnterpriseId, Integer clerkType);
 
+    ServiceResponse<HaobanMenuDTO> getMenuByCode(String menuCode);
+
+    ServiceResponse<String> getMenuNameByCode(String menuCode);
+
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/role/TabHaobanMenuMapper.java

@@ -99,5 +99,7 @@ public interface TabHaobanMenuMapper {
      * @return {@link List}<{@link String}>
      */
     List<TabHaobanMenu> getHaobanMenuListByCode(@Param("menuCodes") List<String> menuCodes);
+
+    TabHaobanMenu getMenuByCode(@Param("menuCode") String menuCode);
 }
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/role/HaobanMenuApiServiceImpl.java

@@ -40,4 +40,18 @@ public class HaobanMenuApiServiceImpl implements HaobanMenuApiService {
         List<String> haobanMenuList = haobanMenuService.getHaobanMenuList(wxEnterpriseId, clerkType);
         return ServiceResponse.success(haobanMenuList);
     }
+
+    @Override
+    public ServiceResponse<HaobanMenuDTO> getMenuByCode(String menuCode) {
+        return ServiceResponse.success(EntityUtil.changeEntityNew(HaobanMenuDTO.class,haobanMenuService.getMenuByCode(menuCode)));
+    }
+
+    @Override
+    public ServiceResponse<String> getMenuNameByCode(String menuCode) {
+        HaobanMenuBO haobanMenuBO = haobanMenuService.getMenuByCode(menuCode);
+        if (haobanMenuBO == null) {
+            return ServiceResponse.success();
+        }
+        return ServiceResponse.success(haobanMenuBO.getMenuName());
+    }
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/role/HaobanMenuService.java

@@ -88,4 +88,5 @@ public interface HaobanMenuService {
      */
     List<HaobanMenuBO> getHaobanMenuList(List<String> menuCodes);
 
+    HaobanMenuBO getMenuByCode(String menuCode);
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/role/impl/HaobanMenuServiceImpl.java

@@ -112,6 +112,11 @@ public class HaobanMenuServiceImpl implements HaobanMenuService {
         return EntityUtil.changeEntityListNew(HaobanMenuBO.class,haobanMenuListByCode);
     }
 
+    @Override
+    public HaobanMenuBO getMenuByCode(String menuCode) {
+        return EntityUtil.changeEntityNew(HaobanMenuBO.class,tabHaobanMenuMapper.getMenuByCode(menuCode));
+    }
+
     public List<HaobanMenuBO> iterateMenus(List<HaobanMenuBO> menuBOList, String pCode) {
         List<HaobanMenuBO> result = new ArrayList<>();
         for (HaobanMenuBO haobanMenuBO : menuBOList) {

haoban-manage3-service/src/main/resources/mapper/role/TabHaobanMenuMapper.xml

@@ -189,5 +189,13 @@
         </foreach>
     </select>
 
+
+    <select id="getMenuByCode" resultMap="TabHaobanMenuMap">
+        select
+        <include refid="Base_Column_List"/>
+        from tab_haoban_menu
+        where status_flag = 1 and menu_code = #{menuCodes}
+    </select>
+
 </mapper>
 

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/HaobanRoleController.java

@@ -4,11 +4,17 @@ import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 import com.gic.haoban.common.utils.AuthWebRequestUtil;
+import com.gic.haoban.manage.api.dto.qdto.role.HaobanRoleMenuQDTO;
 import com.gic.haoban.manage.api.dto.qdto.role.HaobanRoleQDTO;
 import com.gic.haoban.manage.api.dto.role.HaobanMenuDTO;
 import com.gic.haoban.manage.api.dto.role.HaobanRoleDTO;
 import com.gic.haoban.manage.api.service.role.HaobanMenuApiService;
 import com.gic.haoban.manage.api.service.role.HaobanRoleApiService;
+import com.gic.haoban.manage.web.log.LogRecordUserServiceImpl;
+import com.gic.log.record.anno.GicLogRecord;
+import com.gic.log.record.util.GicLogRecordCategoryEnum;
+import com.gic.log.record.util.GicLogRecordEvaluationContext;
+import com.gic.log.record.util.GicLogRecordOptTypeEnum;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,9 +46,47 @@ public class HaobanRoleController extends WebBaseController{
      * @return
      */
     @RequestMapping(value = "/edit",method = RequestMethod.POST)
+    @GicLogRecord(value = "${#logContent}",
+            category = GicLogRecordCategoryEnum.HAOBAN_ROLE,
+            optType = GicLogRecordOptTypeEnum.EDIT_HAOBAN_ROLE,
+            userFunc = LogRecordUserServiceImpl.class,
+            optPage = "好办小程序权限-编辑")
     private RestResponse edit(@RequestBody HaobanRoleQDTO haobanRoleQDTO) {
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
-        return RestResponse.successResult(haobanRoleApiService.edit(haobanRoleQDTO,login));
+        HaobanRoleMenuQDTO clerkMenus = haobanRoleQDTO.getClerkMenus();
+        HaobanRoleMenuQDTO manegeClerkMenus = haobanRoleQDTO.getManegeClerkMenus();
+        HaobanRoleMenuQDTO managerMenus = haobanRoleQDTO.getManagerMenus();
+        String wxEnterpriseId = login.getWxEnterpriseId();
+        if (clerkMenus != null) {
+            Integer clerkType = clerkMenus.getClerkType();
+            List<String> menuCodes = clerkMenus.getMenuCodes();
+            List<String> delMenuCodes = clerkMenus.getDelMenuCodes();
+            ServiceResponse<HaobanRoleDTO> haobanRoleDTOServiceResponse = haobanRoleApiService.getMenuByWxEnterpriseIdAndClerkType(wxEnterpriseId, clerkType, 1);
+            HaobanRoleDTO haobanRoleDTO = haobanRoleDTOServiceResponse.getResult();
+            if (haobanRoleDTO != null) {
+                List<String> oldMenuCodes = haobanRoleDTO.getMenuCodes();
+
+            }
+        }
+
+        if (manegeClerkMenus != null) {
+            Integer clerkType = manegeClerkMenus.getClerkType();
+            List<String> menuCodes = manegeClerkMenus.getMenuCodes();
+            List<String> delMenuCodes = manegeClerkMenus.getDelMenuCodes();
+        }
+        if (managerMenus != null) {
+            Integer clerkType = managerMenus.getClerkType();
+            List<String> menuCodes = managerMenus.getMenuCodes();
+            List<String> delMenuCodes = managerMenus.getDelMenuCodes();
+        }
+        ServiceResponse serviceResponse = haobanRoleApiService.edit(haobanRoleQDTO, login);
+        if (!serviceResponse.isSuccess()) {
+            GicLogRecordEvaluationContext.noWriteLog();
+        }
+        String logContent = "";
+        GicLogRecordEvaluationContext.putAttribute("logContent", logContent);
+        GicLogRecordEvaluationContext.putOptTargetId(AuthWebRequestUtil.getLoginUser().getClerkId());
+        return RestResponse.successResult();
     }
 
     /**