用户激活功能修改

src/main/java/com/neotel/smfcore/common/utils/UserCodeUtil.java

@@ -34,11 +34,19 @@ public class UserCodeUtil {
             }
             //重新保存
             CsvWriter writer=new CsvWriter(targetFile);
-            String[] headers=new String[]{"用户ID","用户名","角色","邮箱","状态","语言","创建日期","启用码"};
+//            String[] headers=new String[]{"用户ID","用户名","角色","邮箱","状态","语言","创建日期","启用码"};
+//            writer.writeRecord(headers);
+//            for (User user :
+//                    list) {
+//                String[] userStr=new String[]{user.getId(),user.getUsername(),user.getRoleId(),user.getEmail(),"启用",user.getLanguage(),DateUtil.toDateString(user.getCreateDate()),user.getCheckCode()  };
+//
+//                writer.writeRecord(userStr);
+//            }
+            String[] headers=new String[]{"用户ID","用户名", "状态", "创建日期","启用码"};
             writer.writeRecord(headers);
             for (User user :
                     list) {
-                String[] userStr=new String[]{user.getId(),user.getUsername(),user.getRoleId(),user.getEmail(),"启用",user.getLanguage(),DateUtil.toDateString(user.getCreateDate()),user.getCheckCode()  };
+                String[] userStr=new String[]{user.getId(),user.getUsername(), "启用",DateUtil.toDateString(user.getCreateDate()),user.getCheckCode()  };
 
                 writer.writeRecord(userStr);
             }
