Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc into V0.0.2

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysUserController.java

@@ -30,6 +30,7 @@ import com.xunmei.system.api.dto.SysPlanOrgDTO;
 import com.xunmei.system.mapper.SysOrgMapper;
 import com.xunmei.system.service.*;
 import com.xunmei.system.util.UserExport;
+import com.xunmei.system.util.UserImport;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.BeanUtils;
@@ -511,8 +512,8 @@ public class SysUserController extends BaseController {
             AtomicInteger xh = new AtomicInteger();
             xh.getAndIncrement();
             list.forEach(e -> {
-                if (e.getIsManager() == null) {
-                    e.setIsManager("N");
+                if (e.getIsManage() == null) {
+                    e.setIsManage("N");
                 }
                 e.setXh(String.valueOf(xh.getAndIncrement()));
             });
@@ -548,13 +549,13 @@ public class SysUserController extends BaseController {
         if (ObjectUtil.isEmpty(list)) {
             throw new RuntimeException("导出数据为空!");
         }
-        list = list.stream().filter(e -> "Y".equals(e.getIsManager())).collect(Collectors.toList());
+        list = list.stream().filter(e -> "Y".equals(e.getIsManage())).collect(Collectors.toList());
 
         AtomicInteger xh = new AtomicInteger();
         xh.getAndIncrement();
         list.forEach(e -> {
-            if (e.getIsManager() == null) {
-                e.setIsManager("N");
+            if (e.getIsManage() == null) {
+                e.setIsManage("N");
             }
             e.setXh(String.valueOf(xh.getAndIncrement()));
         });
@@ -586,12 +587,12 @@ public class SysUserController extends BaseController {
     @PostMapping("/importData")
     @Transactional(rollbackFor = {RuntimeException.class, Exception.class})
     public AjaxResult importData(MultipartFile file, boolean updateSupport) {
-        List<UserExport> list = new ArrayList<>();
+        List<UserImport> list = new ArrayList<>();
         // 读取excel
-        EasyExcel.read(multipartFileToFile(file), UserExport.class, new AnalysisEventListener<UserExport>() {
+        EasyExcel.read(multipartFileToFile(file), UserImport.class, new AnalysisEventListener<UserImport>() {
             // 每解析一行数据,该方法会被调用一次
             @Override
-            public void invoke(UserExport user, AnalysisContext analysisContext) {
+            public void invoke(UserImport user, AnalysisContext analysisContext) {
 //                System.out.println("解析数据为:" + user.toString());
                 if (user.getName() != null) {
                     list.add(user);
@@ -602,18 +603,20 @@ public class SysUserController extends BaseController {
             @Override
             public void doAfterAllAnalysed(AnalysisContext analysisContext) {
 //                System.out.println("解析完成...");
-                List<String> names = list.stream().map(UserExport::getName).collect(Collectors.toList());
+                List<String> names = list.stream().map(UserImport::getName).collect(Collectors.toList());
                 List<String> exist = userService.selectCountByNames(names);
                 if (exist.size() > 0) {
                     throw new RuntimeException("用户" + exist + "已存在");
                 }
                 // 将解析的数据保存到数据库
-                for (UserExport u : list) {
+                for (UserImport u : list) {
                     //构建基础user对象
                     SysUser user = new SysUser();
                     BeanUtils.copyProperties(u, user);
                     user.setDeleted(0);
-                    user.setIsLock("启用".equals(u.getIsLock()) ? "1" : "0");
+                    user.setIsLock("正常".equals(u.getIsLock()) ? "0" : "1");
+                    user.setGender("男".equals(u.getGender()) ? "0" : "1");
+                    user.setIsManage("是".equals(u.getIsManage()) ? "Y" : "N");
                     SysOrg org = orgMapper.selectOne(new LambdaQueryWrapper<SysOrg>().eq(SysOrg::getShortName, u.getOrgName()).eq(SysOrg::getDeleted, 0));
                     if (org == null) {
                         throw new RuntimeException("机构" + u.getOrgName() + "不存在");

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/util/UserExport.java

@@ -31,15 +31,16 @@ public class UserExport {
     private String roleNames;
     @ExcelProperty(value = "手机号码", index = 5)
     private String phone;
-    @ExcelProperty(value = "状态", index = 6, converter = UserStatusConverter.class)
+    @ExcelProperty(value = "性别", index = 6, converter = GenderConverter.class)
+    private String gender;
+    @ExcelProperty(value = "状态", index = 7, converter = UserStatusConverter.class)
     private String isLock;
-    @ExcelProperty(value = "安保部门从业人员", index = 7, converter = UserManagerConverter.class)
-    private String isManager;
+    @ExcelProperty(value = "安保部门从业人员", index = 8, converter = UserManagerConverter.class)
+    private String isManage;
 
-    @ExcelProperty(value = "登录IP", index = 8)
+    @ExcelProperty(value = "登录IP", index = 9)
     private String lastIp;
-    @ExcelProperty(value = "登录时间", index = 9)
+    @ExcelProperty(value = "登录时间", index = 10)
     private Date lastTime;
-    @ExcelProperty(value = "性别", index = 10, converter = GenderConverter.class)
-    private String gender;
+
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/util/UserImport.java

@@ -0,0 +1,45 @@
+package com.xunmei.system.util;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author :LuoWei
+ * @date : 2023/11/15
+ */
+@Data
+@ColumnWidth(15) //列宽,最大值为255
+@HeadRowHeight(16) //表头行高
+@ContentRowHeight(16) //数据行高
+public class UserImport {
+    @ExcelProperty(value = "序号", index = 0)
+    @TableField(exist = false)
+    private String xh;
+    @ExcelProperty(value = "用户账号", index = 1)
+    private String username;
+    @ExcelProperty(value = "用户姓名", index = 2)
+    private String name;
+    @ExcelProperty(value = "所属机构", index = 3)
+    private String orgName;
+    @ExcelProperty(value = "用户角色", index = 4)
+    private String roleNames;
+    @ExcelProperty(value = "手机号码", index = 5)
+    private String phone;
+    @ExcelProperty(value = "性别", index = 6)
+    private String gender;
+    @ExcelProperty(value = "状态", index = 7)
+    private String isLock;
+    @ExcelProperty(value = "安保部门从业人员")
+    private String isManage;
+
+    @ExcelProperty(value = "登录IP", index = 9)
+    private String lastIp;
+    @ExcelProperty(value = "登录时间", index = 10)
+    private Date lastTime;
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/util/UserStatusConverter.java

@@ -28,11 +28,11 @@ public class UserStatusConverter implements Converter<String> {
     @Override
     public CellData convertToExcelData(String isLock, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
         if ("0".equals(isLock)) {
-            return new CellData("启用");
+            return new CellData("正常");
         } else if ("1".equals(isLock)) {
-            return new CellData("禁用");
+            return new CellData("停用");
         } else {
-            return new CellData("禁用");
+            return new CellData("停用");
         }
 
     }

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -503,7 +503,7 @@
             AND t.is_manage ='Y'
         </if>
         <if test="info.onlyManager ==false or info.onlyManager==null">
-            AND t.is_manage is NULL
+            AND (t.is_manage is NULL OR t.is_manage ='N')
         </if>
         ORDER BY t.org_id DESC
     </select>