From 899e021604c2dc1660fe9b240f041f7bef56563b Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 28 十月 2022 15:08:08 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-common/src/main/java/com/ycl/service/user/UmsAdminService.java | 2
ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminMapper.java | 5 +
ycl-common/src/main/java/com/ycl/dto/UmsStoreInfoParam.java | 6
ycl-platform/src/main/resources/mapper/caseHandler/PartyInfoMapper.xml | 6
ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java | 39 +--------
ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml | 2
ycl-common/src/main/java/com/ycl/controller/FileController.java | 2
ycl-common/src/main/java/com/ycl/service/user/impl/UmsDepartManageServiceImpl.java | 4 -
ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java | 3
ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml | 122 ++++++++++++++++++++++++++++++
ycl-platform/src/main/resources/mapper/caseHandler/ViolationsMapper.xml | 6
ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java | 15 ++-
ycl-common/src/main/java/com/ycl/vo/user/UserVO.java | 13 ---
13 files changed, 153 insertions(+), 72 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/controller/FileController.java b/ycl-common/src/main/java/com/ycl/controller/FileController.java
index a4bcc03..f0f1623 100644
--- a/ycl-common/src/main/java/com/ycl/controller/FileController.java
+++ b/ycl-common/src/main/java/com/ycl/controller/FileController.java
@@ -38,7 +38,7 @@
return CommonResult.success(res, "ok");
} catch (Exception e) {
- return CommonResult.failed("fail!");
+ return CommonResult.failed("鍥剧墖鏍煎紡鍙兘涓簀pg銆乯peg銆乸ng,鍙慨鏀规枃浠剁殑鍚庣紑鏃犳晥!");
}
}
diff --git a/ycl-common/src/main/java/com/ycl/dto/UmsStoreInfoParam.java b/ycl-common/src/main/java/com/ycl/dto/UmsStoreInfoParam.java
index bf0d555..77c823e 100644
--- a/ycl-common/src/main/java/com/ycl/dto/UmsStoreInfoParam.java
+++ b/ycl-common/src/main/java/com/ycl/dto/UmsStoreInfoParam.java
@@ -36,9 +36,9 @@
@ApiModelProperty("鐓х墖")
private String storephoto;
- @NotBlank(message = "韬唤璇佷俊鎭笉鑳戒负绌�")
- @ApiModelProperty("韬唤璇佷俊鎭�")
- private String idcardinfo;
+// @NotBlank(message = "韬唤璇佷俊鎭笉鑳戒负绌�")
+// @ApiModelProperty("韬唤璇佷俊鎭�")
+// private String idcardinfo;
@ApiModelProperty("闂ㄥ簵绉垎")
private BigDecimal storescore;
diff --git a/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java b/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java
index ed0eee0..af59e8f 100644
--- a/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java
+++ b/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ycl.entity.depart.UmsDepart;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
@@ -75,15 +76,16 @@
@ApiModelProperty(value = "鑱屽姟")
private String jobTitle;
- @ApiModelProperty(value = "閮ㄩ棬id")
- private Long departmentId;
-
@ApiModelProperty(value = "閮ㄩ棬鍚嶇О")
@TableField(exist = false)
private String departName;
+ @ApiModelProperty(value = "閮ㄩ棬id")
+ @TableField(exist = false)
+ private Integer departmentId;
+
@ApiModelProperty(value = "鐢ㄦ埛绫诲瀷")
- private Byte userType;
+ private Integer userType;
@ApiModelProperty(value = "搴ф満/鍒嗘満")
private String zj;
@@ -94,8 +96,11 @@
@ApiModelProperty(value = "鏄惁涓虹綉鏍肩鐞嗗憳锛�0->涓嶆槸锛�1->鏄�")
private Integer isGrid;
-
+ @ApiModelProperty(value = "瑙掕壊鍒楄〃")
+ @TableField(exist = false)
+ private UmsDepart depart;
@ApiModelProperty(value = "瑙掕壊鍒楄〃")
@TableField(exist = false)
private List<UmsRole> roles;
+
}
diff --git a/ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminMapper.java b/ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminMapper.java
index 13224f1..71317e1 100644
--- a/ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminMapper.java
+++ b/ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminMapper.java
@@ -1,7 +1,9 @@
package com.ycl.mapper.user;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.entity.user.UmsAdmin;
+import com.ycl.vo.user.UserVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -21,4 +23,7 @@
*/
List<Long> getAdminIdList(@Param("resourceId") Long resourceId);
+ Page<UmsAdmin> selectCondPage(@Param("page") Page<UmsAdmin> page, @Param("umsAdmin") UserVO.PageUserVO pageUserVO);
+
+ Page<UmsAdmin> selectPageByWordKey(Page<UmsAdmin> page, @Param("keyword") String keyword);
}
diff --git a/ycl-common/src/main/java/com/ycl/service/user/UmsAdminService.java b/ycl-common/src/main/java/com/ycl/service/user/UmsAdminService.java
index 5f23c20..6e8ee13 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/UmsAdminService.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/UmsAdminService.java
@@ -95,7 +95,7 @@
* @param pageUserVO
* @return
*/
- IPage<UmsAdmin> pageUser(UserVO.PageUserVO pageUserVO);
+ Page<UmsAdmin> pageUser(UserVO.PageUserVO pageUserVO);
/**
* 鎵归噺鍒犻櫎鐢ㄦ埛
diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
index 83b2858..85aa93d 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
@@ -24,10 +24,8 @@
import com.ycl.utils.SpringUtil;
import com.ycl.utils.common.LiveTimeMillisecond;
import com.ycl.utils.common.MacUtils;
-import com.ycl.utils.common.PojoUtils;
import com.ycl.utils.redis.RedisKey;
import com.ycl.vo.user.UserVO;
-import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
@@ -82,6 +80,8 @@
AdminMenuRelationMapper adminMenuRelationMapper;
@Resource
UmsMenuMapper umsMenuMapper;
+ @Resource
+ UmsAdminMapper umsAdminMapper;
@Override
public UmsAdmin getAdminByUsername(String username) {
@@ -159,7 +159,7 @@
//娣诲姞閮ㄩ棬
UmsDepartManage departManage = new UmsDepartManage();
departManage.setUserId(umsAdmin.getId());
- departManage.setDepartId(umsAdmin.getDepartmentId());
+ departManage.setDepartId(umsAdminParam.getDepartmentId());
departManage.setCreateTime(new Date());
departManage.setUpdateTime(new Date());
umsDepartManageMapper.insert(departManage);
@@ -345,40 +345,11 @@
}
@Override
- public IPage<UmsAdmin> pageUser(UserVO.PageUserVO pageUserVO) {
+ public Page<UmsAdmin> pageUser(UserVO.PageUserVO pageUserVO) {
int pageSize = pageUserVO.getPageSize();
int current = pageUserVO.getCurrent();
Page<UmsAdmin> page = new Page<>(current, pageSize);
- LambdaQueryWrapper<UmsAdmin> queryWrapper = new LambdaQueryWrapper<>();
-
- if (StringUtils.isNotBlank(pageUserVO.getKeyword())) {
- queryWrapper.like(UmsAdmin::getUsername, pageUserVO.getKeyword())
- .or().like(UmsAdmin::getNickName, pageUserVO.getKeyword())
- .or().like(UmsAdmin::getMobile, pageUserVO.getKeyword());
- }
- if (StringUtils.isNotBlank(pageUserVO.getJobTitle())) {
- queryWrapper.eq(UmsAdmin::getJobTitle, pageUserVO.getJobTitle());
- }
- if (PojoUtils.Vo.isUsefulSearchParam(pageUserVO.getUserType())) {
- queryWrapper.eq(UmsAdmin::getUserType, pageUserVO.getUserType());
- }
- if (PojoUtils.Vo.isUsefulSearchParam(pageUserVO.getDepartmentId())) {
- queryWrapper.eq(UmsAdmin::getDepartmentId, pageUserVO.getDepartmentId());
- }
- Page<UmsAdmin> page1 = baseMapper.selectPage(page, queryWrapper);
- List<UmsAdmin> records = page1.getRecords();
- if (CollUtil.isNotEmpty(records)) {
- records.forEach(e -> {
- UmsDepart umsDepart = departService.getById(e.getDepartmentId());
- if (null != umsDepart) {
- e.setDepartName(umsDepart.getDepartName());
- }
- //鑾峰彇瑙掕壊鍒楄〃
- List<UmsRole> roles = umsRoleMapper.getRoleList(e.getId());
- e.setRoles(roles);
- });
- }
- return page1;
+ return umsAdminMapper.selectPageByWordKey(page,pageUserVO.getKeyword());
}
@Override
diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsDepartManageServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsDepartManageServiceImpl.java
index d0c2e46..9a792f3 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsDepartManageServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsDepartManageServiceImpl.java
@@ -145,9 +145,5 @@
umsDepartManage.setCreateTime(new Date());
umsDepartManage.setDepartId(departId);
umsDepartManageMapper.insert(umsDepartManage);
- UmsAdmin umsAdmin = new UmsAdmin();
- umsAdmin.setDepartmentId(departId);
- umsAdmin.setId(userId);
- umsAdminService.updateById(umsAdmin);
}
}
\ No newline at end of file
diff --git a/ycl-common/src/main/java/com/ycl/vo/user/UserVO.java b/ycl-common/src/main/java/com/ycl/vo/user/UserVO.java
index e75ae4c..75a31a4 100644
--- a/ycl-common/src/main/java/com/ycl/vo/user/UserVO.java
+++ b/ycl-common/src/main/java/com/ycl/vo/user/UserVO.java
@@ -15,19 +15,6 @@
@Data
@ApiModel
public static class PageUserVO extends BasePageVO {
- @ApiModelProperty(value = "閮ㄩ棬id,0鍗充负鏌ヨ鍏ㄩ儴锛岄粯璁�0",example = "0")
- private Long departmentId;
-
-
- @ApiModelProperty(value = "鐢ㄦ埛绫诲瀷,0鍗充负鏌ヨ鍏ㄩ儴锛岄粯璁�0",example = "0")
- private byte userType;
-
- @ApiModelProperty(value = "鑱屽姟")
- private String jobTitle;
-
- @ApiModelProperty(value = "鐢佃瘽")
- private String mobile;
-
@ApiModelProperty(value = "鍏抽敭瀛�")
private String keyword;
diff --git a/ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml b/ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml
index 5ae33ba..e6e2e2c 100644
--- a/ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml
+++ b/ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml
@@ -18,10 +18,64 @@
<result column="ip_address" property="ipAddress"/>
<result column="is_dy" property="isDy"/>
<result column="job_title" property="jobTitle"/>
- <result column="department_id" property="departmentId"/>
<result column="user_type" property="userType"/>
<result column="zj" property="zj"/>
<result column="mobile" property="mobile"/>
+ </resultMap>
+ <resultMap type="com.ycl.entity.user.UmsAdmin" id="CondMapResultMap" extends="BaseResultMap">
+ <association property="depart" javaType="com.ycl.entity.depart.UmsDepart">
+ <id column="depart_id" property="id"/>
+ <result column="depart_name" property="departName"/>
+ <result column="depart_des" property="departDes"/>
+ <result column="depart_type" property="departType"/>
+ <result column="parent_id" property="parentId"/>
+ <result column="depart_status" property="status"/>
+ <result column="depart_create_time" property="createTime"/>
+ <result column="depart_update_time" property="updateTime"/>
+ <result column="is_deleted" property="isDeleted"/>
+ </association>
+ <collection property="roles" javaType="ArrayList" ofType="com.ycl.entity.user.UmsRole">
+ <id column="role_id" property="id" />
+ <result column="name" property="name" />
+ <result column="description" property="description" />
+ <result column="admin_count" property="adminCount" />
+ <result column="role_create_time" property="createTime" />
+ <result column="role_status" property="status" />
+ <result column="sort" property="sort" />
+ </collection>
+ </resultMap>
+
+ <resultMap id="adminMap" type="com.ycl.entity.user.UmsAdmin">
+ <id column="id" property="id"/>
+ <result column="username" property="username"/>
+ <result column="password" property="password"/>
+ <result column="icon" property="icon"/>
+ <result column="email" property="email"/>
+ <result column="nick_name" property="nickName"/>
+ <result column="note" property="note"/>
+ <result column="create_time" property="createTime"/>
+ <result column="login_time" property="loginTime"/>
+ <result column="status" property="status"/>
+ <result column="mac_address" property="macAddress"/>
+ <result column="ip_address" property="ipAddress"/>
+ <result column="is_dy" property="isDy"/>
+ <result column="job_title" property="jobTitle"/>
+ <result column="depart_name" property="departName"/>
+ <result column="departmentId" property="departmentId"/>
+ <result column="user_type" property="userType"/>
+ <result column="zj" property="zj"/>
+ <result column="mobile" property="mobile"/>
+ <!--涓�瀵瑰鏄犲皠鐢ㄨ繖涓� ofTyp鏄竴瀵瑰鐨勯泦鍚堢殑鎵�瀛樻斁鐨勫疄浣撶被 javaType瀹炰綋绫荤殑灞炴�х被鍨�-->
+ <collection property="roles" ofType="com.ycl.entity.user.UmsRole" javaType="list" column="id"
+ select="selectAdminRoles">
+ <id column="id" property="id"/>
+ <result column="name" property="name"/>
+ <result column="description" property="description"/>
+ <result column="admin_count" property="adminCount"/>
+ <result column="create_time" property="createTime"/>
+ <result column="status" property="status"/>
+ <result column="sort" property="sort"/>
+ </collection>
</resultMap>
<select id="getAdminIdList" resultType="java.lang.Long">
@@ -30,5 +84,71 @@
LEFT JOIN ums_admin_role_relation ar ON rr.role_id = ar.role_id
WHERE rr.resource_id = #{resourceId}
</select>
+ <select id="selectPageByWordKey" resultMap="adminMap">
+ SELECT t1.*,
+ t3.depart_name,
+ t3.id as departmentId
+ FROM `ums_admin` t1
+ LEFT JOIN ums_depart_manager t2 ON t1.id = t2.user_id
+ LEFT JOIN ums_depart t3 ON t2.depart_id = t3.id
+ <where>
+ <if test="keyword !=null and keyword !='' ">
+ (
+ t1.username LIKE concat('%', #{keyword}, '%')
+ OR t1.nick_name LIKE concat('%', #{keyword}, '%')
+ OR t1.mobile LIKE concat('%', #{keyword}, '%')
+ )
+ </if>
+ </where>
+ </select>
+ <select id="selectAdminRoles" resultType="com.ycl.entity.user.UmsRole">
+ select t5.*
+ from `ums_admin` t1
+ left join ums_admin_role_relation t4 on t1.id = t4.admin_id
+ left join
+ ums_role t5 on t4.role_id = t5.id
+ where t1.id=#{id}
+ </select>
+
+ <select id="selectCondPage" parameterType="com.ycl.entity.user.UmsAdmin" resultMap="CondMapResultMap">
+ SELECT
+ ua.*,
+ ud.id depart_id,
+ ud.depart_name,
+ ud.depart_des,
+ ud.depart_type,
+ ud.parent_id,
+ ud.create_time depat_create_time,
+ ud.update_time depat_update_time,
+ ud.STATUS depart_status,
+ ud.is_deleted,
+ ur.id role_id,
+ ur.id NAME,
+ ur.description,
+ ur.admin_count,
+ ur.create_time role_create_time,
+ ur.STATUS role_status,
+ ur.sort
+ FROM
+ ums_admin ua
+ LEFT JOIN ums_depart_manager udm ON ua.id = udm.user_id
+ LEFT JOIN ums_depart ud ON udm.depart_id = ud.id
+ LEFT JOIN ums_admin_role_relation uarr ON ua.id = uarr.admin_id
+ LEFT JOIN ums_role ur ON uarr.role_id = ur.id
+ where 1=1
+ <if test="umsAdmin.keyword !=null and umsAdmin.keyword =''">
+ AND (ua.username LIKE concat('%',#{umsAdmin.keyword,jdbcType=VARCHAR},'%')
+ or ua.nick_name LIKE concat('%',#{umsAdmin.keyword,jdbcType=VARCHAR},'%')
+ or ua.mobile ua.nick_name LIKE concat('%',#{umsAdmin.keyword,jdbcType=VARCHAR},'%'))
+ </if>
+ <if test="umsAdmin.userType !=null and umsAdmin.userType >=0 ">
+ AND ua.user_type = #{umsAdmin.userType}
+ </if>
+ <if test="umsAdmin.jobTitle !=null and umsAdmin.jobTitle=''">
+ AND ua.job_title = #{umsAdmin.jobTitle}
+ </if>
+ ORDER BY
+ ua.id DESC
+ </select>
</mapper>
diff --git a/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java b/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java
index 1ffd7d9..959dbf2 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java
@@ -67,10 +67,7 @@
.storeName(umsStoreInfoParam.getStorename())
.contact(umsStoreInfoParam.getContact())
.storeAddress(umsStoreInfoParam.getStoreaddr())
- .storePhoto(umsStoreInfoParam.getStorephoto())
- .idCardInfo(umsStoreInfoParam.getIdcardinfo())
.storeNumber(utilNumber.createShopCode())
- .storeScore(umsStoreInfoParam.getStorescore())
.type(umsStoreInfoParam.getType())
.description(umsStoreInfoParam.getDescription())
.build();
diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
index 4ab84c8..80657f5 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
@@ -116,7 +116,7 @@
usr2.region_name community_text,
ua.username create_user_text
FROM ums_base_case ubc
- LEFT JOIN ums_data_dictionary udd on ubc.category = udd.id and udd.type_code = '01'
+ LEFT JOIN ums_data_dictionary udd on ubc.category = udd.id
LEFT JOIN ums_sccg_region usr on ubc.street_id = usr.id
LEFT JOIN ums_sccg_region usr2 on ubc.community_id = usr2.id
LEFT JOIN ums_admin ua on ubc.create_user = ua.id
diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/PartyInfoMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/PartyInfoMapper.xml
index ad8472e..561df96 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/PartyInfoMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/PartyInfoMapper.xml
@@ -38,9 +38,9 @@
udd3.name nation_text
FROM
ums_party_info upi
- LEFT JOIN ums_data_dictionary udd on upi.certificate_type = udd.id and udd.type_code = '03'
- LEFT JOIN ums_data_dictionary udd2 on upi.education_degree = udd2.id and udd2.type_code = '04'
- LEFT JOIN ums_data_dictionary udd3 on upi.nation = udd3.id and udd3.type_code = '05'
+ LEFT JOIN ums_data_dictionary udd on upi.certificate_type = udd.id
+ LEFT JOIN ums_data_dictionary udd2 on upi.education_degree = udd2.id
+ LEFT JOIN ums_data_dictionary udd3 on upi.nation = udd3.id
WHERE
upi.`id` = #{id}
</select>
diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/ViolationsMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/ViolationsMapper.xml
index bc3d42d..ca15c09 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/ViolationsMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/ViolationsMapper.xml
@@ -34,9 +34,9 @@
udd3.name grade_text
FROM
ums_violations uv
- LEFT JOIN ums_data_dictionary udd on uv.category_id = udd.id and udd.type_code = '01'
- LEFT JOIN ums_data_dictionary udd2 on uv.type_id = udd2.id and udd2.type_code = '01'
- LEFT JOIN ums_data_dictionary udd3 on uv.grade_id = udd3.id and udd3.type_code = '02'
+ LEFT JOIN ums_data_dictionary udd on uv.category_id = udd.id
+ LEFT JOIN ums_data_dictionary udd2 on uv.type_id = udd2.id
+ LEFT JOIN ums_data_dictionary udd3 on uv.grade_id = udd3.id
WHERE
uv.`id` = #{id}
</select>
--
Gitblit v1.8.0