@@ -66,10 +74,10 @@ public class UserCodeUtil {
 
         int idIndex = getCsvIndex(csvRead,"用户ID","ID");
         int usernameIndex = getCsvIndex(csvRead,"用户名","UserName");
-        int roleIndex = getCsvIndex(csvRead,"角色","RoleId");
-        int emailIndex=getCsvIndex(csvRead,"邮箱","Email");
+//        int roleIndex = getCsvIndex(csvRead,"角色","RoleId");
+//        int emailIndex=getCsvIndex(csvRead,"邮箱","Email");
         int enableIndex=getCsvIndex(csvRead,"状态","Enable");
-        int lanIndex=getCsvIndex(csvRead,"语言","Language");
+//        int lanIndex=getCsvIndex(csvRead,"语言","Language");
         int timeIndex=getCsvIndex(csvRead,"创建日期","CreateDate");
         int codeIndex = getCsvIndex(csvRead,"启用码","CheckCode");
 
@@ -83,18 +91,20 @@ public class UserCodeUtil {
             String id = lineValues[idIndex];
             String checkCode = lineValues[codeIndex];
             String username=lineValues[usernameIndex];
-            String email=lineValues[emailIndex];
+//            String email=lineValues[emailIndex];
             String enable=lineValues[enableIndex];
             String createDate=lineValues[timeIndex];
-            String roleId=lineValues[roleIndex];
-            String langu=lineValues[lanIndex];
+//            String roleId=lineValues[roleIndex];
+//            String langu=lineValues[lanIndex];
             if( username.isEmpty() || id.isEmpty()||createDate.isEmpty()){
                 log.warn("第"+row+"行中有空白内容,此行忽略");
                 continue;
             }
 
             Date createData=new Date(createDate);
-
+            String email="";
+            String langu="";
+            String roleId="";
             User user=new User(username,email,langu,roleId,"",true
             ,false,new Date(),new HashSet<>(),"");
             user.setId(id);

src/main/java/com/neotel/smfcore/core/barcode/rest/BarcodeController.java

@@ -62,7 +62,7 @@ public class BarcodeController {
 
     @ApiOperation("查询条码")
     @GetMapping
-    @PreAuthorize("@el.check('barcode:list')")
+    @PreAuthorize("@el.check('barcode')")
     public PageData<BarcodeDto> query(BarcodeQueryCriteria criteria, Pageable pageable){
         Query query= QueryHelp.getQuery(criteria);
         PageData<Barcode> barcodes=barcodeManager.findByPage(query,pageable);
@@ -71,7 +71,7 @@ public class BarcodeController {
     }
     @ApiOperation("新增条码")
     @PostMapping
-    @PreAuthorize("@el.check('barcode:add')")
+    @PreAuthorize("@el.check('barcode')")
     public ResponseEntity<Object> create(@Validated @RequestBody BarcodeDto resources) {
         Barcode barcode=barcodeMapper.toEntity(resources);
         barcodeManager.saveBarcode(barcode);
@@ -80,7 +80,7 @@ public class BarcodeController {
 
     @ApiOperation("修改条码")
     @PutMapping
-    @PreAuthorize("@el.check('barcode:edit')")
+    @PreAuthorize("@el.check('barcode')")
     public ResponseEntity<Object> update(@Validated @RequestBody BarcodeDto resources) {
         Barcode barcode=barcodeMapper.toEntity(resources);
         if (barcode.getId() == null) {
@@ -91,7 +91,7 @@ public class BarcodeController {
     }
     @ApiOperation("删除条码")
     @DeleteMapping
-    @PreAuthorize("@el.check('barcode:del')")
+    @PreAuthorize("@el.check('barcode')")
     public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
 
         List<Barcode> barcodes = new ArrayList<Barcode>();
@@ -107,14 +107,14 @@ public class BarcodeController {
 
     @ApiOperation("获取条码规则")
     @GetMapping("/rule")
-    @PreAuthorize("@el.check('barcode:setting')")
+    @PreAuthorize("@el.check('barcode')")
     public List<String> getRules(){
         return dataCache.getSettings().getCodeRuleList();
     }
 
     @ApiOperation("修改条码规则")
     @PutMapping("/rule")
-    @PreAuthorize("@el.check('barcode:setting')")
+    @PreAuthorize("@el.check('barcode')")
     public ResponseEntity<Object> updateRules(@Validated @RequestBody List<String> codeRules) {
         if(codeRules.isEmpty()){
             throw new ValidateException("smfcode.valueCanotNull","{0}不能为空",new String[]{"codeRuleList"} );

src/main/java/com/neotel/smfcore/core/system/rest/SettingsController.java

@@ -44,7 +44,7 @@ public class SettingsController {
 
     @ApiOperation("修改设置信息")
     @PutMapping
-    @PreAuthorize("@el.check('settings:edit')")
+    @PreAuthorize("@el.check('settings')")
     public ResponseEntity<Object> update(@Validated @RequestBody SettingsDto settingsDto) {
 
         if(settingsDto.getMaxHumidity()<=settingsDto.getMinHumidity()){

src/main/java/com/neotel/smfcore/security/rest/GroupController.java

@@ -74,7 +74,7 @@ public class GroupController {
 
     @ApiOperation("返回全部的分组")
     @GetMapping(value = "/all")
-    @PreAuthorize("@el.check('group:list','user:add','user:edit')")
+    @PreAuthorize("@el.check('group:list')")
     public ResponseEntity<Object> query() {
         Query query = new Query();
         List<Group> groups = groupManager.findByQuery(query);
@@ -82,7 +82,7 @@ public class GroupController {
     }
     @ApiOperation("料架分组界面的组列表")
     @GetMapping(value = "/lightGroups")
-    @PreAuthorize("@el.check('group:list','user:add','user:edit')")
+    @PreAuthorize("@el.check('group:list')")
     public ResponseEntity<Object> lightGroup() {
         Query query = new Query();
         List<Group> groups = groupManager.findByQuery(query);

src/main/java/com/neotel/smfcore/security/rest/UserController.java

@@ -299,7 +299,7 @@ public class UserController {
         }
 
 
-        log.info("上传用户，启用一下用户："+msg);
+        log.info("上传用户，启用以下用户："+msg);
         return msg;
     }
 }

src/main/java/com/neotel/smfcore/security/service/manager/impl/UserManagerImpl.java

@@ -169,10 +169,10 @@ public class UserManagerImpl implements IUserManager {
             Map<String, Object> map = new LinkedHashMap<>();
             map.put("用户ID", user.getId());
             map.put("用户名", user.getUsername());
-            map.put("角色", user.getRoleId());
-            map.put("邮箱", user.getEmail());
+//            map.put("角色", user.getRoleId());
+//            map.put("邮箱", user.getEmail());
             map.put("状态", user.getEnabled() ? "启用" : "禁用");
-            map.put("语言", user.getLanguage());
+//            map.put("语言", user.getLanguage());
             map.put("创建日期", DateUtil.toDateTimeString(user.getCreateDate()));
             map.put("启用码", "");
             list.add(map);