Merge branch 'master' of http://111.203.232.171:8888/lee/chnmuseum-party into master

src/main/java/cn/wisenergy/chnmuseum/party/common/log/SystemOperationLogService.java

@@ -8,6 +8,7 @@ import cn.wisenergy.chnmuseum.party.mapper.SysLogMapper;
 import cn.wisenergy.chnmuseum.party.model.SysLog;
 import cn.wisenergy.chnmuseum.party.model.TOperationLog;
 import cn.wisenergy.chnmuseum.party.model.TUser;
+import cn.wisenergy.chnmuseum.party.service.TOperationLogService;
 import cn.wisenergy.chnmuseum.party.service.impl.TUserServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import javassist.util.HotSwapper;
@@ -45,6 +46,9 @@ class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog> {
     @Autowired
     private TUserServiceImpl userService;
 
+    @Autowired
+    private TOperationLogService operationLogService;
+
     public SystemOperationLogService() {
         System.out.println("Aop");
     }
@@ -97,21 +101,21 @@ class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog> {
         String operatingcontent = "";
         Object[] method_param = null;
 
-        Object object;
-        try {
-            method_param = point.getArgs(); //获取方法参数
-            // String param=(String) point.proceed(point.getArgs());
-            object = point.proceed();
-        } catch (Exception e) {
-            // 异常处理记录日志..log.error(e);
-            throw e;
-        }
+//        Object object;
+//        try {
+//            method_param = point.getArgs(); //获取方法参数
+//            // String param=(String) point.proceed(point.getArgs());
+//            object = point.proceed();
+//        } catch (Exception e) {
+//            // 异常处理记录日志..log.error(e);
+//            throw e;
+//        }
         if (methodLog.operModule().getMsg().contains("运维")) {
             TOperationLog operationLog = new TOperationLog();
             operationLog.setCreateTime(LocalDateTime.now());
             operationLog.setUserId(user.getId());
             operationLog.setOperationType(methodLog.operType().getMsg());
-            return object;
+            return operationLogService.save(operationLog);
         }
         SysLog sysLog = new SysLog();
         if ("1".equals(user.getId())) {
@@ -127,8 +131,8 @@ class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog> {
         // 处理设置注解上的参数
         getControllerMethodDescription(methodLog, sysLog);
 
-        sysLogMapper.insert(sysLog);
-        return object;
+        int insert = sysLogMapper.insert(sysLog);
+        return insert;
     }
 
     /**

src/main/java/cn/wisenergy/chnmuseum/party/common/mybatis/MysqlGenerator.java

@@ -3,7 +3,7 @@ package cn.wisenergy.chnmuseum.party.common.mybatis;
 public class MysqlGenerator {
 
     private static final String[] tableNames = new String[]{
-            "t_area"
+            "t_box_operation"
     };
     private static final String projectPath = "D:\\develop\\Project\\chnmuseum-party";
 //    private static final String projectPath = "/opt/ss";

src/main/java/cn/wisenergy/chnmuseum/party/common/util/RandomUtil.java

@@ -32,4 +32,28 @@ public class RandomUtil {
 		return retStr;
 	}
 
+	public static String createLetterRandom(int length) {
+		String retStr = null;
+		String strTable = "1234567890abcdefghijklmnopqrstuvwxyz";
+		int len = strTable.length();
+		boolean bDone = true;
+		do {
+			retStr = "";
+			int count = 0;
+			for (int i = 0; i < length; i++) {
+				double dblR = Math.random() * len;
+				int intR = (int) Math.floor(dblR);
+				char c = strTable.charAt(intR);
+				if (('0' <= c) && (c <= '9')) {
+					count++;
+				}
+				retStr += strTable.charAt(intR);
+			}
+			if (count >= 2) {
+				bDone = false;
+			}
+		} while (bDone);
+		return retStr;
+	}
+
 }

src/main/java/cn/wisenergy/chnmuseum/party/mapper/TBoxOperationMapper.java

+package cn.wisenergy.chnmuseum.party.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import cn.wisenergy.chnmuseum.party.model.TBoxOperation;
+
+import java.util.List;
+
+/**
+ * <pre>
+ * 机顶盒运维信息 Mapper 接口
+ * </pre>
+ *
+ * @author Danny Lee
+ * @since 2021-03-25
+ */
+public interface TBoxOperationMapper extends BaseMapper<TBoxOperation> {
+
+    List<TBoxOperation> getList();
+}

src/main/java/cn/wisenergy/chnmuseum/party/mapper/TOrganMapper.java

@@ -18,4 +18,6 @@ public interface TOrganMapper extends BaseMapper<TOrgan> {
     List<Map<String,Object>> selectArea();
 
     TOrgan getById(String id);
+
+    TOrgan selectCodeMax(String parentId);
 }

src/main/java/cn/wisenergy/chnmuseum/party/model/TBoxOperation.java

+package cn.wisenergy.chnmuseum.party.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import cn.wisenergy.chnmuseum.party.common.validator.groups.Add;
+import cn.wisenergy.chnmuseum.party.common.validator.groups.Update;
+import com.baomidou.mybatisplus.annotation.TableField;
+
+/**
+ * <p>
+ * 机顶盒运维信息
+ * </p>
+ *
+ * @author Danny Lee
+ * @since 2021-03-25
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@TableName("t_box_operation")
+@ApiModel(value = "机顶盒运维信息", description = "机顶盒运维信息")
+public class TBoxOperation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    @NotNull(message = "不能为空", groups = {Update.class})
+    private String id;
+
+    @ApiModelProperty("机顶盒所属单位id")
+    @TableField("organ_id")
+    private String organId;
+    
+    @ApiModelProperty("mac地址")
+    @TableField("mac")
+    private String mac;
+    
+    @ApiModelProperty("状态 1.未激活 2.已激活 3.故障")
+    @TableField("status")
+    private Integer status;
+    
+    @ApiModelProperty("区域id")
+    @TableField("area_id")
+    private String areaId;
+    
+    @ApiModelProperty("创建时间")
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+    
+    @ApiModelProperty("修改时间")
+    @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty("机构名")
+    @TableField(exist = false)
+    private String organName;
+
+
+}

src/main/java/cn/wisenergy/chnmuseum/party/model/TOrgan.java

@@ -59,6 +59,11 @@ public class TOrgan implements Serializable {
     @TableField("parent_id")
         @NotBlank(message = "父机构ID不能为空", groups = {Add.class, Update.class})
         private String parentId;
+
+    @ApiModelProperty("编码")
+    @TableField("code")
+    @NotBlank(message = "编码", groups = {Add.class, Update.class})
+    private String code;
     
     @ApiModelProperty("0：未删除，1：已删除")
     @TableField("is_deleted")
@@ -108,8 +113,4 @@ public class TOrgan implements Serializable {
     @TableField(exist = false)
     private List<String> areas;
 
-    @ApiModelProperty("当前操作级别")
-    @TableField(exist = false)
-    private Integer currentLevel;
-
 }

src/main/java/cn/wisenergy/chnmuseum/party/model/TUser.java

@@ -138,7 +138,7 @@ public class TUser implements Serializable {
     private List<Role> roleList;
 
     @ApiModelProperty("密码")
-    @TableField(exist = false)
+    @TableField("password")
     private String password;
 
     @ApiModelProperty("区域名")
@@ -149,6 +149,10 @@ public class TUser implements Serializable {
     @TableField(exist = false)
     private List<String> areas;
 
+    @ApiModelProperty("状态名称")
+    @TableField(exist = false)
+    private String statusName;
+
 
     @TableField(exist = false)
     private String jwtToken;

src/main/java/cn/wisenergy/chnmuseum/party/service/TBoxOperationService.java

+package cn.wisenergy.chnmuseum.party.service;
+
+import cn.wisenergy.chnmuseum.party.model.TBoxOperation;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 机顶盒运维信息 服务接口
+ * </p>
+ *
+ * @author Danny Lee
+ * @since 2021-03-25
+ */
+public interface TBoxOperationService extends IService<TBoxOperation> {
+
+    List<TBoxOperation> getList();
+}

src/main/java/cn/wisenergy/chnmuseum/party/service/TOrganService.java

@@ -20,4 +20,6 @@ public interface TOrganService extends IService<TOrgan> {
     boolean batchUpload(List excelList);
 
     TOrgan selectById(String id);
+
+    TOrgan selectCodeMax(String parentId);
 }

src/main/java/cn/wisenergy/chnmuseum/party/service/impl/TBoxOperationServiceImpl.java

+package cn.wisenergy.chnmuseum.party.service.impl;
+
+import cn.wisenergy.chnmuseum.party.model.TBoxOperation;
+import cn.wisenergy.chnmuseum.party.mapper.TBoxOperationMapper;
+import cn.wisenergy.chnmuseum.party.service.TBoxOperationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+/**
+ * <pre>
+ * 机顶盒运维信息 服务实现类
+ * </pre>
+ *
+ * @author Danny Lee
+ * @since 2021-03-25
+ */
+@Slf4j
+@Service
+public class TBoxOperationServiceImpl extends ServiceImpl<TBoxOperationMapper, TBoxOperation> implements TBoxOperationService {
+
+    @Autowired
+    private TBoxOperationMapper tBoxOperationMapper;
+
+    @Override
+    public List<TBoxOperation> getList() {
+        return tBoxOperationMapper.getList();
+    }
+}

src/main/java/cn/wisenergy/chnmuseum/party/service/impl/TOrganServiceImpl.java

@@ -104,4 +104,9 @@ public class TOrganServiceImpl extends ServiceImpl<TOrganMapper, TOrgan> impleme
         organ.setChildren(list1);
         return organ;
     }
+
+    @Override
+    public TOrgan selectCodeMax(String parentId) {
+        return organMapper.selectCodeMax(parentId);
+    }
 }

src/main/java/cn/wisenergy/chnmuseum/party/service/impl/TUserServiceImpl.java

@@ -41,7 +41,19 @@ public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements
 
     @Override
     public Page<TUser> getList(Page<TUser> page, String userName) {
-        return page.setRecords(tUserMapper.getList(userName));
+        List<TUser> list = tUserMapper.getList(userName);
+        for (TUser user : list) {
+            if ("2".equals(user.getAuditStatus())||"4".equals(user.getAuditStatus())){
+                if ("1".equals(user.getStatus())){
+                    user.setStatusName("活跃");
+                }else {
+                    user.setStatusName("禁用");
+                }
+            }else {
+                user.setStatusName("待审核");
+            }
+        }
+        return page.setRecords(list);
     }
 
     @Override

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/RoleController.java

@@ -644,7 +644,7 @@ public class RoleController extends BaseController {
     @ApiOperation(value = "获取角色下拉框数据")
     @RequestMapping(value = "/getRoleBox", method = RequestMethod.GET)
     @RequiresPermissions("/role/getRoleBox")
-    public ResponseEntity<List<Role>> getRoleBox() {
+    public Map<String,Object> getRoleBox() {
         try {
             QueryWrapper<Role> ew = new QueryWrapper<>();
             ew.select("id", "name");
@@ -652,10 +652,11 @@ public class RoleController extends BaseController {
             ew.eq("status", 1);
             ew.orderByAsc("sortorder");
             ew.orderByDesc("create_time");
-            return ResponseEntity.ok(this.roleService.list(ew));
+            List<Role> list = roleService.list(ew);
+            return getResult(list);
         } catch (Exception e) {
             LOGGER.error("查询角色列表出错!", e);
         }
-        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
+        return getFailResult();
     }
 }

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TBoxOperationController.java

+package cn.wisenergy.chnmuseum.party.web.controller;
+
+import cn.wisenergy.chnmuseum.party.auth.SHA256PasswordEncryptionService;
+import cn.wisenergy.chnmuseum.party.model.TUser;
+import cn.wisenergy.chnmuseum.party.service.impl.TUserServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController;
+import cn.wisenergy.chnmuseum.party.model.TBoxOperation;
+import cn.wisenergy.chnmuseum.party.service.TBoxOperationService;
+import cn.wisenergy.chnmuseum.party.common.enums.AuditStatusEnum;
+import cn.wisenergy.chnmuseum.party.common.validator.groups.Add;
+import cn.wisenergy.chnmuseum.party.common.validator.groups.Update;
+import cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.cglib.core.Local;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.stereotype.Controller;
+
+import javax.annotation.Resource;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <pre>
+ * 机顶盒运维信息 前端控制器
+ * </pre>
+ *
+ * @author Danny Lee
+ * @since 2021-03-25
+ */
+@Slf4j
+@RestController
+@RequestMapping("/boxOperation")
+@Api(tags = {"机顶盒运维信息操作接口"})
+public class TBoxOperationController extends BaseController {
+
+    @Resource
+    private TBoxOperationService tBoxOperationService;
+
+    @Resource
+    private TUserServiceImpl userService;
+
+    @PostMapping("/add")
+    @RequiresPermissions("/boxOperation/add")
+    @ApiOperation(value = "添加机顶盒运维信息", notes = "添加机顶盒运维信息")
+    public Map<String, Object> saveTBoxOperation(TBoxOperation tBoxOperation) {
+        // 保存业务节点信息
+        tBoxOperation.setCreateTime(LocalDateTime.now());
+        tBoxOperation.setUpdateTime(LocalDateTime.now());
+        boolean result = tBoxOperationService.save(tBoxOperation);
+        // 返回操作结果
+        if (result) {
+            return getSuccessResult();
+        } else {
+            // 保存失败
+            return getFailResult();
+        }
+    }
+
+    @PutMapping("/update")
+    @RequiresPermissions("/boxOperation/update")
+    @ApiOperation(value = "修改机顶盒运维信息信息", notes = "修改机顶盒运维信息信息")
+    public Map<String, Object> updateTBoxOperation(TBoxOperation tBoxOperation) {
+
+		try {
+			tBoxOperation.setUpdateTime(LocalDateTime.now());
+			boolean flag = tBoxOperationService.updateById(tBoxOperation);
+			UpdateWrapper<TUser> wrapper = new UpdateWrapper<>();
+			wrapper.eq("org_id",tBoxOperation.getOrganId());
+			wrapper.eq("type","3");
+			TUser user = userService.getOne(wrapper);
+			String password = user.getPassword();
+			if (flag&&user!=null) {
+				return getResult(password);
+			}
+			return getFailResult();
+		} catch (Exception e) {
+			return getFailResult();
+		}
+    }
+
+    @DeleteMapping("/delete")
+    @RequiresPermissions("/boxOperation/delete")
+    @ApiOperation(value = "根据ID删除机顶盒运维信息", notes = "根据ID删除机顶盒运维信息")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String")
+    })
+    public Map<String, Object> deleteTBoxOperation(@PathVariable("id") String id) {
+        boolean result = tBoxOperationService.removeById(id);
+        if (result) {
+            return getSuccessResult();
+        }
+        return getFailResult();
+    }
+
+    @GetMapping("/getList")
+    @RequiresPermissions("/boxOperation/getList")
+    @ApiOperation(value = "获取机顶盒运维信息全部列表(无分页)", notes = "获取机顶盒运维信息全部列表(无分页)")
+    public Map<String, Object> getTBoxOperationList() {
+        List<TBoxOperation> tBoxOperationList = tBoxOperationService.getList();
+        return getResult(tBoxOperationList);
+    }
+
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "_index", value = "分页起始偏移量", paramType = "query", dataType = "Integer"),
+            @ApiImplicitParam(name = "_size", value = "返回条数", paramType = "query", dataType = "Integer"),
+            @ApiImplicitParam(name = "organId", value = "所属单位", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "status", value = "状态 1.未激活 2.已激活 3.故障", paramType = "query", dataType = "Integer"),
+            @ApiImplicitParam(name = "areaId", value = "区域", paramType = "query", dataType = "String")
+    })
+    @PostMapping("/getPageList")
+    @RequiresPermissions("/boxOperation/getPageList")
+    @ApiOperation(value = "获取机顶盒运维信息分页列表", notes = "获取机顶盒运维信息分页列表")
+    public Map<String, Object> getTBoxOperationPageList(String organId, Integer status, String areaId) {
+        UpdateWrapper<TBoxOperation> wrapper = new UpdateWrapper<>();
+        if (StringUtils.isNotBlank(organId)) {
+            wrapper.eq("organ_id", organId);
+        }
+        if (status != null) {
+            wrapper.eq("status", status);
+        }
+        if (StringUtils.isNotBlank(areaId)) {
+            wrapper.eq("area_id", areaId);
+        }
+        wrapper.orderByDesc("create_time");
+        Page<TBoxOperation> page = this.tBoxOperationService.page(getPage(), wrapper);
+        return getResult(page);
+    }
+
+    @ApiOperation(value = "获取机顶盒运维信息详情", notes = "获取机顶盒运维信息详情")
+    @GetMapping("/getById")
+    @RequiresPermissions("/boxOperation/getById")
+    public Map<String, Object> getById(@PathVariable("id") String id) {
+        TBoxOperation tBoxOperation = tBoxOperationService.getById(id);
+        return getResult(tBoxOperation);
+    }
+
+}
+

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TOrganController.java

