修改用户管理

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

 package cn.wisenergy.chnmuseum.party.mapper;
 
+import cn.wisenergy.chnmuseum.party.model.TUser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import cn.wisenergy.chnmuseum.party.model.TBoxOperation;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -16,4 +18,6 @@ import java.util.List;
 public interface TBoxOperationMapper extends BaseMapper<TBoxOperation> {
 
     List<TBoxOperation> getList();
+
+    List<TBoxOperation> selectBoxPage(@Param("user") TUser user);
 }

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

@@ -2,6 +2,7 @@ package cn.wisenergy.chnmuseum.party.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import cn.wisenergy.chnmuseum.party.model.TUser;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -21,4 +22,6 @@ public interface TUserMapper extends BaseMapper<TUser> {
     List<TUser> getList(String userName);
 
     TUser getById(String id);
+
+    List<TUser> selectBoxPage(TUser user);
 }

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

@@ -77,5 +77,9 @@ public class TBoxOperation implements Serializable {
     @TableField(exist = false)
     private String organName;
 
+    @ApiModelProperty("区域名")
+    @TableField(exist = false)
+    private String areaName;
+
 
 }

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

@@ -43,10 +43,10 @@ import com.baomidou.mybatisplus.annotation.TableField;
 @ApiModel(value = "用户", description = "用户")
 public class TOrgan implements Serializable {
 
-    private static final long serialVersionUID = 1L;
+//    private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("机构ID")
-    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    @TableId(value = "id")
     @NotNull(message = "机构IDID不能为空", groups = {Update.class})
     private String id;
 

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

@@ -57,16 +57,16 @@ public class TUser implements Serializable {
         private String userName;
     
     @TableField("password_hash")
-        @NotNull(message = "不能为空", groups = {Add.class, Update.class})
+        @NotNull(message = "不能为空", groups = {Add.class})
         private byte[] passwordHash;
     
     @TableField("password_salt")
-        @NotNull(message = "不能为空", groups = {Add.class, Update.class})
+        @NotNull(message = "不能为空", groups = {Add.class})
         private byte[] passwordSalt;
     
     @ApiModelProperty("创建时间")
     @TableField(value = "create_time", fill = FieldFill.INSERT)
-        @NotNull(message = "创建时间不能为空", groups = {Add.class, Update.class})
+        @NotNull(message = "创建时间不能为空", groups = {Add.class})
         private LocalDateTime createTime;
     
     @ApiModelProperty("修改时间")

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

 package cn.wisenergy.chnmuseum.party.service;
 
 import cn.wisenergy.chnmuseum.party.model.TBoxOperation;
+import cn.wisenergy.chnmuseum.party.model.TUser;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
@@ -16,4 +18,6 @@ import java.util.List;
 public interface TBoxOperationService extends IService<TBoxOperation> {
 
     List<TBoxOperation> getList();
+
+    Page<TBoxOperation> selectBoxPage(Page<TBoxOperation> page, TUser user);
 }

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

@@ -2,7 +2,9 @@ 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.model.TUser;
 import cn.wisenergy.chnmuseum.party.service.TBoxOperationService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import lombok.extern.slf4j.Slf4j;
@@ -31,4 +33,9 @@ public class TBoxOperationServiceImpl extends ServiceImpl<TBoxOperationMapper, T
     public List<TBoxOperation> getList() {
         return tBoxOperationMapper.getList();
     }
+
+    @Override
+    public Page<TBoxOperation> selectBoxPage(Page<TBoxOperation> page, TUser user) {
+        return page.setRecords(tBoxOperationMapper.selectBoxPage(user));
+    }
 }

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

@@ -5,19 +5,14 @@ import cn.wisenergy.chnmuseum.party.auth.util.JwtTokenUtil;
 import cn.wisenergy.chnmuseum.party.common.enums.LanguageEnum;
 import cn.wisenergy.chnmuseum.party.common.util.TimeUtils;
 import cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam;
-import cn.wisenergy.chnmuseum.party.model.Employee;
-import cn.wisenergy.chnmuseum.party.model.ExhibitionBoard;
-import cn.wisenergy.chnmuseum.party.model.RunLog;
-import cn.wisenergy.chnmuseum.party.model.TUser;
+import cn.wisenergy.chnmuseum.party.model.*;
 import cn.wisenergy.chnmuseum.party.service.ExhibitionBoardService;
 import cn.wisenergy.chnmuseum.party.service.RunLogService;
-import cn.wisenergy.chnmuseum.party.service.impl.EmployeeServiceImpl;
-import cn.wisenergy.chnmuseum.party.service.impl.RunLogServiceImpl;
-import cn.wisenergy.chnmuseum.party.service.impl.TAreaServiceImpl;
-import cn.wisenergy.chnmuseum.party.service.impl.TUserServiceImpl;
+import cn.wisenergy.chnmuseum.party.service.impl.*;
 import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -68,6 +63,9 @@ public class ChinaMobileRestApiController extends BaseController {
     @Resource
     private TAreaServiceImpl areaService;
 
+    @Resource
+    private TBoxOperationServiceImpl boxOperationService;
+
     @Resource
     private ExhibitionBoardService exhibitionBoardService;
 
@@ -206,7 +204,17 @@ public class ChinaMobileRestApiController extends BaseController {
                     resultMap.put("message", "用户名或密码不正确！");
                     return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
                 }
-
+                TBoxOperation operation = boxOperationService.getOne(new UpdateWrapper<TBoxOperation>().eq("organ_id", user.getOrgId()));
+                if (operation==null||"".equals(operation.getMac())){
+                    resultMap.put("status", 500);
+                    resultMap.put("message", "用户未激活！");
+                    return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
+                }
+                if (!mac.equals(operation.getMac())){
+                    resultMap.put("status", 500);
+                    resultMap.put("message", "mac地址不正确！");
+                    return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
+                }
                 if ("2".equals(user.getStatus())) {
                     throw new DisabledAccountException("此帐号已禁用，请联系管理员！");
                 }
@@ -243,7 +251,7 @@ public class ChinaMobileRestApiController extends BaseController {
                 jsonObject.put("orgName", user.getOrgName());
 
                 resultMap.put("resultCode", 200);
-                resultMap.put("message", "成功");
+                resultMap.put("message", "登录成功");
                 resultMap.put("data", jsonObject);
                 return ResponseEntity.status(HttpStatus.OK).body(resultMap);
             } catch (Exception e) {

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

@@ -54,6 +54,29 @@ public class TBoxOperationController extends BaseController {
     @Resource
     private TUserServiceImpl userService;
 
+
+    @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("/selectPageList")
+    @RequiresPermissions("/boxOperation/selectPageList")
+    @ApiOperation(value = "获取机顶盒基础信息分页列表", notes = "获取机顶盒基础信息分页列表")
+    public Map<String, Object> selectPageList(String organId,String areaId) {
+        TUser user = new TUser();
+        if (StringUtils.isNotBlank(organId)) {
+            user.setOrgId(organId);
+        }
+        if (StringUtils.isNotBlank(areaId)) {
+            user.setAreaId(areaId);
+        }
+        Page<TBoxOperation> page = tBoxOperationService.selectBoxPage(getPage(), user);
+        return getResult(page);
+    }
+
     @PostMapping("/add")
     @RequiresPermissions("/boxOperation/add")
     @ApiOperation(value = "添加机顶盒运维信息", notes = "添加机顶盒运维信息")

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

@@ -74,6 +74,7 @@ public class TOrganController extends BaseController {
         organ.setUpdateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
         String organCode = getOrganCode(organ.getParentId());
         organ.setCode(organCode);
+        organ.setId(organCode);
         // 保存业务节点信息
         boolean result = tOrganService.save(organ);
         // 返回操作结果
@@ -140,7 +141,7 @@ public class TOrganController extends BaseController {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        List<TOrgan> tOrganList = tOrganService.list(Wrappers.<TOrgan>lambdaQuery().eq(TOrgan::getIsDeleted, 0).likeRight(TOrgan::getCode,user.getOrgCode()).orderByDesc(TOrgan::getCreateTime));
+        List<TOrgan> tOrganList = tOrganService.list(Wrappers.<TOrgan>lambdaQuery().eq(TOrgan::getIsDeleted, 0).likeRight(TOrgan::getId,user.getOrgId()).orderByDesc(TOrgan::getCreateTime));
         return getResult(tOrganList);
     }
 
@@ -237,6 +238,11 @@ public class TOrganController extends BaseController {
 
     private String getOrganCode(String parentId) {
         TOrgan max = tOrganService.selectCodeMax(parentId);
+        if (max==null){
+            max = tOrganService.getById(parentId);
+            String s = max.getCode() + "001";
+            return s;
+        }
         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;

src/main/resources/mapper/TBoxOperationMapper.xml

@@ -12,6 +12,7 @@
         <result column="create_time" property="createTime"/>
         <result column="update_time" property="updateTime"/>
         <result column="organ_name" property="organName"/>
+        <result column="area_name" property="areaName"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -24,4 +25,22 @@
 FROM t_box_operation b
 left join t_organ r on r.id = b.organ_id
     </select>
+
+    <select id="selectBoxPage" resultMap="BaseResultMap">
+        select b.*,o.name organ_name,a.full_name area_name
+        from t_user u
+        left join t_organ o on o.id = u.org_id
+        left join t_area a on u.area_id = a.id
+        left join t_box_operation b on b.organ_id = o.id
+        where 1=1
+        <if test="user.orgId!= null and user.orgId != '' ">
+            and b.organ_id =#{user.orgId}
+        </if>
+        <if test="user.areaId!= null and user.areaId != '' ">
+            and b.area_id =#{user.areaId}
+        </if>
+        and u.is_deleted = false
+        and u.type = 3
+        order by b.create_time desc
+    </select>
 </mapper>