支持员工单独配置小区

service-user/src/main/java/com/java110/user/cmd/role/DeleteStaffCommunityCmd.java

@@ -50,7 +50,6 @@ public class DeleteStaffCommunityCmd extends Cmd {
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "scId", "scId不能为空");
-Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
 
     }
 

service-user/src/main/java/com/java110/user/cmd/role/ListStaffCommunityCmd.java

@@ -26,8 +26,10 @@ import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.java110.dto.staffCommunity.StaffCommunityDto;
+
 import java.util.List;
 import java.util.ArrayList;
+
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.HttpStatus;
 import org.slf4j.Logger;
@@ -47,34 +49,35 @@ import org.slf4j.LoggerFactory;
 @Java110Cmd(serviceCode = "role.listStaffCommunity")
 public class ListStaffCommunityCmd extends Cmd {
 
-  private static Logger logger = LoggerFactory.getLogger(ListStaffCommunityCmd.class);
+    private static Logger logger = LoggerFactory.getLogger(ListStaffCommunityCmd.class);
     @Autowired
     private IStaffCommunityV1InnerServiceSMO staffCommunityV1InnerServiceSMOImpl;
 
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         super.validatePageInfo(reqJson);
+        super.validateProperty(cmdDataFlowContext);
     }
 
     @Override
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-           StaffCommunityDto staffCommunityDto = BeanConvertUtil.covertBean(reqJson, StaffCommunityDto.class);
+        StaffCommunityDto staffCommunityDto = BeanConvertUtil.covertBean(reqJson, StaffCommunityDto.class);
 
-           int count = staffCommunityV1InnerServiceSMOImpl.queryStaffCommunitysCount(staffCommunityDto);
+        int count = staffCommunityV1InnerServiceSMOImpl.queryStaffCommunitysCount(staffCommunityDto);
 
-           List<StaffCommunityDto> staffCommunityDtos = null;
+        List<StaffCommunityDto> staffCommunityDtos = null;
 
-           if (count > 0) {
-               staffCommunityDtos = staffCommunityV1InnerServiceSMOImpl.queryStaffCommunitys(staffCommunityDto);
-           } else {
-               staffCommunityDtos = new ArrayList<>();
-           }
+        if (count > 0) {
+            staffCommunityDtos = staffCommunityV1InnerServiceSMOImpl.queryStaffCommunitys(staffCommunityDto);
+        } else {
+            staffCommunityDtos = new ArrayList<>();
+        }
 
-           ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, staffCommunityDtos);
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, staffCommunityDtos);
 
-           ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
 
-           cmdDataFlowContext.setResponseEntity(responseEntity);
+        cmdDataFlowContext.setResponseEntity(responseEntity);
     }
 }

service-user/src/main/java/com/java110/user/cmd/role/ListWaitStaffCommunityCmd.java

@@ -0,0 +1,84 @@
+package com.java110.user.cmd.role;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.CmdContextUtils;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.PageDto;
+import com.java110.dto.community.CommunityDto;
+import com.java110.dto.privilege.RoleCommunityDto;
+import com.java110.dto.staffCommunity.StaffCommunityDto;
+import com.java110.intf.community.ICommunityInnerServiceSMO;
+import com.java110.intf.user.IRoleCommunityV1InnerServiceSMO;
+import com.java110.intf.user.IStaffCommunityV1InnerServiceSMO;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.ListUtil;
+import com.java110.utils.util.StringUtil;
+import com.java110.vo.ResultVo;
+import com.java110.vo.api.community.ApiCommunityDataVo;
+import com.java110.vo.api.community.ApiCommunityVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Java110Cmd(serviceCode = "role.listWaitStaffCommunity")
+public class ListWaitStaffCommunityCmd extends Cmd {
+
+    @Autowired
+    private IStaffCommunityV1InnerServiceSMO staffCommunityV1InnerServiceSMOImpl;
+
+    @Autowired
+    private ICommunityInnerServiceSMO communityInnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+        super.validatePageInfo(reqJson);
+
+        Assert.hasKeyAndValue(reqJson, "staffId", "必填，请填写角色");
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+        String storeId = CmdContextUtils.getStoreId(context);
+        StaffCommunityDto staffCommunityDto = new StaffCommunityDto();
+        staffCommunityDto.setStaffId(reqJson.getString("staffId"));
+        staffCommunityDto.setStoreId(storeId);
+        staffCommunityDto.setPage(PageDto.DEFAULT_PAGE);
+        List<StaffCommunityDto> staffCommunityDtos = staffCommunityV1InnerServiceSMOImpl.queryStaffCommunitys(staffCommunityDto);
+        List<String> communityIds = new ArrayList<>();
+        for (StaffCommunityDto tmpStaffCommunityDto : staffCommunityDtos) {
+            communityIds.add(tmpStaffCommunityDto.getCommunityId());
+        }
+        CommunityDto communityDto = new CommunityDto();
+        communityDto.setStoreId(storeId);
+        if (!ListUtil.isNull(communityIds)) {
+            communityDto.setNotInCommunityId(communityIds.toArray(new String[communityIds.size()]));
+        }
+        communityDto.setAuditStatusCd("1100");
+        communityDto.setMemberId(storeId);
+        communityDto.setPage(reqJson.getIntValue("page"));
+        communityDto.setRow(reqJson.getIntValue("row"));
+        int count = communityInnerServiceSMOImpl.queryCommunitysCount(communityDto);
+
+        List<CommunityDto> communitys = null;
+
+        if (count > 0) {
+            communitys = communityInnerServiceSMOImpl.queryCommunitys(communityDto);
+        } else {
+            communitys = new ArrayList<>();
+        }
+
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, communitys);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+        context.setResponseEntity(responseEntity);
+    }
+}