@@ -41,10 +41,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * <pre>
@@ -70,14 +67,12 @@ public class TOrganController extends BaseController {
     @PostMapping("/add")
     @RequiresPermissions("/organ/add")
     @ApiOperation(value = "添加机构", notes = "添加机构")
-    @MethodLog(operModule = OperModule.ORG,operType = OperType.ADD)
+//    @MethodLog(operModule = OperModule.ORG,operType = OperType.ADD)
     public Map<String, Object> add(TOrgan organ) {
         organ.setCreateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
         organ.setUpdateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
-        if(organ.getLevel()==2&&organ.getCurrentLevel()!=null&&organ.getCurrentLevel()==3){
-            TArea byId = tAreaService.getById(organ.getParentId());
-            organ.setParentId(byId.getParentId());
-        }
+        String organCode = getOrganCode(organ.getParentId());
+        organ.setCode(organCode);
         // 保存业务节点信息
         boolean result = tOrganService.save(organ);
         // 返回操作结果
@@ -92,8 +87,19 @@ public class TOrganController extends BaseController {
     @PutMapping("/update")
     @RequiresPermissions("/organ/update")
     @ApiOperation(value = "update", notes = "修改机构信息")
-    @MethodLog(operModule = OperModule.ORG,operType = OperType.UPDATE)
+//    @MethodLog(operModule = OperModule.ORG,operType = OperType.UPDATE)
     public Map<String, Object> updateTOrgan(TOrgan tOrgan) {
+        TOrgan byId = tOrganService.selectById(tOrgan.getId());
+        if (byId.getLevel()!=tOrgan.getLevel()&&byId.getChildren().size()>0){
+            HashMap<String, Object> map = new HashMap<>();
+            map.put("resultCode", 500);
+            map.put("message", "机构存在下级机构，不能修改机构级别！");
+            map.put("data", "");
+            return map;
+        }
+        if (!byId.getParentId().equals(tOrgan.getParentId())){
+            tOrgan.setCode(getOrganCode(tOrgan.getParentId()));
+        }
         tOrgan.setUpdateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
         boolean flag = tOrganService.updateById(tOrgan);
         if (flag) {
@@ -208,19 +214,34 @@ public class TOrganController extends BaseController {
             List excelList = ImportExcelUtil.readExcel(file.getOriginalFilename(), file.getInputStream());
             flag = tOrganService.batchUpload(excelList);
             if (!flag) {
-                resultMap.put("status",500);
+                resultMap.put("resultCode",500);
                 resultMap.put("massage","导入失败!");
                 return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
             }
-            resultMap.put("status",200);
+            resultMap.put("resultCode",200);
             resultMap.put("massage","导入成功!");
             return ResponseEntity.ok(resultMap);
         } catch (Exception e) {
-            resultMap.put("status",500);
+            resultMap.put("resultCode",500);
             resultMap.put("massage","导入失败!");
             return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
         }
     }
 
+    private String getOrganCode(String parentId) {
+        TOrgan max = tOrganService.selectCodeMax(parentId);
+        String s = max.getCode().substring(max.getCode().length() - 3);
+        String s1 = max.getCode().substring(0,max.getCode().length() - 3);
+        Integer integer = Integer.valueOf(s)+1;
+        if (integer<10){
+            s1=s1+"00"+integer.toString();
+        }else if (integer<100){
+            s1=s1+"0"+integer.toString();
+        }else {
+            s1=s1+integer.toString();
+        }
+        return s1;
+    }
+
 }
 

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TUserController.java

@@ -10,17 +10,15 @@ import cn.wisenergy.chnmuseum.party.common.util.DateUtil80;
 import cn.wisenergy.chnmuseum.party.common.util.RandomUtil;
 import cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam;
 import cn.wisenergy.chnmuseum.party.core.annotations.OperationLog;
-import cn.wisenergy.chnmuseum.party.model.Role;
-import cn.wisenergy.chnmuseum.party.model.TOrgan;
-import cn.wisenergy.chnmuseum.party.model.TUserRole;
+import cn.wisenergy.chnmuseum.party.model.*;
 import cn.wisenergy.chnmuseum.party.service.RoleService;
 import cn.wisenergy.chnmuseum.party.service.TUserRoleService;
+import cn.wisenergy.chnmuseum.party.service.impl.TBoxOperationServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController;
-import cn.wisenergy.chnmuseum.party.model.TUser;
 import cn.wisenergy.chnmuseum.party.service.TUserService;
 
 
@@ -40,6 +38,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
 import java.util.*;
 
 /**
@@ -65,6 +64,9 @@ public class TUserController extends BaseController {
     @Resource
     private RoleService roleService;
 
+    @Resource
+    private TBoxOperationServiceImpl boxOperationService;
+
     @Resource
     private StringRedisTemplate stringRedisTemplate;
     private static final String SHIRO_JWT_TOKEN = "shiro:jwt:token";
@@ -85,7 +87,7 @@ public class TUserController extends BaseController {
     @RequestMapping(value = "/getPageList", method = RequestMethod.GET)
     @RequiresPermissions("/user/getPageList")
 //    @MethodLog(operModule = OperModule.USER, operType = OperType.SELECT)
-    public  Map<String, Object> getUserList(String userName) {
+    public Map<String, Object> getUserList(String userName) {
         try {
             Page<TUser> list = userService.getList(getPage(), userName);
             return getResult(list);
@@ -94,6 +96,7 @@ public class TUserController extends BaseController {
         }
         return getFailResult();
     }
+
     /**
      * 查询成员列表
      *
@@ -104,19 +107,19 @@ public class TUserController extends BaseController {
     @RequestMapping(value = "/getUserList", method = RequestMethod.GET)
     @RequiresPermissions("/user/getUserList")
 //    @MethodLog(operModule = OperModule.USER, operType = OperType.SELECT)
-    public  Map<String, Object> getUserList(String type,String status,String auditStatus) {
+    public Map<String, Object> getUserList(String type, String status, String auditStatus) {
         UpdateWrapper<TUser> wrapper = new UpdateWrapper<>();
         try {
-            if (StringUtils.isNotBlank(type)){
-                wrapper.eq("type",type);
+            if (StringUtils.isNotBlank(type)) {
+                wrapper.eq("type", type);
             }
-            if (StringUtils.isNotBlank(status)){
-                wrapper.eq("status",status);
+            if (StringUtils.isNotBlank(status)) {
+                wrapper.eq("status", status);
             }
-            if (StringUtils.isNotBlank(auditStatus)){
-                wrapper.eq("audit_status",auditStatus);
+            if (StringUtils.isNotBlank(auditStatus)) {
+                wrapper.eq("audit_status", auditStatus);
             }
-            wrapper.eq("is_deleted",false);
+            wrapper.eq("is_deleted", false);
             wrapper.orderByDesc("create_time");
             List<TUser> list = userService.list(wrapper);
             return getResult(list);
@@ -144,27 +147,25 @@ public class TUserController extends BaseController {
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @RequiresPermissions("/user/add")
     @MethodLog(operModule = OperModule.USER, operType = OperType.ADD)
-    public ResponseEntity<Map<String, Object>> add(@RequestBody TUser user) {
+    public Map<String, Object> add(@RequestBody TUser user) {
         Map<String, Object> resultMap = new LinkedHashMap<String, Object>();
         try {
             if (StringUtils.isBlank(user.getUserName())) {
                 resultMap.put("resultCode", 400);
                 resultMap.put("message", "账号不能为空！");
-                return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
+                return resultMap;
             } else {
                 user.setUserName(StringUtils.trimToNull(user.getUserName()));
             }
             if (StringUtils.isBlank(user.getPassword())) {
-                resultMap.put("resultCode", 400);
-                resultMap.put("message", "密码不能为空！");
-                return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
+                user.setPassword("123456");
             } else {
                 user.setPassword(StringUtils.trimToNull(user.getPassword()));
             }
             if (StringUtils.isBlank(user.getRealName())) {
                 resultMap.put("resultCode", 400);
                 resultMap.put("message", "姓名不能为空！");
-                return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
+                return resultMap;
             } else {
                 user.setRealName(StringUtils.trimToNull(user.getRealName()));
             }
@@ -172,12 +173,12 @@ public class TUserController extends BaseController {
             if (user.getRoleList() == null || user.getRoleList().size() < 1) {
                 resultMap.put("resultCode", 400);
                 resultMap.put("message", "请选择角色！");
-                return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
+                return resultMap;
             }
             if (StringUtils.isBlank(user.getOrgId())) {
                 resultMap.put("resultCode", 400);
                 resultMap.put("message", "请选择机构！");
-                return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
+                return resultMap;
             }
 
             QueryWrapper<TUser> ew = new QueryWrapper<>();
@@ -189,7 +190,7 @@ public class TUserController extends BaseController {
                 if (one != null) {
                     resultMap.put("resultCode", 400);
                     resultMap.put("message", "账号已存在！");
-                    return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
+                    return resultMap;
                 }
             }
 
@@ -222,19 +223,18 @@ public class TUserController extends BaseController {
                 // 新增失败, 500
                 resultMap.put("resultCode", 500);
                 resultMap.put("message", "服务器忙");
-                return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-                        .body(resultMap);
+                return resultMap;
             }
             resultMap.put("resultCode", 200);
             resultMap.put("message", "添加成功");
             // 201
-            return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
+            return resultMap;
         } catch (Exception e) {
             resultMap.put("resultCode", 500);
             resultMap.put("message", "服务器忙");
             logger.error("新增成员错误!", e);
         }
-        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
+        return resultMap;
     }
 
 
@@ -363,7 +363,8 @@ public class TUserController extends BaseController {
         try {
             TUser entity = new TUser();
             entity.setId(userId);
-            entity.setStatus("2");
+            //提交禁用审核，没有真正禁用
+            entity.setAuditStatus("1");
             Integer code = AuditStatusEnum.TBC.getCode();
             entity.setAuditStatus(code.toString());
             entity.setUpdateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
@@ -509,7 +510,12 @@ public class TUserController extends BaseController {
     public Map<String, Object> updateStatus(@NotNull(message = "机构用户不能为空") @PathVariable("id") String id, @RequestParam("status") AuditStatusEnum status) {
         UpdateWrapper<TUser> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", id);
-        updateWrapper.eq("audit_status", status.name());
+        updateWrapper.eq("audit_status", status.getCode());
+        //当禁用审核通过后，真正禁用
+        if ("4".equals(status.getCode().toString())) {
+            updateWrapper.eq("status", "2");
+        }
+
         boolean flag = userService.update(updateWrapper);
         if (flag) {
             return getSuccessResult();
@@ -517,7 +523,6 @@ public class TUserController extends BaseController {
         return getFailResult();
     }
 
-
     //新增
     @OperationLog("新增机顶盒账号")
     @ApiOperation(value = "新增机顶盒账号")
@@ -535,8 +540,7 @@ public class TUserController extends BaseController {
                 user.setUserName(StringUtils.trimToNull(user.getUserName()));
             }
 
-            user.setPassword(RandomUtil.createRandom(6));
-
+            user.setPassword(RandomUtil.createLetterRandom(6));
 
             QueryWrapper<TUser> ew = new QueryWrapper<>();
             if (StringUtils.isNoneBlank(user.getUserName())) {
@@ -566,6 +570,13 @@ public class TUserController extends BaseController {
 
             boolean ret = this.userService.save(user);
 
+            TBoxOperation tBoxOperation = new TBoxOperation();
+            tBoxOperation.setOrganId(user.getOrgId());
+            tBoxOperation.setAreaId(user.getAreaId());
+            tBoxOperation.setStatus(1);
+            tBoxOperation.setCreateTime(LocalDateTime.now());
+            tBoxOperation.setUpdateTime(LocalDateTime.now());
+            ret = boxOperationService.save(tBoxOperation);
 
             if (!ret) {
                 // 新增失败, 500

src/main/resources/mapper/TBoxOperationMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.wisenergy.chnmuseum.party.mapper.TBoxOperationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.wisenergy.chnmuseum.party.model.TBoxOperation">
+        <id column="id" property="id"/>
+        <result column="organ_id" property="organId"/>
+        <result column="mac" property="mac"/>
+        <result column="status" property="status"/>
+        <result column="area_id" property="areaId"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="organ_name" property="organName"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, organ_id, mac, status, area_id, create_time, update_time
+    </sql>
+
+    <select id="getList" resultMap="BaseResultMap">
+       SELECT b.*,r.`name` organ_name
+FROM t_box_operation b
+left join t_organ r on r.id = b.organ_id
+    </select>
+</mapper>

src/main/resources/mapper/TOrganMapper.xml

@@ -7,6 +7,7 @@
         <id column="id" property="id"/>
         <result column="name" property="name"/>
         <result column="parent_id" property="parentId"/>
+        <result column="code" property="code"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="create_time" property="createTime"/>
         <result column="update_time" property="updateTime"/>
@@ -36,4 +37,8 @@ left join t_area a on o.area_id = a.id
 where o.id = #{id}
     </select>
 
+    <select id="selectCodeMax" resultMap="BaseResultMap">
+select * from t_organ where parent_id = #{parentId} order by code desc limit 1
+    </select>
+
 </mapper>

src/main/resources/mapper/TUserMapper.xml

@@ -24,6 +24,7 @@
         <result column="type" property="type"/>
         <result column="audit_status" property="auditStatus"/>
         <result column="area_id" property="areaId"/>
+        <result column="password" property="password"/>
         <result column="org_name" property="orgName"/>
         <result column="area_name" property="areaName"/>
         <collection fetchType="eager"   property="roleList" ofType="cn.wisenergy.chnmuseum.party.model.Role"