开发完成运营 用户和用户详情查看功能

java110-bean/src/main/java/com/java110/dto/user/UserAttrDto.java

@@ -18,6 +18,7 @@ public class UserAttrDto extends PageDto implements Serializable {
     private String attrId;
     private String userId;
     private String specCd;
+    private String specCdName;
     private String value;
     private String createTime;
     private String statusCd;
@@ -69,4 +70,12 @@ public class UserAttrDto extends PageDto implements Serializable {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getSpecCdName() {
+        return specCdName;
+    }
+
+    public void setSpecCdName(String specCdName) {
+        this.specCdName = specCdName;
+    }
 }

java110-db/src/main/resources/mapper/store/StoreUserV1ServiceDaoImplMapper.xml

@@ -18,9 +18,10 @@
     <!-- 查询商户用户关系信息 add by wuxw 2018-07-03 -->
     <select id="getStoreUserInfo" parameterType="Map" resultType="Map">
         select t.status_cd,t.status_cd statusCd,t.store_user_id,t.store_user_id storeUserId,t.store_id,t.store_id
-        storeId,t.user_id,t.user_id userId,t.rel_cd,t.rel_cd relCd,uu.tel,uu.name
+        storeId,t.user_id,t.user_id userId,t.rel_cd,t.rel_cd relCd,uu.tel,uu.name,s.name storeName
         from s_store_user t
         left join u_user uu on t.user_id = uu.user_id
+        left join s_store s on t.store_id = s.store_id and s.status_cd = '0'
         where 1 =1
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}

java110-db/src/main/resources/mapper/user/UserAttrV1ServiceDaoImplMapper.xml

@@ -18,8 +18,9 @@
     <!-- 查询用户属性信息 add by wuxw 2018-07-03 -->
     <select id="getUserAttrInfo" parameterType="Map" resultType="Map">
         select t.attr_id,t.attr_id attrId,t.spec_cd,t.spec_cd specCd,t.status_cd,t.status_cd
-        statusCd,t.id,t.user_id,t.user_id userId,t.value
+        statusCd,t.id,t.user_id,t.user_id userId,t.value,td.name specCdName
         from u_user_attr t
+        left join t_dict td on t.spec_cd = td.status_cd and td.table_name = 'u_user' and td.table_columns = 'spec_cd'
         where 1 =1
         <if test="attrId !=null and attrId != ''">
             and t.attr_id= #{attrId}

service-store/src/main/java/com/java110/store/cmd/storeUser/ListAdminStoreUserCmd.java

@@ -0,0 +1,83 @@
+/*
+ * 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.store.cmd.storeUser;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.core.log.LoggerFactory;
+import com.java110.dto.store.StoreUserDto;
+import com.java110.intf.store.IStoreUserV1InnerServiceSMO;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.vo.ResultVo;
+import org.slf4j.Logger;
+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;
+
+
+/**
+ * 类表述：查询
+ * 服务编码：storeUser.listStoreUser
+ * 请求路劲：/app/storeUser.ListStoreUser
+ * add by 吴学文 at 2021-10-08 16:05:30 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 = "storeUser.listAdminStoreUser")
+public class ListAdminStoreUserCmd extends Cmd {
+
+    private static Logger logger = LoggerFactory.getLogger(ListAdminStoreUserCmd.class);
+    @Autowired
+    private IStoreUserV1InnerServiceSMO storeUserV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+        super.validatePageInfo(reqJson);
+        super.validateAdmin(cmdDataFlowContext);
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+
+        StoreUserDto storeUserDto = BeanConvertUtil.covertBean(reqJson, StoreUserDto.class);
+        storeUserDto.setUserId(reqJson.getString("staffId"));
+        storeUserDto.setStoreId("");
+        int count = storeUserV1InnerServiceSMOImpl.queryStoreUsersCount(storeUserDto);
+
+        List<StoreUserDto> storeUserDtos = null;
+
+        if (count > 0) {
+            storeUserDtos = storeUserV1InnerServiceSMOImpl.queryStoreUsers(storeUserDto);
+        } else {
+            storeUserDtos = new ArrayList<>();
+        }
+
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, storeUserDtos);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+        cmdDataFlowContext.setResponseEntity(responseEntity);
+    }
+}

service-user/src/main/java/com/java110/user/cmd/owner/ListAdminAppUserOwnersCmd.java

@@ -42,7 +42,7 @@ public class ListAdminAppUserOwnersCmd extends Cmd {
         //获取当前用户id
         String userId = reqJson.getString("userId");
         OwnerAppUserDto ownerAppUserDto = BeanConvertUtil.covertBean(reqJson, OwnerAppUserDto.class);
-        ownerAppUserDto.setUserId("");
+        ownerAppUserDto.setUserId(reqJson.getString("systemUserId"));
         int count = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsersCount(ownerAppUserDto);
         int row = reqJson.getIntValue("row");
 

service-user/src/main/java/com/java110/user/cmd/user/ListSystemUserAttrCmd.java

@@ -0,0 +1,56 @@
+package com.java110.user.cmd.user;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.user.UserAttrDto;
+import com.java110.dto.user.UserDto;
+import com.java110.intf.user.IUserAttrV1InnerServiceSMO;
+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.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.List;
+
+@Java110Cmd(serviceCode = "user.listSystemUserAttr")
+public class ListSystemUserAttrCmd extends Cmd {
+    @Autowired
+    private IUserAttrV1InnerServiceSMO userAttrV1InnerServiceSMOImpl;
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+        super.validateAdmin(context);
+        super.validatePageInfo(reqJson);
+        Assert.hasKeyAndValue(reqJson,"systemUserId","未包含用户ID");
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+        UserAttrDto userAttrDto = BeanConvertUtil.covertBean(reqJson, UserAttrDto.class);
+        userAttrDto.setUserId(reqJson.getString("systemUserId"));
+
+
+        int count = userAttrV1InnerServiceSMOImpl.queryUserAttrsCount(userAttrDto);
+
+        List<UserAttrDto> userAttrDtos = null;
+
+        if (count > 0) {
+            userAttrDtos = userAttrV1InnerServiceSMOImpl.queryUserAttrs(userAttrDto);
+        } else {
+            userAttrDtos = new ArrayList<>();
+        }
+
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, userAttrDtos);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+        context.setResponseEntity(responseEntity);
+    }
+}

service-user/src/main/java/com/java110/user/cmd/user/ListSystemUsersCmd.java

@@ -35,7 +35,8 @@ public class ListSystemUsersCmd extends Cmd {
     @Override
     public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         UserDto userDto = BeanConvertUtil.covertBean(reqJson, UserDto.class);
-        userDto.setUserId("");
+        userDto.setUserId(reqJson.getString("systemUserId"));
+
 
         int count = userV1InnerServiceSMO.getSystemUserCount(userDto);