service-user/src/main/java/com/java110/user/cmd/role/SaveStaffCommunityCmd.java

@@ -15,23 +15,33 @@
  */
 package com.java110.user.cmd.role;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.CmdContextUtils;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.store.StoreDto;
+import com.java110.dto.user.UserDto;
+import com.java110.intf.store.IStoreV1InnerServiceSMO;
 import com.java110.intf.user.IStaffCommunityV1InnerServiceSMO;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
+import com.java110.po.privilege.RoleCommunityPo;
 import com.java110.po.staffCommunity.StaffCommunityPo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.ListUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+
 /**
  * 类表述：保存
  * 服务编码：staffCommunity.saveStaffCommunity
@@ -52,14 +62,20 @@ public class SaveStaffCommunityCmd extends Cmd {
     @Autowired
     private IStaffCommunityV1InnerServiceSMO staffCommunityV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IStoreV1InnerServiceSMO storeV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "staffId", "请求报文中未包含staffId");
-        Assert.hasKeyAndValue(reqJson, "staffName", "请求报文中未包含staffName");
-        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
-        Assert.hasKeyAndValue(reqJson, "communityName", "请求报文中未包含communityName");
-        Assert.hasKeyAndValue(reqJson, "storeId", "请求报文中未包含storeId");
-        Assert.hasKeyAndValue(reqJson, "storeName", "请求报文中未包含storeName");
+        Assert.hasKey(reqJson, "communitys", "未包含小区");
+        JSONArray communitys = reqJson.getJSONArray("communitys");
+        if (ListUtil.isNull(communitys)) {
+            throw new CmdException("未选择小区信息");
+        }
 
     }
 
@@ -67,12 +83,36 @@ public class SaveStaffCommunityCmd extends Cmd {
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-        StaffCommunityPo staffCommunityPo = BeanConvertUtil.covertBean(reqJson, StaffCommunityPo.class);
-        staffCommunityPo.setScId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
-        int flag = staffCommunityV1InnerServiceSMOImpl.saveStaffCommunity(staffCommunityPo);
+        JSONArray communitys = reqJson.getJSONArray("communitys");
+
+        String storeId = CmdContextUtils.getStoreId(cmdDataFlowContext);
+
+        UserDto userDto = new UserDto();
+        userDto.setUserId(reqJson.getString("staffId"));
+        List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
+        Assert.listOnlyOne(userDtos, "员工不存在");
+
+        StoreDto storeDto = new StoreDto();
+        storeDto.setStoreId(storeId);
+        List<StoreDto> storeDtos = storeV1InnerServiceSMOImpl.queryStores(storeDto);
+        Assert.listOnlyOne(storeDtos, "商户不存在");
+
+        StaffCommunityPo staffCommunityPo = null;
+        for (int communityIndex = 0; communityIndex < communitys.size(); communityIndex++) {
+            staffCommunityPo = new StaffCommunityPo();
+            staffCommunityPo.setStaffName(userDtos.get(0).getName());
+            staffCommunityPo.setCommunityId(communitys.getJSONObject(communityIndex).getString("communityId"));
+            staffCommunityPo.setCommunityName(communitys.getJSONObject(communityIndex).getString("communityName"));
+            staffCommunityPo.setStoreName(storeDtos.get(0).getName());
+            staffCommunityPo.setStoreId(storeId);
+            staffCommunityPo.setScId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+            staffCommunityPo.setStaffId(reqJson.getString("staffId"));
+
+            int flag = staffCommunityV1InnerServiceSMOImpl.saveStaffCommunity(staffCommunityPo);
 
-        if (flag < 1) {
-            throw new CmdException("保存数据失败");
+            if (flag < 1) {
+                throw new CmdException("保存数据失败");
+            }
         }
 
         cmdDataFlowContext.setResponseEntity(ResultVo.success());

service-user/src/main/java/com/java110/user/cmd/role/UpdateStaffCommunityCmd.java

@@ -1,74 +0,0 @@
-/*
- * Copyright 2017-2020 吴学文 and java110 team.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.java110.user.cmd.role;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.core.annotation.Java110Cmd;
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.Cmd;
-import com.java110.core.event.cmd.CmdEvent;
-import com.java110.intf.user.IStaffCommunityV1InnerServiceSMO;
-import com.java110.po.staffCommunity.StaffCommunityPo;
-import com.java110.utils.exception.CmdException;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * 类表述：更新
- * 服务编码：staffCommunity.updateStaffCommunity
- * 请求路劲：/app/staffCommunity.UpdateStaffCommunity
- * add by 吴学文 at 2025-03-18 14:06:45 mail: 928255095@qq.com
- * open source address: https://gitee.com/wuxw7/MicroCommunity
- * 官网：http://www.homecommunity.cn
- * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
- * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
- */
-@Java110Cmd(serviceCode = "role.updateStaffCommunity")
-public class UpdateStaffCommunityCmd extends Cmd {
-
-  private static Logger logger = LoggerFactory.getLogger(UpdateStaffCommunityCmd.class);
-
-
-    @Autowired
-    private IStaffCommunityV1InnerServiceSMO staffCommunityV1InnerServiceSMOImpl;
-
-    @Override
-    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "scId", "scId不能为空");
-Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
-
-    }
-
-    @Override
-    @Java110Transactional
-    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
-       StaffCommunityPo staffCommunityPo = BeanConvertUtil.covertBean(reqJson, StaffCommunityPo.class);
-        int flag = staffCommunityV1InnerServiceSMOImpl.updateStaffCommunity(staffCommunityPo);
-
-        if (flag < 1) {
-            throw new CmdException("更新数据失败");
-        }
-
-        cmdDataFlowContext.setResponseEntity(ResultVo.success());
-    }
-}